summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/tankontank
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/ch/asynk/tankontank')
-rw-r--r--core/src/ch/asynk/tankontank/game/Ctrl.java (renamed from core/src/ch/asynk/tankontank/game/GameCtrl.java)4
-rw-r--r--core/src/ch/asynk/tankontank/game/GameFactory.java2
-rw-r--r--core/src/ch/asynk/tankontank/game/Hud.java4
-rw-r--r--core/src/ch/asynk/tankontank/game/Map.java4
-rw-r--r--core/src/ch/asynk/tankontank/game/MapA.java2
-rw-r--r--core/src/ch/asynk/tankontank/game/MapB.java2
-rw-r--r--core/src/ch/asynk/tankontank/game/states/GameStateCommon.java6
-rw-r--r--core/src/ch/asynk/tankontank/game/states/GameStateSelect.java4
-rw-r--r--core/src/ch/asynk/tankontank/screens/GameScreen.java6
9 files changed, 17 insertions, 17 deletions
diff --git a/core/src/ch/asynk/tankontank/game/GameCtrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java
index 0073c1c..bcf41c9 100644
--- a/core/src/ch/asynk/tankontank/game/GameCtrl.java
+++ b/core/src/ch/asynk/tankontank/game/Ctrl.java
@@ -9,7 +9,7 @@ import ch.asynk.tankontank.game.states.GameStateMove;
import ch.asynk.tankontank.game.states.GameStateRotate;
import ch.asynk.tankontank.game.states.GameStateAnimation;
-public class GameCtrl implements Disposable
+public class Ctrl implements Disposable
{
public class Config
@@ -51,7 +51,7 @@ public class GameCtrl implements Disposable
private GameState state;
- public GameCtrl(final TankOnTank game)
+ public Ctrl(final TankOnTank game)
{
this.game = game;
diff --git a/core/src/ch/asynk/tankontank/game/GameFactory.java b/core/src/ch/asynk/tankontank/game/GameFactory.java
index b84715d..3335b20 100644
--- a/core/src/ch/asynk/tankontank/game/GameFactory.java
+++ b/core/src/ch/asynk/tankontank/game/GameFactory.java
@@ -123,7 +123,7 @@ public class GameFactory implements Board.TileBuilder, Disposable
return cfg;
}
- public Map getMap(GameCtrl ctrl, AssetManager manager, MapType t)
+ public Map getMap(Ctrl ctrl, AssetManager manager, MapType t)
{
Board.Config cfg = config();
diff --git a/core/src/ch/asynk/tankontank/game/Hud.java b/core/src/ch/asynk/tankontank/game/Hud.java
index e7da8aa..3d5014b 100644
--- a/core/src/ch/asynk/tankontank/game/Hud.java
+++ b/core/src/ch/asynk/tankontank/game/Hud.java
@@ -19,7 +19,7 @@ public class Hud implements Disposable
private static final float OFFSET = 15f;
private final TankOnTank game;
- private final GameCtrl ctrl;
+ private final Ctrl ctrl;
private Image flag;
@@ -36,7 +36,7 @@ public class Hud implements Disposable
private float elapsed;
private Vector2 bottomLeft;
- public Hud(final GameCtrl ctrl, final TankOnTank game)
+ public Hud(final Ctrl ctrl, final TankOnTank game)
{
this.game = game;
this.ctrl = ctrl;
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index bb8ff58..85a4f59 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -17,7 +17,7 @@ import ch.asynk.tankontank.engine.gfx.animations.RunnableAnimation;
public abstract class Map extends Board
{
- private final GameCtrl ctrl;
+ private final Ctrl ctrl;
private final ArrayList<Vector3> finalPath = new ArrayList<Vector3>(10);
private final ArrayList<GridPoint2> possibleMoves = new ArrayList<GridPoint2>(40);
@@ -30,7 +30,7 @@ public abstract class Map extends Board
protected abstract void setup();
- public Map(GameCtrl ctrl, GameFactory factory, Board.Config cfg, Texture texture)
+ public Map(Ctrl ctrl, GameFactory factory, Board.Config cfg, Texture texture)
{
super(factory, cfg, texture);
this.ctrl = ctrl;
diff --git a/core/src/ch/asynk/tankontank/game/MapA.java b/core/src/ch/asynk/tankontank/game/MapA.java
index edf4dee..d76192e 100644
--- a/core/src/ch/asynk/tankontank/game/MapA.java
+++ b/core/src/ch/asynk/tankontank/game/MapA.java
@@ -8,7 +8,7 @@ import ch.asynk.tankontank.engine.Orientation;
public class MapA extends Map
{
- public MapA(GameCtrl ctrl, GameFactory factory, Board.Config cfg, Texture texture)
+ public MapA(Ctrl ctrl, GameFactory factory, Board.Config cfg, Texture texture)
{
super(ctrl, factory, cfg, texture);
}
diff --git a/core/src/ch/asynk/tankontank/game/MapB.java b/core/src/ch/asynk/tankontank/game/MapB.java
index 9682482..46927a6 100644
--- a/core/src/ch/asynk/tankontank/game/MapB.java
+++ b/core/src/ch/asynk/tankontank/game/MapB.java
@@ -8,7 +8,7 @@ import ch.asynk.tankontank.engine.Orientation;
public class MapB extends Map
{
- public MapB(GameCtrl ctrl, GameFactory factory, Board.Config cfg, Texture texture)
+ public MapB(Ctrl ctrl, GameFactory factory, Board.Config cfg, Texture texture)
{
super(ctrl, factory, cfg, texture);
}
diff --git a/core/src/ch/asynk/tankontank/game/states/GameStateCommon.java b/core/src/ch/asynk/tankontank/game/states/GameStateCommon.java
index da2d181..a759dc2 100644
--- a/core/src/ch/asynk/tankontank/game/states/GameStateCommon.java
+++ b/core/src/ch/asynk/tankontank/game/states/GameStateCommon.java
@@ -5,12 +5,12 @@ import com.badlogic.gdx.math.GridPoint2;
import ch.asynk.tankontank.engine.Pawn;
import ch.asynk.tankontank.game.Map;
import ch.asynk.tankontank.game.Hex;
-import ch.asynk.tankontank.game.GameCtrl;
+import ch.asynk.tankontank.game.Ctrl;
import ch.asynk.tankontank.game.GameState;
public abstract class GameStateCommon implements GameState
{
- protected static GameCtrl ctrl;
+ protected static Ctrl ctrl;
protected static Map map;
protected static Pawn activePawn;
protected static Pawn selectedPawn;
@@ -29,7 +29,7 @@ public abstract class GameStateCommon implements GameState
{
}
- public GameStateCommon(GameCtrl ctrl, Map map)
+ public GameStateCommon(Ctrl ctrl, Map map)
{
this.ctrl = ctrl;
this.map = map;
diff --git a/core/src/ch/asynk/tankontank/game/states/GameStateSelect.java b/core/src/ch/asynk/tankontank/game/states/GameStateSelect.java
index 309ee50..711daae 100644
--- a/core/src/ch/asynk/tankontank/game/states/GameStateSelect.java
+++ b/core/src/ch/asynk/tankontank/game/states/GameStateSelect.java
@@ -1,12 +1,12 @@
package ch.asynk.tankontank.game.states;
import ch.asynk.tankontank.game.Map;
-import ch.asynk.tankontank.game.GameCtrl;
+import ch.asynk.tankontank.game.Ctrl;
import ch.asynk.tankontank.game.GameState.State;
public class GameStateSelect extends GameStateCommon
{
- public GameStateSelect(GameCtrl ctrl, Map map)
+ public GameStateSelect(Ctrl ctrl, Map map)
{
super(ctrl, map);
}
diff --git a/core/src/ch/asynk/tankontank/screens/GameScreen.java b/core/src/ch/asynk/tankontank/screens/GameScreen.java
index 696cfd1..bf965ed 100644
--- a/core/src/ch/asynk/tankontank/screens/GameScreen.java
+++ b/core/src/ch/asynk/tankontank/screens/GameScreen.java
@@ -25,7 +25,7 @@ import com.badlogic.gdx.utils.viewport.ScreenViewport;
import ch.asynk.tankontank.TankOnTank;
-import ch.asynk.tankontank.game.GameCtrl;
+import ch.asynk.tankontank.game.Ctrl;
public class GameScreen implements Screen
{
@@ -49,7 +49,7 @@ public class GameScreen implements Screen
private ShapeRenderer debugShapes = null;
private final TankOnTank game;
- private GameCtrl ctrl;
+ private Ctrl ctrl;
private Vector2 dragPos = new Vector2();
private Vector3 touchPos = new Vector3();
@@ -59,7 +59,7 @@ public class GameScreen implements Screen
{
this.game = game;
- ctrl = new GameCtrl(game);
+ ctrl = new Ctrl(game);
virtualWidth = ctrl.map.getWidth();
virtualHeight = ctrl.map.getHeight();