dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r14611) -Fix (r13437)[FS#2421]: Store the age of a house in the map array instead of the construction year.

Browse Source 
Note: Savegames from r13437 to now are broken and have a age of 255 years for a lot houses.
This commit is contained in:
frosch
2008-11-23 14:17:41 +00:00
parent 2fec4d8e3c
commit 70f2b95bda
6 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/town_map.h
View File

@@ -6,8 +6,6 @@
#define TOWN_MAP_H
#include "town.h"
#include "date_type.h"
#include "date_func.h"
#include "tile_map.h"
/**
@@ -266,27 +264,38 @@ static inline void IncHouseConstructionTick(TileIndex t)
}
/**
* Set the year that this house was constructed.
* Sets the age of the house to zero.
* Needs to be called after the house is completed. During construction stages the map space is used otherwise.
* @param t the tile of this house
* @param year the year to set
* @pre IsTileType(t, MP_HOUSE) && IsHouseCompleted(t)
*/
static inline void SetHouseConstructionYear(TileIndex t, Year year)
static inline void ResetHouseAge(TileIndex t)
{
assert(IsTileType(t, MP_HOUSE) && IsHouseCompleted(t));
_m[t].m5 = Clamp(year - GetHouseSpecs(GetHouseType(t))->min_year, 0, 0xFF);
_m[t].m5 = 0;
}
/**
* Get the year that this house was constructed.
* Increments the age of the house.
* @param t the tile of this house
* @pre IsTileType(t, MP_HOUSE)
*/
static inline void IncrementHouseAge(TileIndex t)
{
assert(IsTileType(t, MP_HOUSE));
if (IsHouseCompleted(t) && _m[t].m5 < 0xFF) _m[t].m5++;
}
/**
* Get the age of the house
* @param t the tile of this house
* @pre IsTileType(t, MP_HOUSE)
* @return year
*/
static inline Year GetHouseConstructionYear(TileIndex t)
static inline Year GetHouseAge(TileIndex t)
{
assert(IsTileType(t, MP_HOUSE));
return IsHouseCompleted(t) ? _m[t].m5 + GetHouseSpecs(GetHouseType(t))->min_year : _cur_year;
return IsHouseCompleted(t) ? _m[t].m5 : 0;
}
/**