From f61bd765a4d85c759304189adfc05be262c048f2 Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Sat, 15 Nov 2014 23:57:09 +0100 Subject: StateBreak,StateRotate: use Orientation fromAdj(Tile, Tile) --- core/src/ch/asynk/tankontank/game/states/StateBreak.java | 2 +- core/src/ch/asynk/tankontank/game/states/StateRotate.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/ch/asynk/tankontank/game') diff --git a/core/src/ch/asynk/tankontank/game/states/StateBreak.java b/core/src/ch/asynk/tankontank/game/states/StateBreak.java index 479f5aed..e9af3646 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateBreak.java +++ b/core/src/ch/asynk/tankontank/game/states/StateBreak.java @@ -59,7 +59,7 @@ public class StateBreak extends StateCommon map.hideBreakPawns(); } } else { - o = Orientation.fromAdj(to.getCol(), to.getRow(), downHex.getCol(), downHex.getRow()); + o = Orientation.fromAdj(to, downHex); if (o == Orientation.KEEP) return; diff --git a/core/src/ch/asynk/tankontank/game/states/StateRotate.java b/core/src/ch/asynk/tankontank/game/states/StateRotate.java index 130e2592..50cfce23 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateRotate.java +++ b/core/src/ch/asynk/tankontank/game/states/StateRotate.java @@ -85,7 +85,7 @@ public class StateRotate extends StateCommon { if (rotationSet) return; - o = Orientation.fromAdj(to.getCol(), to.getRow(), downHex.getCol(), downHex.getRow()); + o = Orientation.fromAdj(to, downHex); if (o == Orientation.KEEP) return; if (!activeUnit.movement.entryMove && rotateOnly && (o == activeUnit.getOrientation())) return; -- cgit v1.2.3