(svn r14182) -Fix: After applying NewGRF settings, all rail and road types were available as the engine availability check was performed too early.

2 files changed, 7 insertions, 7 deletions

diff --git a/src/engine.cpp b/src/engine.cpp
index 8f70f5109..ffc6c0176 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -279,6 +279,13 @@ void StartupEngines()
 			e->player_avail = 0;
 		}
 	}
+
+	/* Update the bitmasks for the vehicle lists */
+	Player *p;
+	FOR_ALL_PLAYERS(p) {
+		p->avail_railtypes = GetPlayerRailtypes(p->index);
+		p->avail_roadtypes = GetPlayerRoadtypes(p->index);
+	}
 }
 
 static void AcceptEnginePreview(EngineID eid, PlayerID player)
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index cd57977f0..2fc15c06a 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -6002,13 +6002,6 @@ static void AfterLoadGRFs()
 	}
 	_grf_line_to_action6_sprite_override.clear();
 
-	/* Update the bitmasks for the vehicle lists */
-	Player *p;
-	FOR_ALL_PLAYERS(p) {
-		p->avail_railtypes = GetPlayerRailtypes(p->index);
-		p->avail_roadtypes = GetPlayerRoadtypes(p->index);
-	}
-
 	/* Pre-calculate all refit masks after loading GRF files. */
 	CalculateRefitMasks();