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

(svn r6261) -Fix r6246: fixed sprite related crash related to other player's vehicle list windows (spotted by Darkvater)

Browse Source
This commit is contained in:
bjarni
2006-08-31 09:40:10 +00:00
parent 22c12573b9
commit 7aa94f0d4f
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vehicle_gui.c
View File

@@ -1251,6 +1251,8 @@ void PlayerVehWndProc(Window *w, WindowEvent *e)
} }
SetDParam(0, w->vscroll.count); SetDParam(0, w->vscroll.count);
w->widget[1].unkA = STR_VEH_WITH_SHARED_ORDERS_LIST; w->widget[1].unkA = STR_VEH_WITH_SHARED_ORDERS_LIST;
if (owner != _local_player) break; // only set up buttons for local player
w->widget[10].unkA = STR_EMPTY; w->widget[10].unkA = STR_EMPTY;
SETBIT(w->disabled_state, 10); SETBIT(w->disabled_state, 10);
@@ -1268,14 +1270,6 @@ void PlayerVehWndProc(Window *w, WindowEvent *e)
SetDParam(0, p->name_1); SetDParam(0, p->name_1);
SetDParam(1, p->name_2); SetDParam(1, p->name_2);
SetDParam(2, w->vscroll.count); SetDParam(2, w->vscroll.count);
if (vl->list_length == 0) SETBIT(w->disabled_state, 9);
if (vehicle_type == VEH_Aircraft) {
w->widget[9].unkA = STR_SEND_TO_HANGARS;
w->widget[9].tooltips = STR_SEND_TO_HANGARS_TIP;
} else {
w->widget[9].unkA = STR_SEND_TO_DEPOTS;
w->widget[9].tooltips = STR_SEND_TO_DEPOTS_TIP;
}
switch (vehicle_type) { switch (vehicle_type) {
case VEH_Train: w->widget[1].unkA = STR_881B_TRAINS; break; case VEH_Train: w->widget[1].unkA = STR_881B_TRAINS; break;
@@ -1284,6 +1278,16 @@ void PlayerVehWndProc(Window *w, WindowEvent *e)
case VEH_Aircraft: w->widget[1].unkA = STR_A009_AIRCRAFT; break; case VEH_Aircraft: w->widget[1].unkA = STR_A009_AIRCRAFT; break;
default: NOT_REACHED(); break; default: NOT_REACHED(); break;
} }
if (owner != _local_player) break; // only set up buttons for local player
if (vl->list_length == 0) SETBIT(w->disabled_state, 9);
if (vehicle_type == VEH_Aircraft) {
w->widget[9].unkA = STR_SEND_TO_HANGARS;
w->widget[9].tooltips = STR_SEND_TO_HANGARS_TIP;
} else {
w->widget[9].unkA = STR_SEND_TO_DEPOTS;
w->widget[9].tooltips = STR_SEND_TO_DEPOTS_TIP;
}
break; break;
case VLW_STATION_LIST: case VLW_STATION_LIST: