summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-11-16 01:19:41 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-11-16 01:19:41 +0100
commit4a94c483aa2062e25ffa6dc71b261fad528899d3 (patch)
tree3c13dcc0f724713c1b83b9dcdbf7f1216cc227d6 /core
parentc5ec3669fb3d7cada8b6cec513e1f2a3ab5c5f22 (diff)
downloadRustAndDust-4a94c483aa2062e25ffa6dc71b261fad528899d3.zip
RustAndDust-4a94c483aa2062e25ffa6dc71b261fad528899d3.tar.gz
StateBreak,StateRotate: use upHex in Orientation.fromAdj
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateBreak.java2
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateRotate.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/ch/asynk/tankontank/game/states/StateBreak.java b/core/src/ch/asynk/tankontank/game/states/StateBreak.java
index e9af364..6b5dea2 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, downHex);
+ o = Orientation.fromAdj(to, upHex);
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 50cfce2..c9949ab 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, downHex);
+ o = Orientation.fromAdj(to, upHex);
if (o == Orientation.KEEP) return;
if (!activeUnit.movement.entryMove && rotateOnly && (o == activeUnit.getOrientation())) return;