equal
deleted
inserted
replaced
79 DECLARE_ENUM_AS_BIT_SET(HouseZones) |
79 DECLARE_ENUM_AS_BIT_SET(HouseZones) |
80 |
80 |
81 enum HouseExtraFlags { |
81 enum HouseExtraFlags { |
82 NO_EXTRA_FLAG = 0, |
82 NO_EXTRA_FLAG = 0, |
83 BUILDING_IS_HISTORICAL = 1U << 0, ///< this house will only appear during town generation in random games, thus the historical |
83 BUILDING_IS_HISTORICAL = 1U << 0, ///< this house will only appear during town generation in random games, thus the historical |
84 BUILDING_IS_PROTECTED = 1U << 1, ///< towns and AI will not remove this house, while human players will be able tp |
84 BUILDING_IS_PROTECTED = 1U << 1, ///< towns and AI will not remove this house, while human players will be able to |
85 SYNCHRONISED_CALLBACK_1B = 1U << 2, ///< synchronized callback 1B will be performed, on multi tile houses |
85 SYNCHRONISED_CALLBACK_1B = 1U << 2, ///< synchronized callback 1B will be performed, on multi tile houses |
86 CALLBACK_1A_RANDOM_BITS = 1U << 3, ///< callback 1A needs random bits |
86 CALLBACK_1A_RANDOM_BITS = 1U << 3, ///< callback 1A needs random bits |
87 }; |
87 }; |
88 |
88 |
89 DECLARE_ENUM_AS_BIT_SET(HouseExtraFlags) |
89 DECLARE_ENUM_AS_BIT_SET(HouseExtraFlags) |
118 byte flags12; |
118 byte flags12; |
119 |
119 |
120 /* level of noise that all the airports are generating */ |
120 /* level of noise that all the airports are generating */ |
121 uint16 noise_reached; |
121 uint16 noise_reached; |
122 |
122 |
123 /* Which players have a statue? */ |
123 /* Which companies have a statue? */ |
124 byte statues; |
124 byte statues; |
125 |
125 |
126 /* Player ratings as well as a mask that determines which players have a rating. */ |
126 /* Company ratings as well as a mask that determines which companies have a rating. */ |
127 PlayerMask have_ratings; |
127 CompanyMask have_ratings; |
128 uint8 unwanted[MAX_PLAYERS]; ///< how many months companies aren't wanted by towns (bribe) |
128 uint8 unwanted[MAX_COMPANIES]; ///< how many months companies aren't wanted by towns (bribe) |
129 PlayerByte exclusivity; ///< which player has exslusivity |
129 CompanyByte exclusivity; ///< which company has exclusivity |
130 uint8 exclusive_counter; ///< months till the exclusivity expires |
130 uint8 exclusive_counter; ///< months till the exclusivity expires |
131 int16 ratings[MAX_PLAYERS]; |
131 int16 ratings[MAX_COMPANIES]; |
132 |
132 |
133 /* Maximum amount of passengers and mail that can be transported. */ |
133 /* Maximum amount of passengers and mail that can be transported. */ |
134 uint32 max_pass; |
134 uint32 max_pass; |
135 uint32 max_mail; |
135 uint32 max_mail; |
136 uint32 new_max_pass; |
136 uint32 new_max_pass; |