X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameWorld.java;h=e6c5633ba78c016b76a521be8244bd929f172787;hb=1c798d88e9c23d438e7fa770c9670b02a761f866;hp=25d3660fc1cf29d9a01b25560e9a2b16baaa4a46;hpb=cef4b5a9985bcbdfea6dc652147ecde0721d7fdc;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index 25d3660..e6c5633 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -38,44 +38,39 @@ public class GameWorld {
         return x;
     }
 
-    public int getForeMap(int x, int y) {
+    private int getMap(int x, int y, int layer) {
         int map = 0;
         try {
             x = transformX(x);
-            map = foreMap[x][y];
+            map = (layer == 0) ? foreMap[x][y] : backMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
-            //Gdx.app.error("GameWorld",e.toString());
         }
         return map;
     }
 
-    public void setForeMap(int x, int y, int value) {
+    private void setMap(int x, int y, int layer, int value) {
         try {
             x = transformX(x);
-            foreMap[x][y] = value;
+            if (layer == 0) foreMap[x][y] = value;
+            else backMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
-            //Gdx.app.error("GameWorld", e.toString());
         }
     }
 
+    public int getForeMap(int x, int y) {
+        return getMap(x, y, 0);
+    }
+
+    public void setForeMap(int x, int y, int value) {
+        setMap(x, y, 0, value);
+    }
+
     public int getBackMap(int x, int y) {
-        int map = 0;
-        try {
-            x = transformX(x);
-            map = backMap[x][y];
-        } catch (ArrayIndexOutOfBoundsException e) {
-            //Gdx.app.error("GameWorld",e.toString());
-        }
-        return map;
+        return getMap(x, y, 1);
     }
 
     public void setBackMap(int x, int y, int value) {
-        try {
-            x = transformX(x);
-            backMap[x][y] = value;
-        } catch (ArrayIndexOutOfBoundsException e) {
-            //Gdx.app.error("GameWorld", e.toString());
-        }
+        setMap(x, y, 1, value);
     }
 
     private void placeSlab(int x, int y, int value) {