summaryrefslogtreecommitdiffstats
path: root/core/src
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-12-18 15:29:53 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-12-18 15:29:53 +0100
commitc5df6133eec3a97ae7e5a7c5b310bf0be45bafe6 (patch)
treeba71088afe63ae03b821ecb62f80bac9748cf4fa /core/src
parentf5c600909b82c4b222ea1c8a0f2e15651b426ead (diff)
downloadRustAndDust-c5df6133eec3a97ae7e5a7c5b310bf0be45bafe6.zip
RustAndDust-c5df6133eec3a97ae7e5a7c5b310bf0be45bafe6.tar.gz
Ctrl,Hud: remove askEndDeployment() dead code
Diffstat (limited to 'core/src')
-rw-r--r--core/src/ch/asynk/tankontank/game/Ctrl.java10
-rw-r--r--core/src/ch/asynk/tankontank/game/Hud.java10
-rw-r--r--core/src/ch/asynk/tankontank/game/hud/OkCancel.java1
3 files changed, 1 insertions, 20 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java
index b4dcb1f..0e6caa5 100644
--- a/core/src/ch/asynk/tankontank/game/Ctrl.java
+++ b/core/src/ch/asynk/tankontank/game/Ctrl.java
@@ -283,10 +283,7 @@ public class Ctrl implements Disposable
public boolean checkDeploymentDone()
{
- boolean done = battle.deploymentDone(player);
- // if (done)
- // hud.askEndDeployment();
- return done;
+ return battle.deploymentDone(player);
}
public void reinforcementHit()
@@ -299,11 +296,6 @@ public class Ctrl implements Disposable
// Hud callbacks
- public void endDeployment()
- {
- deploymentDone();
- }
-
public void endGame()
{
game.setScreen(new OptionsScreen(game));
diff --git a/core/src/ch/asynk/tankontank/game/Hud.java b/core/src/ch/asynk/tankontank/game/Hud.java
index 6d8961a..91215d0 100644
--- a/core/src/ch/asynk/tankontank/game/Hud.java
+++ b/core/src/ch/asynk/tankontank/game/Hud.java
@@ -234,10 +234,6 @@ public class Hud implements Disposable, Animation
if (ok)
ctrl.endPlayerTurn(true);
break;
- case END_DEPLOYMENT:
- if (ok)
- ctrl.endDeployment();
- break;
}
}
@@ -280,12 +276,6 @@ public class Hud implements Disposable, Animation
pushDialog(okCancel);
}
- public void askEndDeployment()
- {
- okCancel.show("Deployment unit count reached.\nEnd Deployment phase ?", OkCancel.Action.END_DEPLOYMENT);
- pushDialog(okCancel);
- }
-
public void engagementSummary(Map.Engagement e, float volume)
{
engagement.show(e, Position.BOTTOM_CENTER, volume);
diff --git a/core/src/ch/asynk/tankontank/game/hud/OkCancel.java b/core/src/ch/asynk/tankontank/game/hud/OkCancel.java
index 0ea04c3..60862b6 100644
--- a/core/src/ch/asynk/tankontank/game/hud/OkCancel.java
+++ b/core/src/ch/asynk/tankontank/game/hud/OkCancel.java
@@ -22,7 +22,6 @@ public class OkCancel extends Patch
EXIT_BOARD,
ABORT_TURN,
END_TURN,
- END_DEPLOYMENT,
}
public OkCancel(BitmapFont font, TextureAtlas atlas)