Implement dependency injection for game classes #13

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / mobs / FallingGravel.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java
index 70879e4f1499d2db2d91d19107a9852d45c31ede..23cf1dcc836de3b434aa7e9deea52ca53b691568 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java
@@ -3,8 +3,7 @@ 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 static ru.deadsoftware.cavedroid.GameScreen.GP;
+import ru.deadsoftware.cavedroid.game.GameWorld;
 
 /**
  * Falling gravel is actually a mob, that spawns in place of gravel when there is no block under it,
@@ -20,13 +19,13 @@ public class FallingGravel extends Mob {
      */
     public FallingGravel(float x, float y) {
         super(x, y, 16, 16, Direction.LEFT, Type.GRAVEL);
-        move = new Vector2(0, 1);
+        mMove = new Vector2(0, 1);
     }
 
     @Override
-    public void ai() {
-        if (move.isZero()) {
-            GP.world.setForeMap(getMapX(), getMiddleMapY(), 11);
+    public void ai(GameWorld gameWorld) {
+        if (mMove.isZero()) {
+            gameWorld.setForeMap(getMapX(), getMiddleMapY(), 11);
             kill();
         }
     }