summaryrefslogtreecommitdiff
path: root/src/house.h
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2013-10-12 16:33:19 +0000
committerfrosch <frosch@openttd.org>2013-10-12 16:33:19 +0000
commit6a0439a789fc3a5f8da55493b27d4c9c6c328b1b (patch)
tree7522f46ab9f0646d701a2803961ed400cfba338c /src/house.h
parentad8b387f9eb8185f25948651b7a34f151812c31d (diff)
downloadopenttd-6a0439a789fc3a5f8da55493b27d4c9c6c328b1b.tar.xz
(svn r25838) -Codechange: Rename HOUSE_MAX to NUM_HOUSES.
Diffstat (limited to 'src/house.h')
-rw-r--r--src/house.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/house.h b/src/house.h
index 9d5d5529d..b74e13c18 100644
--- a/src/house.h
+++ b/src/house.h
@@ -26,14 +26,14 @@ static const byte TOWN_HOUSE_COMPLETED = 3;
static const uint HOUSE_NO_CLASS = 0;
static const HouseID NEW_HOUSE_OFFSET = 110;
-static const HouseID HOUSE_MAX = 512;
+static const HouseID NUM_HOUSES = 512;
static const HouseID INVALID_HOUSE_ID = 0xFFFF;
/**
* There can only be as many classes as there are new houses, plus one for
* NO_CLASS, as the original houses don't have classes.
*/
-static const uint HOUSE_CLASS_MAX = HOUSE_MAX - NEW_HOUSE_OFFSET + 1;
+static const uint HOUSE_CLASS_MAX = NUM_HOUSES - NEW_HOUSE_OFFSET + 1;
enum BuildingFlags {
TILE_NO_FLAG = 0,
@@ -124,7 +124,7 @@ struct HouseSpec {
static inline HouseSpec *Get(size_t house_id)
{
- assert(house_id < HOUSE_MAX);
+ assert(house_id < NUM_HOUSES);
extern HouseSpec _house_specs[];
return &_house_specs[house_id];
}