dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/group_cmd.cpp
#	src/lang/korean.txt
#	src/lang/simplified_chinese.txt
#	src/script/api/script_rail.cpp
#	src/tunnelbridge_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2023-01-23 19:10:07 +00:00
parent 50ae79910d 97844df123
commit a9100e93cb
79 changed files with 181 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/saveload/oldloader_sl.cpp
View File

@@ -48,9 +48,7 @@ void FixOldMapArray()
{
/* TTO/TTD/TTDP savegames could have buoys at tile 0
* (without assigned station struct) */
MemSetT(&_m[0], 0);
SetTileType(0, MP_WATER);
SetTileOwner(0, OWNER_WATER);
MakeSea(0);
}
static void FixTTDMapArray()
@@ -1468,8 +1466,7 @@ static bool LoadOldGameDifficulty(LoadgameState *ls, int num)
static bool LoadOldMapPart1(LoadgameState *ls, int num)
{
if (_savegame_type == SGT_TTO) {
MemSetT(_m, 0, OLD_MAP_SIZE);
MemSetT(_me, 0, OLD_MAP_SIZE);
AllocateMap(OLD_MAP_SIZE, OLD_MAP_SIZE);
}
for (uint i = 0; i < OLD_MAP_SIZE; i++) {