diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-12 11:44:12 +0200 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-12 11:44:12 +0200 |
commit | a745392ca2863e2f5036207e5c4a75e851016737 (patch) | |
tree | a60502000707ac0fc677395f37396a8d1040f76f /core | |
parent | 987041cdfe8b0726878dd8be57b334acbc45b89e (diff) | |
download | RustAndDust-a745392ca2863e2f5036207e5c4a75e851016737.zip RustAndDust-a745392ca2863e2f5036207e5c4a75e851016737.tar.gz |
rename GameFactory -> Factory
Diffstat (limited to 'core')
-rw-r--r-- | core/src/ch/asynk/tankontank/game/Ctrl.java | 6 | ||||
-rw-r--r-- | core/src/ch/asynk/tankontank/game/Factory.java (renamed from core/src/ch/asynk/tankontank/game/GameFactory.java) | 4 | ||||
-rw-r--r-- | core/src/ch/asynk/tankontank/game/Map.java | 2 | ||||
-rw-r--r-- | core/src/ch/asynk/tankontank/game/MapA.java | 2 | ||||
-rw-r--r-- | core/src/ch/asynk/tankontank/game/MapB.java | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java index bcf41c9..b2920c2 100644 --- a/core/src/ch/asynk/tankontank/game/Ctrl.java +++ b/core/src/ch/asynk/tankontank/game/Ctrl.java @@ -34,7 +34,7 @@ public class Ctrl implements Disposable private final TankOnTank game; - private GameFactory factory; + private Factory factory; public Map map; public Hud hud; public Config cfg; @@ -57,8 +57,8 @@ public class Ctrl implements Disposable this.cfg = new Config(); - this.factory = new GameFactory(game.manager); - this.map = factory.getMap(this, game.manager, GameFactory.MapType.MAP_A); + this.factory = new Factory(game.manager); + this.map = factory.getMap(this, game.manager, Factory.MapType.MAP_A); this.usPlayer = factory.getPlayer(Army.US); this.gePlayer = factory.getPlayer(Army.GE); diff --git a/core/src/ch/asynk/tankontank/game/GameFactory.java b/core/src/ch/asynk/tankontank/game/Factory.java index 3335b20..5e36f7e 100644 --- a/core/src/ch/asynk/tankontank/game/GameFactory.java +++ b/core/src/ch/asynk/tankontank/game/Factory.java @@ -11,11 +11,11 @@ import com.badlogic.gdx.math.GridPoint2; import ch.asynk.tankontank.engine.Board; import ch.asynk.tankontank.engine.Orientation; -public class GameFactory implements Board.TileBuilder, Disposable +public class Factory implements Board.TileBuilder, Disposable { private TextureAtlas pawnAtlas; - public GameFactory(AssetManager manager) + public Factory(AssetManager manager) { pawnAtlas = manager.get("data/assets.atlas", TextureAtlas.class); } diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index 85a4f59..7c1bdbe 100644 --- a/core/src/ch/asynk/tankontank/game/Map.java +++ b/core/src/ch/asynk/tankontank/game/Map.java @@ -30,7 +30,7 @@ public abstract class Map extends Board protected abstract void setup(); - public Map(Ctrl ctrl, GameFactory factory, Board.Config cfg, Texture texture) + public Map(Ctrl ctrl, Factory 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 d76192e..ea3c964 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(Ctrl ctrl, GameFactory factory, Board.Config cfg, Texture texture) + public MapA(Ctrl ctrl, Factory 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 46927a6..34f8fe9 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(Ctrl ctrl, GameFactory factory, Board.Config cfg, Texture texture) + public MapB(Ctrl ctrl, Factory factory, Board.Config cfg, Texture texture) { super(ctrl, factory, cfg, texture); } |