diff options
| -rw-r--r-- | players.c | 10 | ||||
| -rw-r--r-- | train_gui.c | 2 |
2 files changed, 7 insertions, 5 deletions
@@ -609,10 +609,12 @@ void DeletePlayerWindows(int pi) DeleteWindowById(WC_COMPANY, pi); DeleteWindowById(WC_FINANCES, pi); DeleteWindowById(WC_STATION_LIST, pi); - DeleteWindowById(WC_TRAINS_LIST, pi); - DeleteWindowById(WC_ROADVEH_LIST, pi); - DeleteWindowById(WC_SHIPS_LIST, pi); - DeleteWindowById(WC_AIRCRAFT_LIST, pi); + /* The vehicle list windows also have station in the window_number + * A stationindex of -1 means the global vehicle list */ + DeleteWindowById(WC_TRAINS_LIST, (-1 << 16) | pi); + DeleteWindowById(WC_ROADVEH_LIST, (-1 << 16) | pi); + DeleteWindowById(WC_SHIPS_LIST, (-1 << 16) | pi); + DeleteWindowById(WC_AIRCRAFT_LIST, (-1 << 16) | pi); DeleteWindowById(WC_BUY_COMPANY, pi); } diff --git a/train_gui.c b/train_gui.c index b477cf25b..9bd497024 100644 --- a/train_gui.c +++ b/train_gui.c @@ -1487,7 +1487,7 @@ void ShowPlayerTrains(int player, int station) w = AllocateWindowDescFront(&_other_player_trains_desc, (station << 16) | player); } if (w) { - w->caption_color = w->window_number; + w->caption_color = player; w->hscroll.cap = 10; w->vscroll.cap = 7; // maximum number of vehicles shown w->widget[7].unkA = (w->vscroll.cap << 8) + 1; |