1
0
Fork 0

(svn r2313) - Fix: [ 1202115 ] Clicking shipslist on bouy asserts GetPlayer(). Bouys and oilrigs don't have owners, so it cannot get the vehicle-list of the station-owner. Just use _current_player

release/0.4.5
Darkvater 2005-05-14 22:03:25 +00:00
parent 32bb69ef1c
commit 220e5be863
1 changed files with 10 additions and 6 deletions

View File

@ -472,27 +472,31 @@ static void StationViewWndProc(Window *w, WindowEvent *e)
ShowQueryString(st->string_id, STR_3030_RENAME_STATION_LOADING, 31, 180, w->window_class, w->window_number);
} break;
case 10: {
case 10: { /* Show a list of scheduled trains to this station */
const Station *st = GetStation(w->window_number);
ShowPlayerTrains(st->owner, w->window_number);
break;
}
case 11: {
case 11: { /* Show a list of scheduled road-vehicles to this station */
const Station *st = GetStation(w->window_number);
ShowPlayerRoadVehicles(st->owner, w->window_number);
break;
}
case 12: {
case 12: { /* Show a list of scheduled aircraft to this station */
const Station *st = GetStation(w->window_number);
ShowPlayerAircraft(st->owner, w->window_number);
/* Since oilrigs have no owners, show the scheduled aircraft of current player */
PlayerID owner = (st->owner == OWNER_NONE) ? _current_player : st->owner;
ShowPlayerAircraft(owner, w->window_number);
break;
}
case 13: {
case 13: { /* Show a list of scheduled ships to this station */
const Station *st = GetStation(w->window_number);
ShowPlayerShips(st->owner, w->window_number);
/* Since oilrigs/bouys have no owners, show the scheduled ships of current player */
PlayerID owner = (st->owner == OWNER_NONE) ? _current_player : st->owner;
ShowPlayerShips(owner, w->window_number);
break;
}
}