From 2eba738b13e260835203d6c4479b162ad32fe6c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Sat, 22 Nov 2014 12:43:13 +0100 Subject: Map: resolve -> resolveFight --- core/src/ch/asynk/tankontank/game/Map.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index faf8857..6983426 100644 --- a/core/src/ch/asynk/tankontank/game/Map.java +++ b/core/src/ch/asynk/tankontank/game/Map.java @@ -265,7 +265,7 @@ public abstract class Map extends Board ctrl.animationDone(); } - private boolean resolve(Unit unit, final Unit target) + private boolean resolveFight(Unit unit, final Unit target) { int d1 = d6(); int d2 = d6(); @@ -326,10 +326,10 @@ public abstract class Map extends Board } boolean success; - success = resolve(unit, target); + success = resolveFight(unit, target); if (!success && mayReroll) { TankOnTank.debug("Reroll"); - success = resolve(unit, target); + success = resolveFight(unit, target); } TankOnTank.debug(unit + " engagements " + target + " : " + unit.engagement.calculus); -- cgit v1.1-2-g2b99