Remove meta map

[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / game / GameWorld.java

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index daa00c004af21ce8356aeec57d0f276d18865376..4a14c7123f7935203a6206f9ff5559475a20e862 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -2,24 +2,13 @@ package ru.deadsoftware.cavecraft.game;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.Vector2;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.Vector2;

-import ru.deadsoftware.cavecraft.Items;

 
 public class GameWorld {
 
 
 public class GameWorld {
 

-    private final int WIDTH, HEIGHT;
-
+    private int WIDTH, HEIGHT;

     private int[][] foreMap;
     private int[][] backMap;
 
     private int[][] foreMap;
     private int[][] backMap;
 

-    public GameWorld(int w, int h) {
-        WIDTH = w;
-        HEIGHT = h;
-        WorldGen.genWorld(WIDTH,HEIGHT);
-        foreMap = WorldGen.getForeMap();
-        backMap = WorldGen.getBackMap();
-        WorldGen.clear();
-    }
-

     public int getWidth() {
         return WIDTH;
     }
     public int getWidth() {
         return WIDTH;
     }


@@ -28,15 +17,24 @@ public class GameWorld {
         return HEIGHT;
     }
 
         return HEIGHT;
     }
 

+    public int[][] getFullForeMap() {
+        return foreMap;
+    }
+
+    public int[][] getFullBackMap() {
+        return backMap;
+    }
+
+    private int transformX(int x) {
+        x = x%getWidth();
+        if (x<0) x=getWidth()-Math.abs(x);
+        return x;
+    }
+

     public int getForeMap(int x, int y) {
         int map = 0;
         try {
     public int getForeMap(int x, int y) {
         int map = 0;
         try {

-            if (x<0) {
-                x = x % (getWidth());
-                x = getWidth()- Math.abs(x);
-            } else if (x>0) {
-                x = x % (getWidth());
-            }
+            x = transformX(x);

             map = foreMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld",e.toString());
             map = foreMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld",e.toString());


@@ -46,12 +44,7 @@ public class GameWorld {
 
     public void setForeMap(int x, int y, int value) {
         try {
 
     public void setForeMap(int x, int y, int value) {
         try {

-            if (x<0) {
-                x = x % (getWidth());
-                x = getWidth()- Math.abs(x);
-            } else if (x>0) {
-                x = x % (getWidth());
-            }
+            x = transformX(x);

             foreMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld", e.toString());
             foreMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld", e.toString());


@@ -61,12 +54,7 @@ public class GameWorld {
     public int getBackMap(int x, int y) {
         int map = 0;
         try {
     public int getBackMap(int x, int y) {
         int map = 0;
         try {

-            if (x<0) {
-                x = x % (getWidth());
-                x = getWidth()- Math.abs(x);
-            } else if (x>0) {
-                x = x % (getWidth());
-            }
+            x = transformX(x);

             map = backMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld",e.toString());
             map = backMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld",e.toString());


@@ -76,12 +64,7 @@ public class GameWorld {
 
     public void setBackMap(int x, int y, int value) {
         try {
 
     public void setBackMap(int x, int y, int value) {
         try {

-            if (x<0) {
-                x = x % (getWidth());
-                x = getWidth()- Math.abs(x);
-            } else if (x>0) {
-                x = x % (getWidth());
-            }
+            x = transformX(x);

             backMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld", e.toString());
             backMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld", e.toString());


@@ -90,21 +73,41 @@ public class GameWorld {
 
     public void placeToForeground(int x, int y, int value) {
         if (getForeMap(x,y) == 0 || value == 0) {
 
     public void placeToForeground(int x, int y, int value) {
         if (getForeMap(x,y) == 0 || value == 0) {

-            setForeMap(x,y,value);
+            setForeMap(x, y, value);

         }
     }
 
     public void placeToBackground(int x, int y, int value) {
         }
     }
 
     public void placeToBackground(int x, int y, int value) {

-        if (value==0 || (getBackMap(x,y) == 0 && !Items.BLOCKS.getValueAt(value).foreground)) {
+        if (value==0 || (getBackMap(x,y) == 0 && Items.BLOCKS.getValueAt(value).collision)) {

             setBackMap(x,y,value);
         }
     }
 
     public Vector2 getSpawnPoint() {
             setBackMap(x,y,value);
         }
     }
 
     public Vector2 getSpawnPoint() {

-        float x=0, y=0;
+        int x=0,y=0;
+        while (true) {
+            y++;
+            if (getForeMap(x,y)>0 && Items.BLOCKS.getValueAt(getForeMap(x,y)).collision) break;
+        }

         x = x*16 + 4;
         x = x*16 + 4;

-        y *= 16;
+        y = y*16 - 32;

         return new Vector2(x,y);
     }
 
         return new Vector2(x,y);
     }
 

+    public void generate(int w, int h) {
+        WIDTH = w;
+        HEIGHT = h;
+        WorldGen.genWorld(WIDTH,HEIGHT);
+        foreMap = WorldGen.getForeMap();
+        backMap = WorldGen.getBackMap();
+        WorldGen.clear();
+    }
+
+    public void setMaps(int[][] foreMap, int[][] backMap) {
+        this.foreMap = foreMap.clone();
+        this.backMap = backMap.clone();
+        WIDTH = foreMap.length;
+        HEIGHT = foreMap[0].length;
+    }
+

 }
 }