Merge pull request #372 from C7-Game/323-Fix-Zombie-Unit-Crash

Author: QuintillusCFC

C7Engine/AI/BarbarianAI.cs

@@ -34,7 +34,9 @@ public void PlayTurn(Player player, GameData gameData) {
 						//if it tries to move e.g. north from the north pole.  Hence, this check.
 						if (newLocation != Tile.NONE) {
 							log.Debug("Moving barbarian at " + unit.location + " to " + newLocation);
-							unit.move(unit.location.directionTo(newLocation));
+							if (!unit.move(unit.location.directionTo(newLocation))) {
+								break;
+							}
 						} else {
 							//Avoid potential infinite loop.
 							break;

C7Engine/MapUnitExtensions.cs

@@ -327,10 +327,18 @@ public static bool CanEnterTile(this MapUnit unit, Tile tile, bool allowCombat)
 		return true;
 	}
 
-	public static void move(this MapUnit unit, TileDirection dir, bool wait = false)
+	/// <summary>
+	/// Moves the unit in the given direction
+	/// </summary>
+	/// <param name="unit"></param>
+	/// <param name="dir">Which direction to move, e.g. northeast, west, etc.</param>
+	/// <param name="wait">Whether the method should wait to return until animations complete</param>
+	/// <returns>True if the unit is alive after the movement, false otherwise</returns>
+	/// <exception cref="Exception"></exception>
+	public static bool move(this MapUnit unit, TileDirection dir, bool wait = false)
 	{
 		(int dx, int dy) = dir.toCoordDiff();
-		var newLoc = EngineStorage.gameData.map.tileAt(dx + unit.location.xCoordinate, dy + unit.location.yCoordinate);
+		Tile newLoc = EngineStorage.gameData.map.tileAt(dx + unit.location.xCoordinate, dy + unit.location.yCoordinate);
 		if ((newLoc != Tile.NONE) && unit.CanEnterTile(newLoc, true) && (unit.movementPoints.canMove)) {
 			unit.facingDirection = dir;
 			unit.wake();
@@ -342,27 +350,31 @@ public static void move(this MapUnit unit, TileDirection dir, bool wait = false)
 					CombatResult combatResult = unit.fight(defender);
 					// If we were killed then of course there's nothing more to do. If the combat couldn't happen for whatever
 					// reason, just give up on trying to move.
-					if (combatResult == CombatResult.AttackerKilled || combatResult == CombatResult.Impossible)
-						return;
+					if (combatResult == CombatResult.AttackerKilled) {
+						return false;
+					}
+					if (combatResult == CombatResult.Impossible) {
+						return true;
+					}
 
 					// If the enemy was defeated, check if there is another enemy on the tile. If so we can't complete the move
 					// but still pay one movement point for the combat.
 					else if (combatResult == CombatResult.DefenderKilled || combatResult == CombatResult.DefenderRetreated) {
 						if (!unit.CanEnterTile(newLoc, false)) {
 							unit.movementPoints.onUnitMove(1);
-							return;
+							return true;
 						}
 
 					// Similarly if we retreated, pay one MP for the combat but don't move.
 					} else if (combatResult == CombatResult.AttackerRetreated) {
 						unit.movementPoints.onUnitMove(1);
-						return;
+						return true;
 					}
 				} else if (unit.unitType.bombard > 0) {
 					unit.bombard(newLoc);
-					return;
+					return true;
 				} else {
-					return;
+					return true;
 				}
 			}
 
@@ -375,6 +387,7 @@ public static void move(this MapUnit unit, TileDirection dir, bool wait = false)
 			unit.movementPoints.onUnitMove(movementCost);
 			unit.animate(MapUnit.AnimatedAction.RUN, wait);
 		}
+		return true;
 	}
 
 	public static float getMovementCost(Tile from, TileDirection dir, Tile newLocation) {

C7GameData/MapUnit.cs

@@ -61,7 +61,7 @@ public bool IsBusy() {
 	public override string ToString()
 	{
 		if (this != MapUnit.NONE) {
-			return this.owner + " " + unitType.name + " with " + movementPoints.remaining + " movement points and " + hitPointsRemaining + " hit points, guid = " + guid;
+			return this.owner + " " + unitType.name + "at (" + location.xCoordinate + ", " + location.yCoordinate + ") with " + movementPoints.remaining + " MP and " + hitPointsRemaining + " HP, guid = " + guid;
 		}
 		else {
 			return "This is the NONE unit";