diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-23 21:24:58 +0200 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-23 21:24:58 +0200 |
commit | 81808d5d40c00d969f5526ffee1317021e651b9a (patch) | |
tree | 143abd24f385af57d42279f88251cf76cb3ef561 /core/src/ch/asynk/tankontank/game/Map.java | |
parent | a03226aa0991ae72336da23f249f74e9c24dff8f (diff) | |
download | RustAndDust-81808d5d40c00d969f5526ffee1317021e651b9a.zip RustAndDust-81808d5d40c00d969f5526ffee1317021e651b9a.tar.gz |
Map,BattleFake,StateCommon: match map API
Diffstat (limited to 'core/src/ch/asynk/tankontank/game/Map.java')
-rw-r--r-- | core/src/ch/asynk/tankontank/game/Map.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index 9c7a882..e6ce882 100644 --- a/core/src/ch/asynk/tankontank/game/Map.java +++ b/core/src/ch/asynk/tankontank/game/Map.java @@ -92,9 +92,9 @@ public abstract class Map extends Board return (Hex) getTile(col, row); } - public Hex getHexSafe(GridPoint2 hex) + public Hex getHexSafe(int col, int row) { - return (Hex) getTileSafe(hex.x, hex.y); + return (Hex) getTileSafe(col, row); } public GridPoint2 getFirstMoveAssist() @@ -398,9 +398,8 @@ public abstract class Map extends Board public void promote(Pawn pawn, Pawn with) { - GridPoint2 coords = getHexUnder(pawn); - removePawnFrom(pawn, coords); - setPawnAt(with, coords, pawn.getOrientation()); + removePawn(pawn); + setPawnOnto(with, pawn.getTile(), pawn.getOrientation()); activatedPawns.add(with); } } |