Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r12783) -Codechange: do not statically allocate the 'temporary map3 array' in the oldloader.

Browse Source
This commit is contained in:
rubidium 2008-04-19 08:34:03 +00:00
parent 49cfba55bb
commit e0722751c6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/oldloader.cpp
View File

@ -401,7 +401,7 @@ extern uint _animated_tile_count;
extern char *_old_name_array; extern char *_old_name_array;
static byte _old_vehicle_multiplier; static byte _old_vehicle_multiplier;
static uint8 _old_map3[OLD_MAP_SIZE * 2]; static uint8 *_old_map3;
static bool _new_ttdpatch_format; static bool _new_ttdpatch_format;
static uint32 _old_town_index; static uint32 _old_town_index;
static uint16 _old_string_id; static uint16 _old_string_id;
@ -1608,8 +1608,10 @@ static bool LoadOldMain(LoadgameState *ls)
DEBUG(oldloader, 3, "Reading main chunk..."); DEBUG(oldloader, 3, "Reading main chunk...");
/* Load the biggest chunk */ /* Load the biggest chunk */
_old_map3 = MallocT<byte>(OLD_MAP_SIZE * 2);
if (!LoadChunk(ls, NULL, main_chunk)) { if (!LoadChunk(ls, NULL, main_chunk)) {
DEBUG(oldloader, 0, "Loading failed"); DEBUG(oldloader, 0, "Loading failed");
free(_old_map3);
return false; return false;
} }
DEBUG(oldloader, 3, "Done, converting game data..."); DEBUG(oldloader, 3, "Done, converting game data...");
@ -1676,6 +1678,8 @@ static bool LoadOldMain(LoadgameState *ls)
DEBUG(oldloader, 3, "Finished converting game data"); DEBUG(oldloader, 3, "Finished converting game data");
DEBUG(oldloader, 1, "TTD(Patch) savegame successfully converted"); DEBUG(oldloader, 1, "TTD(Patch) savegame successfully converted");
free(_old_map3);
return true; return true;
} }