Fix NPE after loading game

[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 63169fbb7d5d6b8de1e753398add86cd095fb2e0..5f5a407d44a68c03e23a7ddeb848c61dd3abb26d 100644 (file)
--- 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;
 
@@ -71,6 +72,16 @@ public class GameWorld {
         }
     }
 
+    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);
@@ -78,7 +89,7 @@ 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);
         }
     }
@@ -100,13 +111,13 @@ public class GameWorld {
         WorldGen.genWorld(WIDTH,HEIGHT);
         foreMap = WorldGen.getForeMap();
         backMap = WorldGen.getBackMap();
+        metaMap = new ArrayMap<String, Integer>();
         WorldGen.clear();
     }
 
-    public void load() {
-        GameSaver.loadWorld();
-        foreMap = GameSaver.getLoadedForeMap();
-        backMap = GameSaver.getLoadedBackMap();
+    public void setMaps(int[][] foreMap, int[][] backMap) {
+        this.foreMap = foreMap.clone();
+        this.backMap = backMap.clone();
         WIDTH = foreMap.length;
         HEIGHT = foreMap[0].length;
     }