X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameWorld.java;h=073c3d56a384df2df41f097a78fbbf195ad6c8bf;hb=be2690f1dee10f68a5ce6d576ace13c825ac5d15;hp=62f7274a85a1caead1664626cb3c46b1c42b25a0;hpb=bea2a3c5b967bcd90ccd83e08e833d58449e963a;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index 62f7274..073c3d5 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -94,9 +94,9 @@ public class GameWorld {
     }
 
     public void placeToForeground(int x, int y, int value) {
-        if (getForeMap(x, y) == 0 || value == 0 || !Items.BLOCKS.getValueAt(getForeMap(x, y)).collision) {
+        if (getForeMap(x, y) == 0 || value == 0 || !GameItems.getBlock(getForeMap(x, y)).coll) {
             setForeMap(x, y, value);
-        } else if (Items.isSlab(value) && getForeMap(x, y) == value) {
+        } else if (GameItems.isSlab(value) && getForeMap(x, y) == value) {
             placeSlab(x, y, value);
         }
         GameProc.UPD_X = x - 8;
@@ -105,8 +105,8 @@ public class GameWorld {
     }
 
     public void placeToBackground(int x, int y, int value) {
-        if (value == 0 || (getBackMap(x, y) == 0 && Items.BLOCKS.getValueAt(value).collision) &&
-                (!Items.BLOCKS.getValueAt(value).transparent || value == 18)) {
+        if (value == 0 || (getBackMap(x, y) == 0 && GameItems.getBlock(value).coll) &&
+                (!GameItems.getBlock(value).tp || value == 18)) {
             setBackMap(x, y, value);
         }
     }
@@ -115,7 +115,7 @@ public class GameWorld {
         int x = 0, y = 0;
         while (true) {
             y++;
-            if (getForeMap(x, y) > 0 && Items.BLOCKS.getValueAt(getForeMap(x, y)).collision) break;
+            if (getForeMap(x, y) > 0 && GameItems.getBlock(getForeMap(x, y)).coll) break;
         }
         x = x * 16 + 4;
         y = y * 16 - 32;