summaryrefslogtreecommitdiffstats
path: root/test/src/ch
diff options
context:
space:
mode:
Diffstat (limited to 'test/src/ch')
-rw-r--r--test/src/ch/asynk/gdx/boardgame/test/BoardScreen.java10
-rw-r--r--test/src/ch/asynk/gdx/boardgame/test/HexScreen.java6
-rw-r--r--test/src/ch/asynk/gdx/boardgame/test/Tests.java4
3 files changed, 10 insertions, 10 deletions
diff --git a/test/src/ch/asynk/gdx/boardgame/test/BoardScreen.java b/test/src/ch/asynk/gdx/boardgame/test/BoardScreen.java
index de70ce4..7e25363 100644
--- a/test/src/ch/asynk/gdx/boardgame/test/BoardScreen.java
+++ b/test/src/ch/asynk/gdx/boardgame/test/BoardScreen.java
@@ -74,7 +74,7 @@ public class BoardScreen extends AbstractScreen
{
board.toBoard(x, y, v);
Tile tile = board.getTile((int)v.x, (int)v.y);
- if (!tile.isOnMap())
+ if (!tile.isOnBoard())
return false;
if (down) {
if (!dragging && panzer.isOn(tile)) {
@@ -122,7 +122,7 @@ public class BoardScreen extends AbstractScreen
private void clearAdjacents()
{
for (Tile tile : board.getAdjacents()) {
- if (tile.isOnMap()) {
+ if (tile.isOnBoard()) {
tilesToDraw.remove(tile);
tile.enableOverlay(12, false);
}
@@ -134,16 +134,16 @@ public class BoardScreen extends AbstractScreen
clearAdjacents();
board.buildAdjacents((int)v.x, (int)v.y);
for (Tile tile : board.getAdjacents()) {
- if (tile.isOnMap()) {
+ if (tile.isOnBoard()) {
tilesToDraw.add(tile);
tile.enableOverlay(12, true);
}
}
}
- private Tile getTile(int x, int y, boolean isOnMap)
+ private Tile getTile(int x, int y, boolean isOnBoard)
{
- if (isOnMap)
+ if (isOnBoard)
return tileStorage.getTile(x, y, board::genKey, this::buildTile);
return Tile.OffMap;
}
diff --git a/test/src/ch/asynk/gdx/boardgame/test/HexScreen.java b/test/src/ch/asynk/gdx/boardgame/test/HexScreen.java
index cda4521..c3d93f2 100644
--- a/test/src/ch/asynk/gdx/boardgame/test/HexScreen.java
+++ b/test/src/ch/asynk/gdx/boardgame/test/HexScreen.java
@@ -275,9 +275,9 @@ public class HexScreen extends AbstractScreen
public int getWidth() { return map.getWidth(); }
public int getHeight() { return map.getHeight(); }
- private Tile getTile(int x, int y, boolean isOnMap)
+ private Tile getTile(int x, int y, boolean isOnBoard)
{
- if (isOnMap)
+ if (isOnBoard)
return tileStorage.getTile(x, y, board::genKey, this::buildTile);
return Tile.OffMap;
}
@@ -328,7 +328,7 @@ public class HexScreen extends AbstractScreen
{
board.toBoard(x, y, v);
Tile tile = board.getTile((int)v.x, (int)v.y);
- if (!tile.isOnMap())
+ if (!tile.isOnBoard())
return false;
if (down) {
if (!panzer.dragging && panzer.isOn(tile)) {
diff --git a/test/src/ch/asynk/gdx/boardgame/test/Tests.java b/test/src/ch/asynk/gdx/boardgame/test/Tests.java
index eff7afa..9120bcc 100644
--- a/test/src/ch/asynk/gdx/boardgame/test/Tests.java
+++ b/test/src/ch/asynk/gdx/boardgame/test/Tests.java
@@ -76,9 +76,9 @@ public class Tests
check((g == k), title, "Key", k);
}
- private Tile getTile(int x, int y, boolean isOnMap)
+ private Tile getTile(int x, int y, boolean isOnBoard)
{
- if (isOnMap)
+ if (isOnBoard)
return tileStorage.getTile(x, y, board::genKey, this::buildTile);
return Tile.OffMap;
}