diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2016-05-04 15:11:53 +0200 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2016-05-04 15:11:53 +0200 |
| commit | 6674bc4913961a4811ca0bf825b4e84a366ac3b9 (patch) | |
| tree | 83e989a844f997f858b3001ab48ced4dcb40477d | |
| parent | ac975b903ac17efee689bc28f363ff4141dbad90 (diff) | |
| download | RustAndDust-6674bc4913961a4811ca0bf825b4e84a366ac3b9.zip RustAndDust-6674bc4913961a4811ca0bf825b4e84a366ac3b9.tar.gz | |
Config: REPLAY_LAST / REPLAY_BATTLE
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/Config.java | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/Ctrl.java | 4 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/ctrl/Solo.java | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/menu/PlayMenu.java | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Config.java b/core/src/ch/asynk/rustanddust/game/Config.java index db7fb5c..af1e17a 100644 --- a/core/src/ch/asynk/rustanddust/game/Config.java +++ b/core/src/ch/asynk/rustanddust/game/Config.java @@ -39,8 +39,8 @@ public class Config { NEW("New", 0), RESUME("Resume", 1), - REPLAY_CURRENT("Replay Current Turn", 2), - REPLAY_ALL("Full Replay", 3); + REPLAY_LAST("Replay Last Turn", 2), + REPLAY_BATTLE("Replay Battle", 3); public String s; public int i; LoadMode(String s, int i) diff --git a/core/src/ch/asynk/rustanddust/game/Ctrl.java b/core/src/ch/asynk/rustanddust/game/Ctrl.java index db28b80..f3cf338 100644 --- a/core/src/ch/asynk/rustanddust/game/Ctrl.java +++ b/core/src/ch/asynk/rustanddust/game/Ctrl.java @@ -164,11 +164,11 @@ public abstract class Ctrl implements Disposable this.stateAfterAnimation = StateType.REPLAY; } break; - case REPLAY_CURRENT: + case REPLAY_LAST: map.prepareReplayCurrentTurn(); this.stateAfterAnimation = StateType.REPLAY; break; - case REPLAY_ALL: + case REPLAY_BATTLE: // TODO REPLAY ALL this.stateAfterAnimation = StateType.REPLAY; break; diff --git a/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java b/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java index 4821ec2..0d29d6d 100644 --- a/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java +++ b/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java @@ -42,9 +42,9 @@ public class Solo extends Ctrl { case NEW: break; case RESUME: r = game.db.loadGame(gameId); break; - case REPLAY_CURRENT: r = game.db.loadLastTurn(gameId); break; - case REPLAY_ALL: - // TODO REPLAY_ALL + case REPLAY_LAST: r = game.db.loadLastTurn(gameId); break; + case REPLAY_BATTLE: + // TODO REPLAY_BATTLE break; } return r; diff --git a/core/src/ch/asynk/rustanddust/menu/PlayMenu.java b/core/src/ch/asynk/rustanddust/menu/PlayMenu.java index 3fd0d4e..9823db0 100644 --- a/core/src/ch/asynk/rustanddust/menu/PlayMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/PlayMenu.java @@ -145,8 +145,8 @@ public class PlayMenu extends Patch implements MenuCtrl.Panel return setConfig(Config.LoadMode.RESUME); } else if (replayBtn.hit(x, y)) { game.playType(); - // TODO chose between : REPLAY_CURRENT / REPLAY_ALL - return setConfig(Config.LoadMode.REPLAY_CURRENT); + // TODO chose between : REPLAY_LAST / REPLAY_BATTLE + return setConfig(Config.LoadMode.REPLAY_LAST); } else if (list.hit(x, y)) { if (i != getList().getIdx()) game.playType(); |