diff options
| author | rubidium <rubidium@openttd.org> | 2008-05-13 12:15:52 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-05-13 12:15:52 +0000 |
| commit | 962273e24202e090c1b173f3e8cd2f65b2a2d585 (patch) | |
| tree | 8bb1c4b3dad1f45641ca6be5c6cf625a92facca9 | |
| parent | 5d7851e8d63766b15881bafd4940bf89f37b2bdc (diff) | |
| download | openttd-962273e24202e090c1b173f3e8cd2f65b2a2d585.tar.xz | |
(svn r13066) -Fix [FS#2005]: loading of TTDP savegames with rivers in them.
| -rw-r--r-- | src/oldloader.cpp | 8 | ||||
| -rw-r--r-- | src/openttd.cpp | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/oldloader.cpp b/src/oldloader.cpp index d69bccc0a..32dcd3b76 100644 --- a/src/oldloader.cpp +++ b/src/oldloader.cpp @@ -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; } } diff --git a/src/openttd.cpp b/src/openttd.cpp index ecba066fa..8779f87d4 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -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) { |