In Game.cs, fix the fact that our error catcher was not being invoked. This was happening because the camera-location-centering was not within the try/catch block, and we didn't catch that in the mega review because no one wanted to review that much code.

In ImportCiv3.cs, fix that setting world wrap only worked for BIQs, and stop trying to combine BIQ/SAV logic for areas that must be separate.  This was approved in a reviewed PR, but was not correct.

Author: QuintillusCFC

C7/Game.cs

@@ -51,6 +51,8 @@ public override void _EnterTree()
 	}
 
 	// Called when the node enters the scene tree for the first time.
+	// The catch should always catch any error, as it's the general catch
+	// that gives an error if we fail to load for some reason.
 	public override void _Ready()
 	{
 		Global = GetNode<GlobalSingleton>("/root/GlobalSingleton");
@@ -84,34 +86,37 @@ public override void _Ready()
 			catch {
 				ComponentManager.Instance.GetComponent<TurnCounterComponent>().SetTurnCounter();
 			}
+
+			// Hide slideout bar on startup
+			_on_SlideToggle_toggled(false);
+
+			// Set initial camera location. If the UI controller has any cities, focus on their capital. Otherwise, focus on their starting
+			// settler.
+			if (controller.cities.Count > 0)
+			{
+				City capital = controller.cities.Find(c => c.IsCapital());
+				if (capital != null)
+					mapView.centerCameraOnTile(capital.location);
+			}
+			else
+			{
+				MapUnit startingSettler = controller.units.Find(u => u.unitType.canFoundCity);
+				if (startingSettler != null)
+					mapView.centerCameraOnTile(startingSettler.location);
+			}
+
+			GD.Print("Now in game!");
+
+			loadTimer.Stop();
+			TimeSpan stopwatchElapsed = loadTimer.Elapsed;
+			GD.Print("Game scene load time: " + Convert.ToInt32(stopwatchElapsed.TotalMilliseconds) + " ms");
 		}
 		catch(Exception ex) {
 			errorOnLoad = true;
 			PopupOverlay popupOverlay = GetNode<PopupOverlay>(PopupOverlay.NodePath);
 			popupOverlay.ShowPopup(new ErrorMessage(ex.Message), PopupOverlay.PopupCategory.Advisor);
 			GD.PrintErr(ex);
 		}
-
-		// Hide slideout bar on startup
-		_on_SlideToggle_toggled(false);
-
-		// Set initial camera location. If the UI controller has any cities, focus on their capital. Otherwise, focus on their starting
-		// settler.
-		if (controller.cities.Count > 0) {
-			City capital = controller.cities.Find(c => c.IsCapital());
-			if (capital != null)
-				mapView.centerCameraOnTile(capital.location);
-		} else {
-			MapUnit startingSettler = controller.units.Find(u => u.unitType.canFoundCity);
-			if (startingSettler != null)
-				mapView.centerCameraOnTile(startingSettler.location);
-		}
-
-		GD.Print("Now in game!");
-
-		loadTimer.Stop();
-		TimeSpan stopwatchElapsed = loadTimer.Elapsed;
-		GD.Print("Game scene load time: " + Convert.ToInt32(stopwatchElapsed.TotalMilliseconds) + " ms");
 	}
 
 	// Must only be called while holding the game data mutex

C7GameData/ImportCiv3.cs

@@ -30,8 +30,8 @@ public static C7SaveFormat ImportSav(string savePath, string defaultBicPath)
 
 			ImportCiv3TerrainTypes(theBiq, c7Save);
 			Dictionary<int, Resource> resourcesByIndex = ImportCiv3Resources(civ3Save.Bic, c7Save);
-			SetMapDimensions(civ3Save, theBiq, c7Save);
-			SetWorldWrap(theBiq, c7Save);
+			SetMapDimensions(civ3Save, c7Save);
+			SetWorldWrap(civ3Save, c7Save);
 
 			// Import tiles.  This is similar to, but different from the BIQ version as tile contents may have changed in-game.
 			int i = 0;
@@ -85,7 +85,7 @@ public static C7SaveFormat ImportBiq(string biqPath, string defaultBiqPath)
 
 			ImportCiv3TerrainTypes(theBiq, c7Save);
 			Dictionary<int, Resource> resourcesByIndex = ImportCiv3Resources(theBiq, c7Save);
-			SetMapDimensions(null, theBiq, c7Save);
+			SetMapDimensions(theBiq, c7Save);
 			SetWorldWrap(theBiq, c7Save);
 
 			// Import tiles
@@ -187,22 +187,40 @@ private static void ImportCiv3TerrainTypes(BiqData theBiq, C7SaveFormat c7Save)
 			}
 		}
 
+		private static void SetWorldWrap(SavData civ3Save, C7SaveFormat c7Save)
+		{
+			if (civ3Save != null && civ3Save.Wrld.Height > 0 && civ3Save.Wrld.Width > 0)
+			{
+				c7Save.GameData.map.wrapHorizontally = civ3Save.Wrld.XWrapping;
+				c7Save.GameData.map.wrapVertically = civ3Save.Wrld.YWrapping;
+			}
+		}
+
 		private static void SetWorldWrap(BiqData biq, C7SaveFormat c7Save)
         {
-			c7Save.GameData.map.wrapHorizontally = biq.Wmap[0].XWrapping;
-			c7Save.GameData.map.wrapVertically = biq.Wmap[0].YWrapping;
-        }
 
-		private static void SetMapDimensions(SavData civ3Save, BiqData biq, C7SaveFormat c7Save)
-		{
-			if (biq != null && biq.Wmap != null && biq.Wmap.Length > 0) {
-				c7Save.GameData.map.numTilesTall = biq.Wmap[0].Height;
-				c7Save.GameData.map.numTilesWide = biq.Wmap[0].Width;
+			if (biq != null && biq.Wmap != null && biq.Wmap.Length > 0)
+			{
+				c7Save.GameData.map.wrapHorizontally = biq.Wmap[0].XWrapping;
+				c7Save.GameData.map.wrapVertically = biq.Wmap[0].YWrapping;
 			}
+		}
+
+		private static void SetMapDimensions(SavData civ3Save, C7SaveFormat c7Save)
+		{
 			if (civ3Save != null && civ3Save.Wrld.Height > 0 && civ3Save.Wrld.Width > 0) {
 				c7Save.GameData.map.numTilesTall = civ3Save.Wrld.Height;
 				c7Save.GameData.map.numTilesWide = civ3Save.Wrld.Width;
 			}
 		}
-    }
+
+		private static void SetMapDimensions(BiqData biq, C7SaveFormat c7Save)
+		{
+			if (biq != null && biq.Wmap != null && biq.Wmap.Length > 0)
+			{
+				c7Save.GameData.map.numTilesTall = biq.Wmap[0].Height;
+				c7Save.GameData.map.numTilesWide = biq.Wmap[0].Width;
+			}
+		}
+	}
 }