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

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index 5f5a407..4a14c71 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -2,13 +2,10 @@ package ru.deadsoftware.cavecraft.game;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.utils.ArrayMap;
 
 public class GameWorld {
 
     private int WIDTH, HEIGHT;
-
-    public ArrayMap<String, Integer> metaMap;
     private int[][] foreMap;
     private int[][] backMap;
 
@@ -28,11 +25,16 @@ public class GameWorld {
         return backMap;
     }
 
+    private int transformX(int x) {
+        x = x%getWidth();
+        if (x<0) x=getWidth()-Math.abs(x);
+        return x;
+    }
+
     public int getForeMap(int x, int y) {
         int map = 0;
         try {
-            x = x%getWidth();
-            if (x<0) x=getWidth()-Math.abs(x);
+            x = transformX(x);
             map = foreMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld",e.toString());
@@ -42,8 +44,7 @@ public class GameWorld {
 
     public void setForeMap(int x, int y, int value) {
         try {
-            x = x%getWidth();
-            if (x<0) x=getWidth()-Math.abs(x);
+            x = transformX(x);
             foreMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld", e.toString());
@@ -53,8 +54,7 @@ public class GameWorld {
     public int getBackMap(int x, int y) {
         int map = 0;
         try {
-            x = x%getWidth();
-            if (x<0) x=getWidth()-Math.abs(x);
+            x = transformX(x);
             map = backMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
             Gdx.app.error("GameWorld",e.toString());
@@ -64,32 +64,21 @@ public class GameWorld {
 
     public void setBackMap(int x, int y, int value) {
         try {
-            x = x%getWidth();
-            if (x<0) x=getWidth()-Math.abs(x);
+            x = transformX(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);
+            setForeMap(x, y, value);
         }
     }
 
     public void placeToBackground(int x, int y, int value) {
-        if (value==0 || (getBackMap(x,y) == 0 && !Items.BLOCKS.getValueAt(value).background)) {
+        if (value==0 || (getBackMap(x,y) == 0 && Items.BLOCKS.getValueAt(value).collision)) {
             setBackMap(x,y,value);
         }
     }
@@ -111,7 +100,6 @@ public class GameWorld {
         WorldGen.genWorld(WIDTH,HEIGHT);
         foreMap = WorldGen.getForeMap();
         backMap = WorldGen.getBackMap();
-        metaMap = new ArrayMap<String, Integer>();
         WorldGen.clear();
     }