equal
deleted
inserted
replaced
50 _map_tile_mask = _map_size - 1; |
50 _map_tile_mask = _map_size - 1; |
51 |
51 |
52 free(_m); |
52 free(_m); |
53 free(_me); |
53 free(_me); |
54 |
54 |
55 _m = CallocT<Tile>(_map_size); |
|
56 _me = CallocT<TileExtended>(_map_size); |
|
57 |
|
58 /* XXX @todo handle memory shortage more gracefully |
55 /* XXX @todo handle memory shortage more gracefully |
|
56 * CallocT does the out-of-memory check |
59 * Maybe some attemps could be made to try with smaller maps down to 64x64 |
57 * Maybe some attemps could be made to try with smaller maps down to 64x64 |
60 * Maybe check for available memory before doing the calls, after all, we know how big |
58 * Maybe check for available memory before doing the calls, after all, we know how big |
61 * the map is */ |
59 * the map is */ |
62 if ((_m == NULL) || (_me == NULL)) error("Failed to allocate memory for the map"); |
60 _m = CallocT<Tile>(_map_size); |
|
61 _me = CallocT<TileExtended>(_map_size); |
63 } |
62 } |
64 |
63 |
65 |
64 |
66 #ifdef _DEBUG |
65 #ifdef _DEBUG |
67 TileIndex TileAdd(TileIndex tile, TileIndexDiff add, |
66 TileIndex TileAdd(TileIndex tile, TileIndexDiff add, |