X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameWorld.java;h=d84faa32f8b7ae495d0003b1557b3f6c5a363f06;hb=8c0966b107ebbf261f8aa9c516fb90b0d9d230e5;hp=6adac2d5ad1f7bd47b873f25ad832bdd3c927c8a;hpb=feb58daa2c3e8126871e9d4f26e978d2fc1fb01c;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
index 6adac2d..d84faa3 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameWorld.java
@@ -1,6 +1,7 @@
 package ru.deadsoftware.cavecraft.game;
 
 import com.badlogic.gdx.math.Vector2;
+import ru.deadsoftware.cavecraft.game.objects.Drop;
 
 public class GameWorld {
 
@@ -94,9 +95,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)).coll) {
+        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,17 +106,29 @@ public class GameWorld {
     }
 
     public void placeToBackground(int x, int y, int value) {
-        if (value == 0 || (getBackMap(x, y) == 0 && Items.blocks.getValueAt(value).coll) &&
-                (!Items.blocks.getValueAt(value).tp || value == 18)) {
+        if (value == 0 || (getBackMap(x, y) == 0 && GameItems.getBlock(value).coll) &&
+                (!GameItems.getBlock(value).tp || value == 18)) {
             setBackMap(x, y, value);
         }
     }
 
+    public void destroyForeMap(int x, int y, GameProc gp) {
+        if (GameItems.getBlock(getForeMap(x, y)).getDrop() > 0)
+            gp.drops.add(new Drop(transformX(x) * 16 + 4, y * 16 + 4, GameItems.getBlock(getForeMap(x, y)).getDrop()));
+        placeToForeground(x, y, 0);
+    }
+
+    public void destroyBackMap(int x, int y, GameProc gp) {
+        if (GameItems.getBlock(getBackMap(x, y)).getDrop() > 0)
+            gp.drops.add(new Drop(transformX(x) * 16 + 4, y * 16 + 4, GameItems.getBlock(getBackMap(x, y)).getDrop()));
+        placeToBackground(x, y, 0);
+    }
+
     public Vector2 getSpawnPoint() {
         int x = 0, y = 0;
         while (true) {
             y++;
-            if (getForeMap(x, y) > 0 && Items.blocks.getValueAt(getForeMap(x, y)).coll) break;
+            if (getForeMap(x, y) > 0 && GameItems.getBlock(getForeMap(x, y)).coll) break;
         }
         x = x * 16 + 4;
         y = y * 16 - 32;