mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 23:04:36 +01:00
Code Issues Releases Wiki Activity

Fix #14123: NPE in map_obstruction_set_error_text()

Browse Source
This commit is contained in:
Michael Steenbeek
2021-03-07 13:37:23 +01:00
committed by GitHub
parent e4e26eeb2a
commit d5426c3779
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2/world/Map.cpp
View File

@@ -1215,7 +1215,8 @@ void map_obstruction_set_error_text(TileElement* tileElement, GameActions::Resul
sceneryEntry = tileElement->AsSmallScenery()->GetEntry();
res.ErrorMessage = STR_X_IN_THE_WAY;
auto ft = Formatter(res.ErrorMessageArgs.data());
ft.Add<rct_string_id>(sceneryEntry->name);
rct_string_id stringId = sceneryEntry != nullptr ? sceneryEntry->name : static_cast<rct_string_id>(STR_EMPTY);
ft.Add<rct_string_id>(stringId);
break;
}
case TILE_ELEMENT_TYPE_ENTRANCE:
@@ -1237,7 +1238,8 @@ void map_obstruction_set_error_text(TileElement* tileElement, GameActions::Resul
sceneryEntry = tileElement->AsWall()->GetEntry();
res.ErrorMessage = STR_X_IN_THE_WAY;
auto ft = Formatter(res.ErrorMessageArgs.data());
ft.Add<rct_string_id>(sceneryEntry->name);
rct_string_id stringId = sceneryEntry != nullptr ? sceneryEntry->name : static_cast<rct_string_id>(STR_EMPTY);
ft.Add<rct_string_id>(stringId);
break;
}
case TILE_ELEMENT_TYPE_LARGE_SCENERY:
@@ -1245,7 +1247,8 @@ void map_obstruction_set_error_text(TileElement* tileElement, GameActions::Resul
sceneryEntry = tileElement->AsLargeScenery()->GetEntry();
res.ErrorMessage = STR_X_IN_THE_WAY;
auto ft = Formatter(res.ErrorMessageArgs.data());
ft.Add<rct_string_id>(sceneryEntry->name);
rct_string_id stringId = sceneryEntry != nullptr ? sceneryEntry->name : static_cast<rct_string_id>(STR_EMPTY);
ft.Add<rct_string_id>(stringId);
break;
}
}