From ea54afb0ce7fe12d5f96114d767244e7505a8a5c Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Mon, 25 Jan 2016 12:59:47 +0100 Subject: Player: getTurnDone() + getCurrentTurn() -> getTurn(), turn is increased at turn start --- core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java | 2 +- core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/ch/asynk/rustanddust/game/hud') diff --git a/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java b/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java index ab5c3685..515ba515 100644 --- a/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java +++ b/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java @@ -103,7 +103,7 @@ public class PlayerInfo implements Disposable, Drawable, Animation public void update(Player player, Position position) { unitDock.hide(); - turns.write(String.format("%d", player.getCurrentTurn())); + turns.write(String.format("%d", player.getTurn())); aps.write(String.format("%d", player.getAp())); int r = player.reinforcement(); if (r == 0) { diff --git a/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java b/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java index f4f997ae..9b2746c7 100644 --- a/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java +++ b/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java @@ -57,7 +57,7 @@ public class StatisticsPanel extends Patch public void show(Player winner, Player loser, Position position) { flag = ((winner.army == Army.US) ? usFlag : geFlag); - title.write("is triumphant in " + winner.getTurnDone() + " turns."); + title.write("is triumphant in " + winner.getTurn() + " turns."); stats1.write(winner.getStats()); stats2.write(loser.getStats()); -- cgit v1.2.3