summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-03-07 19:55:51 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2016-03-07 19:55:51 +0100
commit9ae4744a90f032a6bdc92b9c0389f0bc696e9e7f (patch)
treefb8e98380da694f1204f4ae41d360ef7c1f01085
parent6713a1ee20ed72e74117d1cee95ab2b48cb6c6e4 (diff)
downloadRustAndDust-9ae4744a90f032a6bdc92b9c0389f0bc696e9e7f.zip
RustAndDust-9ae4744a90f032a6bdc92b9c0389f0bc696e9e7f.tar.gz
Ctrl: only RustAndDust param for constructor
-rw-r--r--core/src/ch/asynk/rustanddust/game/Ctrl.java6
-rw-r--r--core/src/ch/asynk/rustanddust/game/ctrl/Solo.java4
2 files changed, 5 insertions, 5 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Ctrl.java b/core/src/ch/asynk/rustanddust/game/Ctrl.java
index 6a6dad5..4a4c4f6 100644
--- a/core/src/ch/asynk/rustanddust/game/Ctrl.java
+++ b/core/src/ch/asynk/rustanddust/game/Ctrl.java
@@ -55,17 +55,17 @@ public abstract class Ctrl implements Disposable
Ctrl ctrl = null;
switch(game.config.gameMode) {
case SOLO:
- ctrl = new Solo(game, game.config.battle);
+ ctrl = new Solo(game);
break;
}
return ctrl;
}
- public Ctrl(final RustAndDust game, final Battle battle)
+ public Ctrl(final RustAndDust game)
{
game.ctrl = this;
this.game = game;
- this.battle = battle;
+ this.battle = game.config.battle;
this.hud = new Hud(game);
this.blockMap = false;
diff --git a/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java b/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java
index 58c1a4b..f7d5540 100644
--- a/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java
+++ b/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java
@@ -8,9 +8,9 @@ public class Solo extends Ctrl
{
private int gameId;
- public Solo(final RustAndDust game, final Battle battle)
+ public Solo(final RustAndDust game)
{
- super(game, battle);
+ super(game);
}
@Override