Even better collision

[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 68a7a01cb5c8b5faa117f83b5767477c35094032..7c117b4bbb8ec6957256aadb80739fc6e7ac2e22 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -1,5 +1,8 @@
 package ru.deadsoftware.cavecraft.game;
 
+import com.badlogic.gdx.Gdx;
+import ru.deadsoftware.cavecraft.Items;
+
 public class GameWorld {
 
     private final int WIDTH, HEIGHT;
@@ -9,8 +12,10 @@ public class GameWorld {
     public GameWorld(int w, int h) {
         WIDTH = w;
         HEIGHT = h;
-        foreMap = new int[WIDTH][HEIGHT];
-        backMap = new int[WIDTH][HEIGHT];
+        WorldGen.genWorld(WIDTH,HEIGHT);
+        foreMap = WorldGen.getForeMap();
+        backMap = WorldGen.getBackMap();
+        WorldGen.clear();
     }
 
     public int getWidth() {
@@ -22,19 +27,48 @@ public class GameWorld {
     }
 
     public int getForeMap(int x, int y) {
-        return foreMap[x][y];
+        int ret = 0;
+        try {
+            ret = foreMap[x][y];
+        } catch (ArrayIndexOutOfBoundsException e) {
+            Gdx.app.error("GameWorld",e.toString());
+        }
+        return ret;
     }
 
     public void setForeMap(int x, int y, int value) {
-        foreMap[x][y] = value;
+        try {
+            foreMap[x][y] = value;
+        } catch (ArrayIndexOutOfBoundsException e) {
+            Gdx.app.error("GameWorld", e.toString());
+        }
     }
 
     public int getBackMap(int x, int y) {
-        return backMap[x][y];
+        int ret = 0;
+        try {
+            ret = backMap[x][y];
+        } catch (ArrayIndexOutOfBoundsException e) {
+            Gdx.app.error("GameWorld",e.toString());
+        }
+        return ret;
     }
 
     public void setBackMap(int x, int y, int value) {
-        backMap[x][y] = value;
+        try {
+            backMap[x][y] = value;
+        } catch (ArrayIndexOutOfBoundsException e) {
+            Gdx.app.error("GameWorld", e.toString());
+        }
+    }
+
+    public void placeToForeground(int x, int y, int value) {
+        if (getForeMap(x,y) == 0 || value == 0) setForeMap(x,y,value);
+    }
+
+    public void placeToBackground(int x, int y, int value) {
+        if ((getBackMap(x,y) == 0 || value == 0) &&
+                !Items.BLOCKS.getValueAt(value).foreground) setBackMap(x,y,value);
     }
 
 }