summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-09-16 10:15:31 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2014-09-16 10:15:31 +0200
commit0206a146d6026e9269fbda409e62bab18ae12865 (patch)
tree0ea300b4efedce6abc40cb9334f6fed17fb3d1f4
parentee34fe79fa447e73594e87a13cf35e8b55683c2d (diff)
downloadRustAndDust-0206a146d6026e9269fbda409e62bab18ae12865.zip
RustAndDust-0206a146d6026e9269fbda409e62bab18ae12865.tar.gz
move Unit and UnitFactory into game/
-rw-r--r--core/src/ch/asynk/tankontank/game/Unit.java (renamed from core/src/ch/asynk/tankontank/actors/Unit.java)5
-rw-r--r--core/src/ch/asynk/tankontank/game/UnitFactory.java (renamed from core/src/ch/asynk/tankontank/utils/UnitFactory.java)3
-rw-r--r--core/src/ch/asynk/tankontank/screens/GameScreen.java6
3 files changed, 8 insertions, 6 deletions
diff --git a/core/src/ch/asynk/tankontank/actors/Unit.java b/core/src/ch/asynk/tankontank/game/Unit.java
index e7e922a..12681ac 100644
--- a/core/src/ch/asynk/tankontank/actors/Unit.java
+++ b/core/src/ch/asynk/tankontank/game/Unit.java
@@ -1,7 +1,10 @@
-package ch.asynk.tankontank.actors;
+package ch.asynk.tankontank.game;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import ch.asynk.tankontank.actors.Pawn;
+import ch.asynk.tankontank.actors.HexMap;
+
public class Unit extends Pawn
{
public int rng;
diff --git a/core/src/ch/asynk/tankontank/utils/UnitFactory.java b/core/src/ch/asynk/tankontank/game/UnitFactory.java
index 5157d89..513f38f 100644
--- a/core/src/ch/asynk/tankontank/utils/UnitFactory.java
+++ b/core/src/ch/asynk/tankontank/game/UnitFactory.java
@@ -1,10 +1,9 @@
-package ch.asynk.tankontank.utils;
+package ch.asynk.tankontank.game;
import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.graphics.g2d.TextureAtlas;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import ch.asynk.tankontank.actors.Unit;
import ch.asynk.tankontank.actors.HexMap;
public class UnitFactory
diff --git a/core/src/ch/asynk/tankontank/screens/GameScreen.java b/core/src/ch/asynk/tankontank/screens/GameScreen.java
index 6e0a2e0..3663ec0 100644
--- a/core/src/ch/asynk/tankontank/screens/GameScreen.java
+++ b/core/src/ch/asynk/tankontank/screens/GameScreen.java
@@ -27,9 +27,9 @@ import com.badlogic.gdx.utils.viewport.ScreenViewport;
import ch.asynk.tankontank.TankOnTank;
import ch.asynk.tankontank.actors.Pawn;
import ch.asynk.tankontank.actors.HexMap;
-import ch.asynk.tankontank.actors.Unit;
-import ch.asynk.tankontank.utils.UnitFactory;
-import ch.asynk.tankontank.utils.UnitFactory.UnitType;
+import ch.asynk.tankontank.game.Unit;
+import ch.asynk.tankontank.game.UnitFactory;
+import ch.asynk.tankontank.game.UnitFactory.UnitType;
public class GameScreen extends AbstractScreen
{