petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for

Browse Source 
the newhouses grf specs, so all newhouses grfs will be playable in the game.

Many thanks to everyone who contributed code and ideas, and all the testers
who found things we missed.
This commit is contained in:
maedhros
2007-03-19 11:27:30 +00:00
parent ae48a7447b
commit 73ff939ddb
28 changed files with 3049 additions and 1269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/map.cpp
View File

@@ -22,7 +22,8 @@ uint _map_size_y;
uint _map_tile_mask;
uint _map_size;
Tile* _m = NULL;
Tile *_m = NULL;
TileExtended *_me = NULL;
void AllocateMap(uint size_x, uint size_y)
@@ -44,10 +45,16 @@ void AllocateMap(uint size_x, uint size_y)
_map_tile_mask = _map_size - 1;
free(_m);
_m = CallocT<Tile>(_map_size);
free(_me);
/* XXX TODO handle memory shortage more gracefully */
if (_m == NULL) error("Failed to allocate memory for the map");
_m = CallocT<Tile>(_map_size);
_me = CallocT<TileExtended>(_map_size);
/* XXX @todo handle memory shortage more gracefully
* Maybe some attemps could be made to try with smaller maps down to 64x64
* Maybe check for available memory before doing the calls, after all, we know how big
* the map is */
if ((_m == NULL) || (_me == NULL)) error("Failed to allocate memory for the map");
}