X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FFallingSand.java;h=0f44f051e6645df7d785f6ae40180be01a9ba308;hb=17c1be4c02b27fefa1bf6abd0547ac7e9743d493;hp=315fcfc6a92fa3e2cf8f53122d6c518c50ad1358;hpb=44bd000cd15bf9713453a279840e133416fea998;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
index 315fcfc..0f44f05 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
@@ -2,9 +2,11 @@ package ru.deadsoftware.cavedroid.game.mobs;
 
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector2;
-import ru.deadsoftware.cavedroid.game.GameItems;
+import org.jetbrains.annotations.NotNull;
 import ru.deadsoftware.cavedroid.misc.Assets;
 
+import static ru.deadsoftware.cavedroid.GameScreen.GP;
+
 /**
  * Falling sand is actually a mob, that spawns in place of gravel when there is no block under it,
  * falls down to the next block and becomes a block of sand again.
@@ -17,12 +19,16 @@ public class FallingSand extends Mob {
      * @param y Y in pixels
      */
     public FallingSand(float x, float y) {
-        super(x, y, 16, 16, 0);
-        mov = new Vector2(0, 1);
+        super(x, y, 16, 16, Direction.LEFT, Type.SAND);
+        move = new Vector2(0, 1);
     }
 
     @Override
     public void ai() {
+        if (move.isZero()) {
+            GP.world.setForeMap(getMapX(), getMiddleMapY(), 10);
+            kill();
+        }
     }
 
     @Override
@@ -30,13 +36,8 @@ public class FallingSand extends Mob {
     }
 
     @Override
-    public void draw(SpriteBatch spriteBatch, float x, float y) {
-        spriteBatch.draw(Assets.fallingSandSprite, x, y);
-    }
-
-    @Override
-    public int getType() {
-        return 10;
+    public void draw(@NotNull SpriteBatch spriteBatch, float x, float y) {
+        spriteBatch.draw(Assets.sandSprite, x, y);
     }
 
 }