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

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index 65c9d03..62f7274 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -1,6 +1,5 @@
 package ru.deadsoftware.cavecraft.game;
 
-import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.math.Vector2;
 
 public class GameWorld {
@@ -26,8 +25,8 @@ public class GameWorld {
     }
 
     private int transformX(int x) {
-        x = x%getWidth();
-        if (x<0) x=getWidth()-Math.abs(x);
+        x = x % getWidth();
+        if (x < 0) x = getWidth() - Math.abs(x);
         return x;
     }
 
@@ -37,7 +36,7 @@ public class GameWorld {
             x = transformX(x);
             map = foreMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
-            Gdx.app.error("GameWorld",e.toString());
+            //Gdx.app.error("GameWorld",e.toString());
         }
         return map;
     }
@@ -47,7 +46,7 @@ public class GameWorld {
             x = transformX(x);
             foreMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
-            Gdx.app.error("GameWorld", e.toString());
+            //Gdx.app.error("GameWorld", e.toString());
         }
     }
 
@@ -57,7 +56,7 @@ public class GameWorld {
             x = transformX(x);
             map = backMap[x][y];
         } catch (ArrayIndexOutOfBoundsException e) {
-            Gdx.app.error("GameWorld",e.toString());
+            //Gdx.app.error("GameWorld",e.toString());
         }
         return map;
     }
@@ -67,38 +66,66 @@ public class GameWorld {
             x = transformX(x);
             backMap[x][y] = value;
         } catch (ArrayIndexOutOfBoundsException e) {
-            Gdx.app.error("GameWorld", e.toString());
+            //Gdx.app.error("GameWorld", e.toString());
+        }
+    }
+
+    private void placeSlab(int x, int y, int value) {
+        switch (value) {
+            case 51:
+                setForeMap(x, y, 52);
+                break;
+            case 53:
+                setForeMap(x, y, 21);
+                break;
+            case 54:
+                setForeMap(x, y, 5);
+                break;
+            case 55:
+                setForeMap(x, y, 4);
+                break;
+            case 56:
+                setForeMap(x, y, 28);
+                break;
+            case 58:
+                setForeMap(x, y, 57);
+                break;
         }
     }
 
     public void placeToForeground(int x, int y, int value) {
-        if (getForeMap(x,y) == 0 || value == 0) {
+        if (getForeMap(x, y) == 0 || value == 0 || !Items.BLOCKS.getValueAt(getForeMap(x, y)).collision) {
             setForeMap(x, y, value);
+        } else if (Items.isSlab(value) && getForeMap(x, y) == value) {
+            placeSlab(x, y, value);
         }
+        GameProc.UPD_X = x - 8;
+        GameProc.UPD_Y = y - 8;
+        GameProc.DO_UPD = true;
     }
 
     public void placeToBackground(int x, int y, int value) {
-        if (value==0 || (getBackMap(x,y) == 0 && Items.BLOCKS.getValueAt(value).collision) &&
+        if (value == 0 || (getBackMap(x, y) == 0 && Items.BLOCKS.getValueAt(value).collision) &&
                 (!Items.BLOCKS.getValueAt(value).transparent || value == 18)) {
-            setBackMap(x,y,value);
+            setBackMap(x, y, value);
         }
     }
 
     public Vector2 getSpawnPoint() {
-        int x=0,y=0;
+        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 && Items.BLOCKS.getValueAt(getForeMap(x, y)).collision) break;
         }
-        x = x*16 + 4;
-        y = y*16 - 32;
-        return new Vector2(x,y);
+        x = x * 16 + 4;
+        y = y * 16 - 32;
+        return new Vector2(x, y);
     }
 
     public void generate(int w, int h) {
         WIDTH = w;
         HEIGHT = h;
-        WorldGen.genWorld(WIDTH,HEIGHT);
+        WorldGen.genWorld(WIDTH, HEIGHT);
         foreMap = WorldGen.getForeMap();
         backMap = WorldGen.getBackMap();
         WorldGen.clear();