diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-03 09:15:53 +0200 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-03 09:15:53 +0200 |
| commit | 350426130bd412ba2a4858b86195b881a8bf4852 (patch) | |
| tree | e2185c515b88898f98a18a6aca067612088e35df /core/src/ch/asynk/tankontank/game | |
| parent | 6809c19db45d5cdb40ce28c52a8a86d94f890473 (diff) | |
| download | RustAndDust-350426130bd412ba2a4858b86195b881a8bf4852.zip RustAndDust-350426130bd412ba2a4858b86195b881a8bf4852.tar.gz | |
Board.Orientation -> Orientation
Diffstat (limited to 'core/src/ch/asynk/tankontank/game')
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/Hex.java | 5 | ||||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/MapA.java | 13 | ||||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/MapB.java | 13 |
3 files changed, 17 insertions, 14 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Hex.java b/core/src/ch/asynk/tankontank/game/Hex.java index 8fb7be8..70377ac 100644 --- a/core/src/ch/asynk/tankontank/game/Hex.java +++ b/core/src/ch/asynk/tankontank/game/Hex.java @@ -7,6 +7,7 @@ import com.badlogic.gdx.graphics.g2d.TextureAtlas; import ch.asynk.tankontank.engine.Pawn; import ch.asynk.tankontank.engine.Tile; import ch.asynk.tankontank.engine.Board; +import ch.asynk.tankontank.engine.Orientation; public class Hex extends Tile { @@ -65,13 +66,13 @@ public class Hex extends Tile } @Override - public boolean road(Board.Orientation side) + public boolean road(Orientation side) { return (side.s == (roads & side.s)); } @Override - public int costFrom(Pawn pawn, Board.Orientation side, boolean road) + public int costFrom(Pawn pawn, Orientation side, boolean road) { if (hasUnits()) return Integer.MAX_VALUE; if (road) return 1; diff --git a/core/src/ch/asynk/tankontank/game/MapA.java b/core/src/ch/asynk/tankontank/game/MapA.java index f190b4b..686efed 100644 --- a/core/src/ch/asynk/tankontank/game/MapA.java +++ b/core/src/ch/asynk/tankontank/game/MapA.java @@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.TextureAtlas; import ch.asynk.tankontank.engine.Board; +import ch.asynk.tankontank.engine.Orientation; public class MapA extends Map { @@ -40,12 +41,12 @@ public class MapA extends Map getHex(12, 5).terrain = Hex.Terrain.OFFMAP; getHex(13, 7).terrain = Hex.Terrain.OFFMAP; - int N = Map.Orientation.NORTH.s; - int S = Map.Orientation.SOUTH.s; - int NE = Map.Orientation.NORTH_EAST.s; - int NW = Map.Orientation.NORTH_WEST.s; - int SE = Map.Orientation.SOUTH_EAST.s; - int SW = Map.Orientation.SOUTH_WEST.s; + int N = Orientation.NORTH.s; + int S = Orientation.SOUTH.s; + int NE = Orientation.NORTH_EAST.s; + int NW = Orientation.NORTH_WEST.s; + int SE = Orientation.SOUTH_EAST.s; + int SW = Orientation.SOUTH_WEST.s; getHex(6, 1).roads = (NW | SW); for (int i = 1; i < 11; i++) { diff --git a/core/src/ch/asynk/tankontank/game/MapB.java b/core/src/ch/asynk/tankontank/game/MapB.java index cdce945..35416a9 100644 --- a/core/src/ch/asynk/tankontank/game/MapB.java +++ b/core/src/ch/asynk/tankontank/game/MapB.java @@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.TextureAtlas; import ch.asynk.tankontank.engine.Board; +import ch.asynk.tankontank.engine.Orientation; public class MapB extends Map { @@ -40,12 +41,12 @@ public class MapB extends Map getHex(12, 5).terrain = Hex.Terrain.OFFMAP; getHex(13, 7).terrain = Hex.Terrain.OFFMAP; - int N = Map.Orientation.NORTH.s; - int S = Map.Orientation.SOUTH.s; - int NE = Map.Orientation.NORTH_EAST.s; - int NW = Map.Orientation.NORTH_WEST.s; - int SE = Map.Orientation.SOUTH_EAST.s; - int SW = Map.Orientation.SOUTH_WEST.s; + int N = Orientation.NORTH.s; + int S = Orientation.SOUTH.s; + int NE = Orientation.NORTH_EAST.s; + int NW = Orientation.NORTH_WEST.s; + int SE = Orientation.SOUTH_EAST.s; + int SW = Orientation.SOUTH_WEST.s; getHex(1, 2).roads = (S | NW); getHex(2, 3).roads = (SE | N); |