diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2016-01-31 02:02:49 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2016-01-31 02:02:49 +0100 |
commit | 20d918bb62eb6cb47e8950567d49db452dfd01e8 (patch) | |
tree | c926444fb46b2e50fa485066c6d6ce53ca3e8847 /core | |
parent | d88b8545e39015d650b3d4a1a3f803598ad8a449 (diff) | |
download | RustAndDust-20d918bb62eb6cb47e8950567d49db452dfd01e8.zip RustAndDust-20d918bb62eb6cb47e8950567d49db452dfd01e8.tar.gz |
Revert "add ctrl/PvP"
This reverts commit 482662264372d53eb90e4dc41cb4372701a6c338.
Diffstat (limited to 'core')
-rw-r--r-- | core/src/ch/asynk/rustanddust/game/Config.java | 2 | ||||
-rw-r--r-- | core/src/ch/asynk/rustanddust/game/Ctrl.java | 4 | ||||
-rw-r--r-- | core/src/ch/asynk/rustanddust/game/ctrl/PvP.java | 25 |
3 files changed, 1 insertions, 30 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Config.java b/core/src/ch/asynk/rustanddust/game/Config.java index d9d355b..6e7001b 100644 --- a/core/src/ch/asynk/rustanddust/game/Config.java +++ b/core/src/ch/asynk/rustanddust/game/Config.java @@ -79,6 +79,6 @@ public class Config public boolean gameModeImplemented() { - return (gameMode != GameMode.PVE); + return (gameMode == GameMode.SOLO); } } diff --git a/core/src/ch/asynk/rustanddust/game/Ctrl.java b/core/src/ch/asynk/rustanddust/game/Ctrl.java index cefbb0f..6443372 100644 --- a/core/src/ch/asynk/rustanddust/game/Ctrl.java +++ b/core/src/ch/asynk/rustanddust/game/Ctrl.java @@ -5,7 +5,6 @@ import com.badlogic.gdx.utils.Disposable; import ch.asynk.rustanddust.RustAndDust; import ch.asynk.rustanddust.ui.Position; import ch.asynk.rustanddust.game.ctrl.Solo; -import ch.asynk.rustanddust.game.ctrl.PvP; import ch.asynk.rustanddust.game.State.StateType; import ch.asynk.rustanddust.game.states.StateCommon; import ch.asynk.rustanddust.game.states.StateSelect; @@ -57,9 +56,6 @@ public abstract class Ctrl implements Disposable case SOLO: ctrl = new Solo(game, game.config.battle); break; - case PVP: - ctrl = new PvP(game, game.config.battle); - break; } return ctrl; } diff --git a/core/src/ch/asynk/rustanddust/game/ctrl/PvP.java b/core/src/ch/asynk/rustanddust/game/ctrl/PvP.java deleted file mode 100644 index a10f547..0000000 --- a/core/src/ch/asynk/rustanddust/game/ctrl/PvP.java +++ /dev/null @@ -1,25 +0,0 @@ -package ch.asynk.rustanddust.game.ctrl; - -import ch.asynk.rustanddust.RustAndDust; -import ch.asynk.rustanddust.game.Ctrl; -import ch.asynk.rustanddust.game.Battle; - -public class PvP extends Ctrl -{ - private int gameId; - - public PvP(final RustAndDust game, final Battle battle) - { - super(game, battle); - } - - @Override - public void init() - { - } - - @Override - protected void processTurn() - { - } -} |