X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FFallingGravel.java;h=23cf1dcc836de3b434aa7e9deea52ca53b691568;hb=54a88705173318086a785a7fd02f1197ac93a966;hp=c46def34abd58598d3655979ed25fbd6e2c6c32f;hpb=c0aa4c7eef4f97c1ef9a8af7eaf2afe2feffd3d0;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java index c46def3..23cf1dc 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java @@ -2,9 +2,8 @@ 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 static ru.deadsoftware.cavedroid.GameScreen.GP; +import ru.deadsoftware.cavedroid.game.GameItems; +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, @@ -14,18 +13,19 @@ public class FallingGravel extends Mob { /** * Creates a FallingGravel mob at coordinates + * * @param x X in pixels * @param y Y in pixels */ 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(); } } @@ -36,7 +36,7 @@ public class FallingGravel extends Mob { @Override public void draw(SpriteBatch spriteBatch, float x, float y) { - spriteBatch.draw(Assets.gravelSprite, x, y); + spriteBatch.draw(GameItems.getBlockTex(11), x, y); } }