diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-22 12:43:13 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-22 12:43:13 +0100 |
| commit | 2eba738b13e260835203d6c4479b162ad32fe6c5 (patch) | |
| tree | 6f03d80d125cce758aeaf569fb801122b53e1144 /core/src | |
| parent | 0acd0e9959fd850223ba1212a5a4776f3cbf40bf (diff) | |
| download | RustAndDust-2eba738b13e260835203d6c4479b162ad32fe6c5.zip RustAndDust-2eba738b13e260835203d6c4479b162ad32fe6c5.tar.gz | |
Map: resolve -> resolveFight
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/Map.java | 6 |
1 files 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); |