Mercurial Mercurial > openttd-mini / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
(svn r6181) -Fix r6161: The list of vehicles using a certain station got a bit of display code mixed up with the list of vehicles with shared orders (nycom)
authorbjarni
Mon, 28 Aug 2006 06:13:16 +0000
changeset 4426 8be999e98132
parent 4425 f15ad32f87e5
child 4427 46b841560ec7
(svn r6181) -Fix r6161: The list of vehicles using a certain station got a bit of display code mixed up with the list of vehicles with shared orders (nycom)
aircraft_gui.c file | annotate | diff | comparison | revisions
roadveh_gui.c file | annotate | diff | comparison | revisions
ship_gui.c file | annotate | diff | comparison | revisions
train_gui.c file | annotate | diff | comparison | revisions 
--- a/aircraft_gui.c	Mon Aug 28 06:05:04 2006 +0000
+++ b/aircraft_gui.c	Mon Aug 28 06:13:16 2006 +0000
@@ -1009,13 +1009,17 @@
 
 static void PlayerAircraftWndProc(Window *w, WindowEvent *e)
 {
-	OrderID order = GB(w->window_number, 16, 16);
-	/* Sorting a shared order list relies on station being set to INVALID_STATION */
-	/* If station is not INVALID_STATION, then order is never used and we don't care what it contains */
-	StationID station = (w->window_number & SHARE_FLAG) ? INVALID_STATION : order;
+	OrderID order = INVALID_ORDER;
+	StationID station = INVALID_STATION;
 	PlayerID owner = GB(w->window_number, 0, 8);
 	vehiclelist_d *vl = &WP(w, vehiclelist_d);
 
+	if (w->window_number & SHARE_FLAG) {
+		order = GB(w->window_number, 16, 16);
+	} else {
+		station = GB(w->window_number, 16, 16);
+	}
+
 	switch (e->event) {
 	case WE_PAINT: {
 		int x = 2;
--- a/roadveh_gui.c	Mon Aug 28 06:05:04 2006 +0000
+++ b/roadveh_gui.c	Mon Aug 28 06:13:16 2006 +0000
@@ -947,13 +947,17 @@
 
 static void PlayerRoadVehWndProc(Window *w, WindowEvent *e)
 {
-	OrderID order = GB(w->window_number, 16, 16);
-	/* Sorting a shared order list relies on station being set to INVALID_STATION */
-	/* If station is not INVALID_STATION, then order is never used and we don't care what it contains */
-	StationID station = (w->window_number & SHARE_FLAG) ? INVALID_STATION : order;
+	OrderID order = INVALID_ORDER;
+	StationID station = INVALID_STATION;
 	PlayerID owner = GB(w->window_number, 0, 8);
 	vehiclelist_d *vl = &WP(w, vehiclelist_d);
 
+	if (w->window_number & SHARE_FLAG) {
+		order = GB(w->window_number, 16, 16);
+	} else {
+		station = GB(w->window_number, 16, 16);
+	}
+
 	switch (e->event) {
 	case WE_PAINT: {
 		int x = 2;
--- a/ship_gui.c	Mon Aug 28 06:05:04 2006 +0000
+++ b/ship_gui.c	Mon Aug 28 06:13:16 2006 +0000
@@ -956,13 +956,17 @@
 
 static void PlayerShipsWndProc(Window *w, WindowEvent *e)
 {
-	OrderID order = GB(w->window_number, 16, 16);
-	/* Sorting a shared order list relies on station being set to INVALID_STATION */
-	/* If station is not INVALID_STATION, then order is never used and we don't care what it contains */
-	StationID station = (w->window_number & SHARE_FLAG) ? INVALID_STATION : order;
+	OrderID order = INVALID_ORDER;
+	StationID station = INVALID_STATION;
 	PlayerID owner = GB(w->window_number, 0, 8);
 	vehiclelist_d *vl = &WP(w, vehiclelist_d);
 
+	if (w->window_number & SHARE_FLAG) {
+		order = GB(w->window_number, 16, 16);
+	} else {
+		station = GB(w->window_number, 16, 16);
+	}
+
 	switch (e->event) {
 	case WE_PAINT: {
 		int x = 2;
--- a/train_gui.c	Mon Aug 28 06:05:04 2006 +0000
+++ b/train_gui.c	Mon Aug 28 06:13:16 2006 +0000
@@ -1406,13 +1406,17 @@
 
 static void PlayerTrainsWndProc(Window *w, WindowEvent *e)
 {
-	OrderID order = GB(w->window_number, 16, 16);
-	/* Sorting a shared order list relies on station being set to INVALID_STATION */
-	/* If station is not INVALID_STATION, then order is never used and we don't care what it contains */
-	StationID station = (w->window_number & SHARE_FLAG) ? INVALID_STATION : order;
+	OrderID order = INVALID_ORDER;
+	StationID station = INVALID_STATION;
 	PlayerID owner = GB(w->window_number, 0, 8);
 	vehiclelist_d *vl = &WP(w, vehiclelist_d);
 
+	if (w->window_number & SHARE_FLAG) {
+		order = GB(w->window_number, 16, 16);
+	} else {
+		station = GB(w->window_number, 16, 16);
+	}
+
 	switch (e->event) {
 	case WE_PAINT: {
 		int x = 2;
openttd-mini