mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r13066) -Fix [FS#2005]: loading of TTDP savegames with rivers in them.

This commit is contained in:
rubidium 2008-05-13 12:15:52 +00:00
parent d0c79e1164
commit e6f96da537
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/oldloader.cpp
View File

@ -1664,7 +1664,13 @@ static bool LoadOldMain(LoadgameState *ls)
* clear it for ourselves and let OTTD's rebuild PBS itself */
_m[i].m4 &= 0xF; /* Only keep the lower four bits; upper four is PBS */
break;
default: break;
case MP_WATER:
if (GetWaterClass(i) == 3) MakeRiver(i, Random());
break;
default:
break;
}
}

4
src/openttd.cpp
View File

@ -2425,9 +2425,7 @@ bool AfterLoadGame()
/* Move river flag and update canals to use water class */
if (IsTileType(t, MP_WATER)) {
if (_m[t].m5 == 2) {
MakeRiver(t, Random());
} else {
if (GetWaterClass(t) != WATER_CLASS_RIVER) {
if (IsWater(t)) {
Owner o = GetTileOwner(t);
if (o == OWNER_WATER) {