X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FFallingSand.java;h=ee310e44179f1c557c512a0cd720a8dc4d41f384;hb=c0aa4c7eef4f97c1ef9a8af7eaf2afe2feffd3d0;hp=b1777c485c7ecffb1bd553bc5c7115a57c53d33a;hpb=2948fcd9c40ebf588ef7d0e7cd8dd34ecaa1f9b2;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 b1777c4..ee310e4 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
@@ -2,9 +2,10 @@ 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 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 +18,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
@@ -31,12 +36,7 @@ public class FallingSand extends Mob {
 
     @Override
     public void draw(SpriteBatch spriteBatch, float x, float y) {
-        spriteBatch.draw(GameItems.getBlock("sand").getTex(), x, y);
-    }
-
-    @Override
-    public int getType() {
-        return 10;
+        spriteBatch.draw(Assets.sandSprite, x, y);
     }
 
 }