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

Fix not being able to build waypoints when custom types no longer present

Browse Source 
And a custom type was previously selected
This commit is contained in:
Jonathan G Rennison
2022-06-30 21:53:36 +01:00
parent c19bd4473f
commit f98f5fd291
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/rail_gui.cpp
View File

@@ -684,8 +684,12 @@ struct BuildRailToolbarWindow : Window {
case WID_RAT_BUILD_WAYPOINT: case WID_RAT_BUILD_WAYPOINT:
this->last_user_action = widget; this->last_user_action = widget;
_waypoint_count = StationClass::Get(STAT_CLASS_WAYP)->GetSpecCount(); _waypoint_count = StationClass::Get(STAT_CLASS_WAYP)->GetSpecCount();
if (HandlePlacePushButton(this, WID_RAT_BUILD_WAYPOINT, SPR_CURSOR_WAYPOINT, HT_RECT) && _waypoint_count > 1) { if (HandlePlacePushButton(this, WID_RAT_BUILD_WAYPOINT, SPR_CURSOR_WAYPOINT, HT_RECT)) {
ShowBuildWaypointPicker(this); if (_waypoint_count > 1) {
ShowBuildWaypointPicker(this);
} else {
_cur_waypoint_type = 0;
}
} }
break; break;

6
src/road_gui.cpp
View File

@@ -534,7 +534,11 @@ struct BuildRoadToolbarWindow : Window {
if (HandlePlacePushButton(this, WID_ROT_BUILD_WAYPOINT, SPR_CURSOR_WAYPOINT, HT_RECT)) { if (HandlePlacePushButton(this, WID_ROT_BUILD_WAYPOINT, SPR_CURSOR_WAYPOINT, HT_RECT)) {
this->last_started_action = widget; this->last_started_action = widget;
_waypoint_count = RoadStopClass::Get(ROADSTOP_CLASS_WAYP)->GetSpecCount(); _waypoint_count = RoadStopClass::Get(ROADSTOP_CLASS_WAYP)->GetSpecCount();
if (_waypoint_count > 1) ShowBuildWaypointPicker(this); if (_waypoint_count > 1) {
ShowBuildWaypointPicker(this);
} else {
_cur_waypoint_type = 0;
}
} }
break; break;