(svn r1676) Increase the size of TileIndex and TileIndexDiff to 32bits and adapt the save/load data and some other parts of the code to that change

WARNING: If i made any mistake here it WILL lead to corrupted savegames!
This commit is contained in:
tron
2005-01-25 21:43:57 +00:00
parent 8e5e2e52fd
commit 993a106679
12 changed files with 74 additions and 40 deletions

6
map.h
View File

@@ -2,7 +2,7 @@
#define MAP_H
#define TILE_FROM_XY(x,y) (int)((((y) >> 4) << MapLogX()) + ((x) >> 4))
#define TILE_XY(x,y) (int)(((y) << MapLogX()) + (x))
#define TILE_XY(x,y) (((y) << MapLogX()) + (x))
#define TILE_MASK(x) ((x) & ((1 << (MapLogX() + MapLogY())) - 1))
@@ -26,8 +26,8 @@ static inline uint MapMaxY(void) { return MapSizeY() - 1; }
/* The number of tiles in the map */
static inline uint MapSize(void) { return MapSizeX() * MapSizeY(); }
typedef uint32 TileIndex;
typedef uint16 TileIndex;
static inline uint TileX(TileIndex tile)
{
@@ -40,7 +40,7 @@ static inline uint TileY(TileIndex tile)
}
typedef int16 TileIndexDiff;
typedef int32 TileIndexDiff;
typedef struct TileIndexDiffC {
int16 x;