X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FFallingSand.java;h=9a383a21315cce839145870231c0e6f9bbb8cb35;hb=f4d52e3e4a3712050532786fca0aded5ff8b5a03;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..9a383a2 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
@@ -3,7 +3,8 @@ 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 ru.deadsoftware.cavedroid.game.GameWorld;
+
 
 /**
  * Falling sand is actually a mob, that spawns in place of gravel when there is no block under it,
@@ -13,16 +14,21 @@ public class FallingSand extends Mob {
 
     /**
      * Creates a FallingSand mob at coordinates
+     *
      * @param x X in pixels
      * @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);
+        mMove = new Vector2(0, 1);
     }
 
     @Override
-    public void ai() {
+    public void ai(GameWorld gameWorld) {
+        if (mMove.isZero()) {
+            gameWorld.setForeMap(getMapX(), getMiddleMapY(), 10);
+            kill();
+        }
     }
 
     @Override
@@ -31,12 +37,7 @@ 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;
+        spriteBatch.draw(GameItems.getBlockTex(10), x, y);
     }
 
 }