diff options
| -rw-r--r-- | aircraft_gui.c | 8 | ||||
| -rw-r--r-- | roadveh_gui.c | 5 | ||||
| -rw-r--r-- | ship_gui.c | 5 | ||||
| -rw-r--r-- | train_gui.c | 5 |
4 files changed, 19 insertions, 4 deletions
diff --git a/aircraft_gui.c b/aircraft_gui.c index 9c8d77d68..e586f4850 100644 --- a/aircraft_gui.c +++ b/aircraft_gui.c @@ -941,7 +941,7 @@ static const Widget _other_player_aircraft_widgets[] = { { WWT_PANEL, RESIZE_RIGHT, 14, 244, 259, 14, 25, 0x0, STR_NULL}, { WWT_MATRIX, RESIZE_RB, 14, 0, 248, 26, 169, 0x401, STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT}, { WWT_SCROLLBAR, RESIZE_LRB, 14, 249, 259, 26, 169, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, -{ WWT_PANEL, RESIZE_RTB, 14, 249, 248, 170, 181, 0x0, STR_NULL}, +{ WWT_PANEL, RESIZE_RTB, 14, 0, 248, 170, 181, 0x0, STR_NULL}, { WWT_RESIZEBOX, RESIZE_LRTB, 14, 249, 259, 170, 181, 0x0, STR_RESIZE_BUTTON}, { WIDGETS_END}, }; @@ -1058,6 +1058,9 @@ static void PlayerAircraftWndProc(Window *w, WindowEvent *e) case 9: { /* Build new Vehicle */ uint tile; + if (!IsWindowOfPrototype(w, _player_aircraft_widgets)) + break; + tile = _last_built_aircraft_depot_tile; do { if (_map_owner[tile] == _local_player && IsAircraftHangarTile(tile)) { @@ -1073,6 +1076,9 @@ static void PlayerAircraftWndProc(Window *w, WindowEvent *e) } break; case 10: + if (!IsWindowOfPrototype(w, _player_aircraft_widgets)) + break; + ShowReplaceVehicleWindow(VEH_Aircraft); break; diff --git a/roadveh_gui.c b/roadveh_gui.c index 7c246ba5c..df224d059 100644 --- a/roadveh_gui.c +++ b/roadveh_gui.c @@ -762,7 +762,7 @@ static const Widget _other_player_roadveh_widgets[] = { { WWT_PANEL, RESIZE_RIGHT, 14, 244, 259, 14, 25, 0x0, STR_NULL}, { WWT_MATRIX, RESIZE_RB, 14, 0, 248, 26, 207, 0x701, STR_901A_ROAD_VEHICLES_CLICK_ON}, { WWT_SCROLLBAR, RESIZE_LRB, 14, 249, 259, 26, 207, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, -{ WWT_PANEL, RESIZE_RTB, 14, 0, 247, 208, 219, 0x0, STR_NULL}, +{ WWT_PANEL, RESIZE_RTB, 14, 0, 248, 208, 219, 0x0, STR_NULL}, { WWT_RESIZEBOX, RESIZE_LRTB, 14, 249, 259, 208, 219, 0x0, STR_RESIZE_BUTTON}, { WIDGETS_END}, }; @@ -893,6 +893,9 @@ static void PlayerRoadVehWndProc(Window *w, WindowEvent *e) ShowBuildRoadVehWindow(0); } break; case 10: { + if (!IsWindowOfPrototype(w, _player_roadveh_widgets)) + break; + ShowReplaceVehicleWindow(VEH_Road); break; } diff --git a/ship_gui.c b/ship_gui.c index 65d4de0c0..a9c67fa4e 100644 --- a/ship_gui.c +++ b/ship_gui.c @@ -924,7 +924,7 @@ static const Widget _other_player_ships_widgets[] = { { WWT_PANEL, RESIZE_RIGHT, 14, 244, 259, 14, 25, 0x0, STR_NULL}, { WWT_MATRIX, RESIZE_RB, 14, 0, 248, 26, 169, 0x401, STR_9823_SHIPS_CLICK_ON_SHIP_FOR}, { WWT_SCROLLBAR, RESIZE_LRB, 14, 249, 259, 26, 169, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, -{ WWT_PANEL, RESIZE_RTB, 14, 249, 248, 170, 181, 0x0, STR_NULL}, +{ WWT_PANEL, RESIZE_RTB, 14, 0, 248, 170, 181, 0x0, STR_NULL}, { WWT_RESIZEBOX, RESIZE_LRTB, 14, 249, 259, 170, 181, 0x0, STR_RESIZE_BUTTON}, { WIDGETS_END}, }; @@ -1058,6 +1058,9 @@ static void PlayerShipsWndProc(Window *w, WindowEvent *e) } break; case 10: { + if (!IsWindowOfPrototype(w, _player_ships_widgets)) + break; + ShowReplaceVehicleWindow(VEH_Ship); break; } diff --git a/train_gui.c b/train_gui.c index d52f23307..d89ed0c48 100644 --- a/train_gui.c +++ b/train_gui.c @@ -1234,7 +1234,7 @@ static const Widget _other_player_trains_widgets[] = { { WWT_PANEL, RESIZE_RIGHT, 14, 244, 324, 14, 25, 0x0, STR_NULL}, { WWT_MATRIX, RESIZE_RB, 14, 0, 313, 26, 207, 0x701, STR_883D_TRAINS_CLICK_ON_TRAIN_FOR}, { WWT_SCROLLBAR, RESIZE_LRB, 14, 314, 324, 26, 207, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, -{ WWT_PANEL, RESIZE_TB, 14, 0, 312, 208, 219, 0x0, STR_NULL}, +{ WWT_PANEL, RESIZE_RTB, 14, 0, 313, 208, 219, 0x0, STR_NULL}, { WWT_RESIZEBOX, RESIZE_LRTB, 14, 314, 324, 208, 219, 0x0, STR_RESIZE_BUTTON}, { WIDGETS_END}, }; @@ -1368,6 +1368,9 @@ static void PlayerTrainsWndProc(Window *w, WindowEvent *e) ShowBuildTrainWindow(0); } break; case 10: { + if (!IsWindowOfPrototype(w, _player_trains_widgets)) + break; + ShowReplaceVehicleWindow(VEH_Train); break; } |