X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FFallingSand.java;h=9a383a21315cce839145870231c0e6f9bbb8cb35;hb=f4d52e3e4a3712050532786fca0aded5ff8b5a03;hp=0f44f051e6645df7d785f6ae40180be01a9ba308;hpb=17c1be4c02b27fefa1bf6abd0547ac7e9743d493;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 0f44f05..9a383a2 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java
@@ -2,10 +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.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,
@@ -15,18 +14,19 @@ 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, Direction.LEFT, Type.SAND);
-        move = new Vector2(0, 1);
+        mMove = new Vector2(0, 1);
     }
 
     @Override
-    public void ai() {
-        if (move.isZero()) {
-            GP.world.setForeMap(getMapX(), getMiddleMapY(), 10);
+    public void ai(GameWorld gameWorld) {
+        if (mMove.isZero()) {
+            gameWorld.setForeMap(getMapX(), getMiddleMapY(), 10);
             kill();
         }
     }
@@ -36,8 +36,8 @@ public class FallingSand extends Mob {
     }
 
     @Override
-    public void draw(@NotNull SpriteBatch spriteBatch, float x, float y) {
-        spriteBatch.draw(Assets.sandSprite, x, y);
+    public void draw(SpriteBatch spriteBatch, float x, float y) {
+        spriteBatch.draw(GameItems.getBlockTex(10), x, y);
     }
 
 }