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

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index 4ed875d..5f5a407 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -2,12 +2,13 @@ package ru.deadsoftware.cavecraft.game;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.Vector2;
-import ru.deadsoftware.cavecraft.Items;
+import com.badlogic.gdx.utils.ArrayMap;
 
 public class GameWorld {
 
     private int WIDTH, HEIGHT;
 
+    public ArrayMap<String, Integer> metaMap;
     private int[][] foreMap;
     private int[][] backMap;
 
@@ -19,15 +20,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());
@@ -37,12 +42,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());
@@ -52,12 +53,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());
@@ -67,18 +64,24 @@ 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());
         }
     }
 
+    public int getMeta(int x, int y) {
+        if (metaMap.containsKey(x+"_"+y)) return metaMap.get(x+"_"+y);
+            else return 0;
+    }
+
+    public void setMeta(int x, int y, int value) {
+        if (metaMap.containsKey(x+"_"+y)) metaMap.removeKey(x+"_"+y);
+        metaMap.put(x+"_"+y, value);
+    }
+
     public void placeToForeground(int x, int y, int value) {
         if (getForeMap(x,y) == 0 || value == 0) {
             setForeMap(x,y,value);
@@ -86,13 +89,13 @@ 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(int x) {
-        int y=0;
+    public Vector2 getSpawnPoint() {
+        int x=0,y=0;
         while (true) {
             y++;
             if (getForeMap(x,y)>0 && Items.BLOCKS.getValueAt(getForeMap(x,y)).collision) break;
@@ -108,18 +111,13 @@ public class GameWorld {
         WorldGen.genWorld(WIDTH,HEIGHT);
         foreMap = WorldGen.getForeMap();
         backMap = WorldGen.getBackMap();
+        metaMap = new ArrayMap<String, Integer>();
         WorldGen.clear();
-        save();
-    }
-
-    public void save() {
-        WorldSaver.save(foreMap, backMap);
     }
 
-    public void load() {
-        WorldSaver.load();
-        foreMap = WorldSaver.getLoadedForeMap();
-        backMap = WorldSaver.getLoadedBackMap();
+    public void setMaps(int[][] foreMap, int[][] backMap) {
+        this.foreMap = foreMap.clone();
+        this.backMap = backMap.clone();
         WIDTH = foreMap.length;
         HEIGHT = foreMap[0].length;
     }