Mercurial > hg > openttd

changeset 4476:0234aff1c706 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r6261) -Fix r6246: fixed sprite related crash related to other player's vehicle list windows (spotted by Darkvater)
author bjarni <bjarni@openttd.org>
date Thu, 31 Aug 2006 09:40:10 +0000
parents ca1fd3b4fd87
children d0ae9e77fbc1
files vehicle_gui.c
diffstat 1 files changed, 12 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/vehicle_gui.c
+++ b/vehicle_gui.c
@@ -1251,6 +1251,8 @@
 					}
 					SetDParam(0, w->vscroll.count);
 					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;
 					SETBIT(w->disabled_state, 10);
 
@@ -1268,14 +1270,6 @@
 					SetDParam(0, p->name_1);
 					SetDParam(1, p->name_2);
 					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) {
 						case VEH_Train:    w->widget[1].unkA = STR_881B_TRAINS;        break;
@@ -1284,6 +1278,16 @@
 						case VEH_Aircraft: w->widget[1].unkA = STR_A009_AIRCRAFT;      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;
 
 				case VLW_STATION_LIST: