X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FFallingSand.java;h=07cd8cdd84e3ddf8249be1964681b2a422c09b63;hb=e7a1e15a93abaafa8e2e0435336483a198cc697c;hp=89b20e1add566962fd19a873e0549ed9e3161a69;hpb=59d48c1b28c570755327a8fb0827fa57e7fd3914;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 89b20e1..07cd8cd 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
@@ -2,9 +2,9 @@ package ru.deadsoftware.cavedroid.game.mobs;
 
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector2;
-import ru.deadsoftware.cavedroid.misc.Assets;
+import ru.deadsoftware.cavedroid.game.GameItems;
+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,
@@ -20,13 +20,13 @@ public class FallingSand extends Mob {
      */
     public FallingSand(float x, float y) {
         super(x, y, 16, 16, Direction.LEFT, Type.SAND);
-        move = new Vector2(0, 1);
+        mVelocity = new Vector2(0, 1);
     }
 
     @Override
-    public void ai() {
-        if (move.isZero()) {
-            GP.world.setForeMap(getMapX(), getMiddleMapY(), 10);
+    public void ai(GameWorld gameWorld, float delta) {
+        if (mVelocity.isZero()) {
+            gameWorld.setForeMap(getMapX(), getMiddleMapY(), 10);
             kill();
         }
     }
@@ -36,8 +36,8 @@ public class FallingSand extends Mob {
     }
 
     @Override
-    public void draw(SpriteBatch spriteBatch, float x, float y) {
-        spriteBatch.draw(Assets.sandSprite, x, y);
+    public void draw(SpriteBatch spriteBatch, float x, float y, float delta) {
+        spriteBatch.draw(GameItems.getBlockTex(10), x, y);
     }
 
 }