X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FFallingSand.java;h=07cd8cdd84e3ddf8249be1964681b2a422c09b63;hb=9f47e596782628c69b1333e371ce6ffc5cf3d5fa;hp=d193dcfa52d5c4569d21d4816ea35c2d5d72bfe0;hpb=84377178320105196ad70bfa798ba8f299f961b2;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 d193dcf..07cd8cd 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
@@ -2,8 +2,9 @@ package ru.deadsoftware.cavedroid.game.mobs;
 
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector2;
-import org.jetbrains.annotations.NotNull;
-import ru.deadsoftware.cavedroid.misc.Assets;
+import ru.deadsoftware.cavedroid.game.GameItems;
+import ru.deadsoftware.cavedroid.game.world.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);
+        mVelocity = new Vector2(0, 1);
     }
 
     @Override
-    public void ai() {
+    public void ai(GameWorld gameWorld, float delta) {
+        if (mVelocity.isZero()) {
+            gameWorld.setForeMap(getMapX(), getMiddleMapY(), 10);
+            kill();
+        }
     }
 
     @Override
@@ -30,13 +36,8 @@ public class FallingSand extends Mob {
     }
 
     @Override
-    public void draw(@NotNull SpriteBatch spriteBatch, float x, float y) {
-        spriteBatch.draw(Assets.sandSprite, x, y);
-    }
-
-    @Override
-    public int getType() {
-        return 10;
+    public void draw(SpriteBatch spriteBatch, float x, float y, float delta) {
+        spriteBatch.draw(GameItems.getBlockTex(10), x, y);
     }
 
 }