X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameWorld.java;h=4ed875de4e4f87b705d7301f6c80645293948fe1;hb=7217e9b86d6e44604703ffb9956bcade97cfe9c9;hp=ab89dd78d2b423c022e448145a266bdc0cb256bf;hpb=524d5abc0b76b25a4cf2b31e6ba4f41a107a5ab6;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index ab89dd7..4ed875d 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -6,20 +6,11 @@ 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;
     }
@@ -32,10 +23,10 @@ public class GameWorld {
         int map = 0;
         try {
             if (x<0) {
-                x = x % (getWidth()-1)-1;
+                x = x % (getWidth());
                 x = getWidth()- Math.abs(x);
             } else if (x>0) {
-                x = x % (getWidth()-1)+1;
+                x = x % (getWidth());
             }
             map = foreMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
@@ -47,10 +38,10 @@ public class GameWorld {
     public void setForeMap(int x, int y, int value) {
         try {
             if (x<0) {
-                x = x % (getWidth()-1)-1;
+                x = x % (getWidth());
                 x = getWidth()- Math.abs(x);
             } else if (x>0) {
-                x = x % (getWidth()-1)+1;
+                x = x % (getWidth());
             }
             foreMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
@@ -62,10 +53,10 @@ public class GameWorld {
         int map = 0;
         try {
             if (x<0) {
-                x = x % (getWidth()-1)-1;
+                x = x % (getWidth());
                 x = getWidth()- Math.abs(x);
             } else if (x>0) {
-                x = x % (getWidth()-1)+1;
+                x = x % (getWidth());
             }
             map = backMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
@@ -77,10 +68,10 @@ public class GameWorld {
     public void setBackMap(int x, int y, int value) {
         try {
             if (x<0) {
-                x = x % (getWidth()-1)-1;
+                x = x % (getWidth());
                 x = getWidth()- Math.abs(x);
             } else if (x>0) {
-                x = x % (getWidth()-1)+1;
+                x = x % (getWidth());
             }
             backMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
@@ -100,11 +91,37 @@ public class GameWorld {
         }
     }
 
-    public Vector2 getSpawnPoint() {
-        float x=0, y=0;
+    public Vector2 getSpawnPoint(int x) {
+        int 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();
+        save();
+    }
+
+    public void save() {
+        WorldSaver.save(foreMap, backMap);
+    }
+
+    public void load() {
+        WorldSaver.load();
+        foreMap = WorldSaver.getLoadedForeMap();
+        backMap = WorldSaver.getLoadedBackMap();
+        WIDTH = foreMap.length;
+        HEIGHT = foreMap[0].length;
+    }
+
 }