Fix the city update breaking things. One of those rare cases where there's no Git conflict, but it still breaks, in this case due to the interface/abstract class name changing.

There probably is a way to set up actions to compile with the base on the MR, and thus catch this sort of thing.  Alternately, always rebasing and running prior to merging.

Author: QuintillusCFC

C7/MapView.cs

@@ -150,7 +150,7 @@ public override void drawObject(LooseView looseView, Tile tile, Vector2 tileCent
 			if (hpHeight < 1)
 				hpHeight = 1;
 			var hpContentsRect = new Rect2(hpIndBackgroundRect.Position + new Vector2(1, hpIndHeight - 1 - hpHeight), // position
-			                               new Vector2(hpIndWidth - 2, hpHeight)); // size
+										   new Vector2(hpIndWidth - 2, hpHeight)); // size
 			looseView.DrawRect(hpContentsRect, getHPColor(hpFraction));
 			if (unit.isFortified)
 				looseView.DrawRect(hpIndBackgroundRect, white, false);
@@ -192,7 +192,7 @@ public override void drawObject(LooseView looseView, Tile tile, Vector2 tileCent
 	}
 }
 
-public class CityLayer : ILooseLayer {
+public class CityLayer : LooseLayer {
 	private ImageTexture cityTexture;
 	private Vector2 citySpriteSize;
 
@@ -203,7 +203,7 @@ public CityLayer()
 		this.citySpriteSize = new Vector2(167, 95);
 	}
 
-	public void drawObject(LooseView looseView, Tile tile, Vector2 tileCenter)
+	public override void drawObject(LooseView looseView, Tile tile, Vector2 tileCenter)
 	{
 		if (tile.cityAtTile != null) {
 			City city = tile.cityAtTile;