(svn r1460) -Fix: [1099225] Bug Fix - Vehicle Lists not updated at Acqusition (thx tamlin and mpetrov) This also fixes some bug but can't find i right now.

2 files changed, 13 insertions, 20 deletions

diff --git a/economy.c b/economy.c
index d7a58a749..0b63c3bf6 100644
--- a/economy.c
+++ b/economy.c
@@ -1519,6 +1519,7 @@ static void DoAcquireCompany(Player *p)
 	p->is_active = false;
 
 	DeletePlayerWindows(pi);
+	RebuildVehicleLists();	//Updates the open windows to add the newly acquired vehicles to the lists
 }
 
 extern int GetAmountOwnedBy(Player *p, byte owner);
diff --git a/vehicle_gui.c b/vehicle_gui.c
index 78cd4bd03..4cc1e956c 100644
--- a/vehicle_gui.c
+++ b/vehicle_gui.c
@@ -46,16 +46,12 @@ void RebuildVehicleLists(void)
 
 	for (w = _windows; w != _last_window; ++w)
 		switch (w->window_class) {
-			case WC_TRAINS_LIST:
-			case WC_ROADVEH_LIST:
-			case WC_SHIPS_LIST:
-			case WC_AIRCRAFT_LIST:
-				WP(w, vehiclelist_d).flags |= VL_REBUILD;
-				SetWindowDirty(w);
-				break;
-
-			default:
-				break;
+		case WC_TRAINS_LIST: case WC_ROADVEH_LIST:
+		case WC_SHIPS_LIST:  case WC_AIRCRAFT_LIST:
+			WP(w, vehiclelist_d).flags |= VL_REBUILD;
+			SetWindowDirty(w);
+			break;
+		default: break;
 		}
 }
 
@@ -65,16 +61,12 @@ void ResortVehicleLists(void)
 
 	for (w = _windows; w != _last_window; ++w)
 		switch (w->window_class) {
-			case WC_TRAINS_LIST:
-			case WC_ROADVEH_LIST:
-			case WC_SHIPS_LIST:
-			case WC_AIRCRAFT_LIST:
-				WP(w, vehiclelist_d).flags |= VL_RESORT;
-				SetWindowDirty(w);
-				break;
-
-			default:
-				break;
+		case WC_TRAINS_LIST: case WC_ROADVEH_LIST:
+		case WC_SHIPS_LIST:  case WC_AIRCRAFT_LIST:
+			WP(w, vehiclelist_d).flags |= VL_RESORT;
+			SetWindowDirty(w);
+			break;
+		default: break;
 		}
 }