diff options
| author | rubidium <rubidium@openttd.org> | 2014-09-21 11:18:10 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2014-09-21 11:18:10 +0000 |
| commit | 47852f119eebc2816bd829b85ee4d105d1520e21 (patch) | |
| tree | de27c6de521d5e75ea90752ae3701eee3510208e | |
| parent | 5116c39865bf3c6117314acfc3644993cef7fb7d (diff) | |
| download | openttd-47852f119eebc2816bd829b85ee4d105d1520e21.tar.xz | |
(svn r26875) -Codechange: move TropicZone information from m6 to type
| -rw-r--r-- | src/saveload/afterload.cpp | 2 | ||||
| -rw-r--r-- | src/tile_map.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index a66f845b6..386d15cfe 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -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); } } diff --git a/src/tile_map.h b/src/tile_map.h index 345dc1d1e..08479e1aa 100644 --- a/src/tile_map.h +++ b/src/tile_map.h @@ -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); } /** |