X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FFallingSand.java;h=14ec825d5735d37f7000ca84df0e4851b582c9e1;hb=1c004c0ce7e183e773b5b486295c25e39732e899;hp=a52d92008a24370a3d411b07538fd6c529acc8e6;hpb=4f652847070576ce21f1f8155d900c9dd4cad9dc;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 a52d920..14ec825 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
@@ -3,8 +3,9 @@ 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.game.GameItemsHolder;
+import ru.deadsoftware.cavedroid.game.world.GameWorld;
 
-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,
@@ -19,14 +20,24 @@ public class FallingSand extends Mob {
      * @param y Y in pixels
      */
     public FallingSand(float x, float y) {
-        super(x, y, 16, 16, Direction.LEFT, Type.SAND);
-        move = new Vector2(0, 1);
+        super(x, y, 16, 16, Direction.LEFT, Type.SAND, Integer.MAX_VALUE);
+        mVelocity = new Vector2(0, 1);
     }
 
     @Override
-    public void ai() {
-        if (move.isZero()) {
-            GP.world.setForeMap(getMapX(), getMiddleMapY(), 10);
+    public float getSpeed() {
+        return 0;
+    }
+
+    @Override
+    public void jump() {
+        // no-op
+    }
+
+    @Override
+    public void ai(GameWorld gameWorld, GameItemsHolder gameItemsHolder, float delta) {
+        if (mVelocity.isZero()) {
+            gameWorld.setForeMap(getMapX(), getMiddleMapY(), gameItemsHolder.getBlock("sand"));
             kill();
         }
     }
@@ -36,7 +47,7 @@ public class FallingSand extends Mob {
     }
 
     @Override
-    public void draw(SpriteBatch spriteBatch, float x, float y) {
+    public void draw(SpriteBatch spriteBatch, float x, float y, float delta) {
         spriteBatch.draw(GameItems.getBlockTex(10), x, y);
     }