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

Fix crash when placing unavailable object

Browse Source 
In case where object class has no available objects
This commit is contained in:
Jonathan G Rennison
2020-10-08 00:04:00 +01:00
parent 28405b00a4
commit 387374f1e3
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/object_gui.cpp
View File

@@ -340,6 +340,11 @@ public:
if (_selected_object_index != -1) { if (_selected_object_index != -1) {
SetObjectToPlaceWnd(SPR_CURSOR_TRANSMITTER, PAL_NONE, HT_RECT | HT_DIAGONAL, this); SetObjectToPlaceWnd(SPR_CURSOR_TRANSMITTER, PAL_NONE, HT_RECT | HT_DIAGONAL, this);
} else {
if (_thd.window_class == this->window_class &&
_thd.window_number == this->window_number) {
ResetObjectToPlace();
}
} }
this->UpdateButtons(_selected_object_class, _selected_object_index, _selected_object_view); this->UpdateButtons(_selected_object_class, _selected_object_index, _selected_object_view);
@@ -416,6 +421,7 @@ public:
void OnPlaceObject(Point pt, TileIndex tile) override void OnPlaceObject(Point pt, TileIndex tile) override
{ {
const ObjectSpec *spec = ObjectClass::Get(_selected_object_class)->GetSpec(_selected_object_index); const ObjectSpec *spec = ObjectClass::Get(_selected_object_class)->GetSpec(_selected_object_index);
if (spec == nullptr) return;
if (_settings_game.construction.build_object_area_permitted && spec->size == 0x11) { if (_settings_game.construction.build_object_area_permitted && spec->size == 0x11) {
VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_BUILD_OBJECT); VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_BUILD_OBJECT);
} else { } else {