mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r1906) - Fix: [ 1117327 ] Assertion error on kick. When a company is cleaned all its windows need to be closed. For global vehicle lists, the no-staiton index of -1 was not taken into account

This commit is contained in:
Darkvater 2005-02-22 20:32:26 +00:00
parent 1f66d60272
commit 0ddbc1304b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
players.c
View File

@ -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);
}

2
train_gui.c
View File

@ -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;