miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash on loading some saves with extra data

Browse Source
This commit is contained in:
dP
2019-11-04 03:16:04 +03:00
parent 0a2a027385
commit 5a7f1e894a
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/saveload/citymania_sl.cpp
View File

@@ -107,8 +107,7 @@ static void CM_DecodeTownsExtraInfo(BitIStream &bs)
uint n_affected_towns = bs.ReadBytes(2);
for (uint i = 0; i < n_affected_towns; i++) {
uint town_id = bs.ReadBytes(2);
t = Town::Get(town_id);
// TODO is it even supposed to return null? or just invalid pointer
t = Town::GetIfValid(town_id);
if (!t) {
DEBUG(sl, 0, "Invalid TownID in CM extra towns info (%u)", town_id);
continue;
@@ -135,7 +134,7 @@ static void CM_DecodeTownsLayoutErrors(BitIStream &bs)
uint n_affected_towns = bs.ReadBytes(2);
for (uint i = 0; i < n_affected_towns; i++) {
uint town_id = bs.ReadBytes(2);
t = Town::Get(town_id);
t = Town::GetIfValid(town_id);
if (!t) {
DEBUG(sl, 0, "Invalid TownID in CB towns layout errors (%u)", town_id);
continue;
@@ -177,7 +176,7 @@ static void CM_DecodeTownsCargo(BitIStream &bs)
uint n_affected_towns = bs.ReadBytes(2);
for (uint i = 0; i < n_affected_towns; i++) {
uint town_id = bs.ReadBytes(2);
t = Town::Get(town_id);
t = Town::GetIfValid(town_id);
if (!t) {
DEBUG(sl, 0, "Invalid TownID in CB towns cargo data (%u)", town_id);
continue;