summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/tankontank/game/hud
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-11-17 14:52:51 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-11-17 14:52:51 +0100
commit8d6f8738203d45d4da116e390b6e6685f4636bb3 (patch)
treecc78b335fcbf9f805f419d9f7aa33284b3c3b815 /core/src/ch/asynk/tankontank/game/hud
parentb4c82404bcb7b2e1f58339088ccf48023c1da6f9 (diff)
downloadRustAndDust-8d6f8738203d45d4da116e390b6e6685f4636bb3.zip
RustAndDust-8d6f8738203d45d4da116e390b6e6685f4636bb3.tar.gz
Player: clean up API
Diffstat (limited to 'core/src/ch/asynk/tankontank/game/hud')
-rw-r--r--core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java4
-rw-r--r--core/src/ch/asynk/tankontank/game/hud/UnitDock.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java b/core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java
index 5cd4b5f..4ac8c88 100644
--- a/core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java
+++ b/core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java
@@ -95,7 +95,7 @@ public class PlayerInfo implements Disposable, Drawable
unitDock.hide();
turns.write("" + player.getTurn());
aps.write("" + player.getAp());
- int r = player.getReinforcement().size();
+ int r = player.reinforcement();
if (r == 0) {
reinforcement.visible = false;
} else {
@@ -103,7 +103,7 @@ public class PlayerInfo implements Disposable, Drawable
reinforcement.write("" + r);
}
- if (player.getFaction() == Army.GE)
+ if (player.is(Army.GE))
flag = geFlag;
else
flag = usFlag;
diff --git a/core/src/ch/asynk/tankontank/game/hud/UnitDock.java b/core/src/ch/asynk/tankontank/game/hud/UnitDock.java
index 0e67630..ce2ac04 100644
--- a/core/src/ch/asynk/tankontank/game/hud/UnitDock.java
+++ b/core/src/ch/asynk/tankontank/game/hud/UnitDock.java
@@ -96,9 +96,9 @@ public class UnitDock extends Bg
{
float x = position.getX(rect.width * SCALE);
if (done) {
- pawns = ctrl.player.getReinforcement();
- if(pawns.size() == 0)
+ if(ctrl.player.reinforcement() == 0)
return;
+ pawns = ctrl.player.reinforcement;
rect.width = pawns.get(0).getWidth() + (2 * padding);
rect.height = ((pawns.get(0).getHeight() * pawns.size()) + ((pawns.size() + 1) * padding));
rect.x = (position.isLeft() ? (0 - (rect.width * SCALE)) : (x + (rect.width * SCALE)));