mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r26875) -Codechange: move TropicZone information from m6 to type
This commit is contained in:
parent
5116c39865
commit
47852f119e
|
@ -574,6 +574,8 @@ bool AfterLoadGame()
|
|||
/* In old savegame versions, the heightlevel was coded in bits 0..3 of the type field */
|
||||
for (TileIndex t = 0; t < map_size; t++) {
|
||||
_m[t].height = GB(_m[t].type, 0, 4);
|
||||
SB(_m[t].type, 0, 2, GB(_m[t].m6, 0, 2));
|
||||
SB(_m[t].m6, 0, 2, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -206,7 +206,7 @@ static inline void SetTropicZone(TileIndex tile, TropicZone type)
|
|||
{
|
||||
assert(tile < MapSize());
|
||||
assert(!IsTileType(tile, MP_VOID) || type == TROPICZONE_NORMAL);
|
||||
SB(_m[tile].m6, 0, 2, type);
|
||||
SB(_m[tile].type, 0, 2, type);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -218,7 +218,7 @@ static inline void SetTropicZone(TileIndex tile, TropicZone type)
|
|||
static inline TropicZone GetTropicZone(TileIndex tile)
|
||||
{
|
||||
assert(tile < MapSize());
|
||||
return (TropicZone)GB(_m[tile].m6, 0, 2);
|
||||
return (TropicZone)GB(_m[tile].type, 0, 2);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue