summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-09-16 11:32:27 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2014-09-16 11:32:27 +0200
commitbabca10432300d09d74b6971398349fe2fc67d10 (patch)
tree81235b67831fdd6f9b5e9db592b4b9c691c2f2de
parent6345498cd965be39b24aebe3f4f2672eff2057d5 (diff)
downloadRustAndDust-babca10432300d09d74b6971398349fe2fc67d10.zip
RustAndDust-babca10432300d09d74b6971398349fe2fc67d10.tar.gz
actors/HexMap actors/Pawn -> game/*
-rw-r--r--core/src/ch/asynk/tankontank/game/HexMap.java (renamed from core/src/ch/asynk/tankontank/actors/HexMap.java)2
-rw-r--r--core/src/ch/asynk/tankontank/game/Pawn.java (renamed from core/src/ch/asynk/tankontank/actors/Pawn.java)2
-rw-r--r--core/src/ch/asynk/tankontank/game/Unit.java3
-rw-r--r--core/src/ch/asynk/tankontank/game/UnitFactory.java2
-rw-r--r--core/src/ch/asynk/tankontank/screens/GameScreen.java4
5 files changed, 4 insertions, 9 deletions
diff --git a/core/src/ch/asynk/tankontank/actors/HexMap.java b/core/src/ch/asynk/tankontank/game/HexMap.java
index 722f5c7..7aced56 100644
--- a/core/src/ch/asynk/tankontank/actors/HexMap.java
+++ b/core/src/ch/asynk/tankontank/game/HexMap.java
@@ -1,4 +1,4 @@
-package ch.asynk.tankontank.actors;
+package ch.asynk.tankontank.game;
import java.util.ArrayDeque;
diff --git a/core/src/ch/asynk/tankontank/actors/Pawn.java b/core/src/ch/asynk/tankontank/game/Pawn.java
index b33e049..804097f 100644
--- a/core/src/ch/asynk/tankontank/actors/Pawn.java
+++ b/core/src/ch/asynk/tankontank/game/Pawn.java
@@ -1,4 +1,4 @@
-package ch.asynk.tankontank.actors;
+package ch.asynk.tankontank.game;
import java.util.ArrayDeque;
diff --git a/core/src/ch/asynk/tankontank/game/Unit.java b/core/src/ch/asynk/tankontank/game/Unit.java
index aed976e..7487799 100644
--- a/core/src/ch/asynk/tankontank/game/Unit.java
+++ b/core/src/ch/asynk/tankontank/game/Unit.java
@@ -2,9 +2,6 @@ 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/game/UnitFactory.java b/core/src/ch/asynk/tankontank/game/UnitFactory.java
index 6c646d1..0ce2a6e 100644
--- a/core/src/ch/asynk/tankontank/game/UnitFactory.java
+++ b/core/src/ch/asynk/tankontank/game/UnitFactory.java
@@ -4,8 +4,6 @@ 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.HexMap;
-
public class UnitFactory
{
public enum UnitType
diff --git a/core/src/ch/asynk/tankontank/screens/GameScreen.java b/core/src/ch/asynk/tankontank/screens/GameScreen.java
index 3663ec0..96771a2 100644
--- a/core/src/ch/asynk/tankontank/screens/GameScreen.java
+++ b/core/src/ch/asynk/tankontank/screens/GameScreen.java
@@ -25,8 +25,8 @@ import com.badlogic.gdx.utils.viewport.FitViewport;
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.game.Pawn;
+import ch.asynk.tankontank.game.HexMap;
import ch.asynk.tankontank.game.Unit;
import ch.asynk.tankontank.game.UnitFactory;
import ch.asynk.tankontank.game.UnitFactory.UnitType;