mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r13437) -Feature[newGRF]: Add long format introduction and maximum construction year for house.

release/0.7
belugas 2008-06-10 00:42:19 +00:00
parent bf8afb4c38
commit 54e7a3b196
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/newgrf.cpp
View File

@ -1538,6 +1538,14 @@ static bool TownHouseChangeInfo(uint hid, int numinfo, int prop, byte **bufp, in
ret = true; ret = true;
} break; } break;
case 0x21: // long introduction year
housespec->min_year = grf_load_word(&buf);
break;
case 0x22: // long maximum year
housespec->max_year = grf_load_word(&buf);
break;
default: default:
ret = true; ret = true;
break; break;

8
src/town_map.h
View File

@ -265,7 +265,7 @@ static inline void IncHouseConstructionTick(TileIndex t)
} }
/** /**
* Set the year that this house was constructed (between 1920 and 2175). * Set the year that this house was constructed.
* @param t the tile of this house * @param t the tile of this house
* @param year the year to set * @param year the year to set
* @pre IsTileType(t, MP_HOUSE) && IsHouseCompleted(t) * @pre IsTileType(t, MP_HOUSE) && IsHouseCompleted(t)
@ -273,11 +273,11 @@ static inline void IncHouseConstructionTick(TileIndex t)
static inline void SetHouseConstructionYear(TileIndex t, Year year) static inline void SetHouseConstructionYear(TileIndex t, Year year)
{ {
assert(IsTileType(t, MP_HOUSE) && IsHouseCompleted(t)); assert(IsTileType(t, MP_HOUSE) && IsHouseCompleted(t));
_m[t].m5 = Clamp(year - ORIGINAL_BASE_YEAR, 0, 0xFF); _m[t].m5 = Clamp(year - GetHouseSpecs(GetHouseType(t))->min_year, 0, 0xFF);
} }
/** /**
* Get the year that this house was constructed (between 1920 and 2175). * Get the year that this house was constructed.
* @param t the tile of this house * @param t the tile of this house
* @pre IsTileType(t, MP_HOUSE) * @pre IsTileType(t, MP_HOUSE)
* @return year * @return year
@ -285,7 +285,7 @@ static inline void SetHouseConstructionYear(TileIndex t, Year year)
static inline Year GetHouseConstructionYear(TileIndex t) static inline Year GetHouseConstructionYear(TileIndex t)
{ {
assert(IsTileType(t, MP_HOUSE)); assert(IsTileType(t, MP_HOUSE));
return IsHouseCompleted(t) ? _m[t].m5 + ORIGINAL_BASE_YEAR : 0; return IsHouseCompleted(t) ? _m[t].m5 + GetHouseSpecs(GetHouseType(t))->min_year : 0;
} }
/** /**