X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameWorld.java;h=0c3ac52f40fc1804d29017470e315eaffda5ee0c;hp=daa00c004af21ce8356aeec57d0f276d18865376;hb=4617ae53584520a741f45770e17a2a253717f83a;hpb=e0aa1520178df544807f3e803b4b6169346b07fb

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index daa00c0..0c3ac52 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -2,24 +2,14 @@ package ru.deadsoftware.cavecraft.game;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.Vector2;
-import ru.deadsoftware.cavecraft.Items;
 
 public class GameWorld {
 
-    private final int WIDTH, HEIGHT;
+    private int WIDTH, HEIGHT;
 
     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;
     }
@@ -28,15 +18,19 @@ public class GameWorld {
         return HEIGHT;
     }
 
+    public int[][] getFullForeMap() {
+        return foreMap;
+    }
+
+    public int[][] getFullBackMap() {
+        return backMap;
+    }
+
     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 = x%getWidth();
+            if (x<0) x=getWidth()-Math.abs(x);
             map = foreMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld",e.toString());
@@ -46,12 +40,8 @@ public class GameWorld {
 
     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 = x%getWidth();
+            if (x<0) x=getWidth()-Math.abs(x);
             foreMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld", e.toString());
@@ -61,12 +51,8 @@ public class GameWorld {
     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 = x%getWidth();
+            if (x<0) x=getWidth()-Math.abs(x);
             map = backMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld",e.toString());
@@ -76,12 +62,8 @@ public class GameWorld {
 
     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 = x%getWidth();
+            if (x<0) x=getWidth()-Math.abs(x);
             backMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld", e.toString());
@@ -95,16 +77,36 @@ public class GameWorld {
     }
 
     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).background)) {
             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;
-        y *= 16;
+        y = y*16 - 32;
         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;
+    }
+
 }