X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FFallingGravel.java;h=23cf1dcc836de3b434aa7e9deea52ca53b691568;hb=f4d52e3e4a3712050532786fca0aded5ff8b5a03;hp=7b23d4d619b785177c7bbbe2c25453aaadd7d022;hpb=107d9b29535be2cad37c8c5a48769c68689e6b33;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 7b23d4d..23cf1dc 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java @@ -2,7 +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 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, @@ -12,16 +13,21 @@ 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, 0); - mov = new Vector2(0, 1); + super(x, y, 16, 16, Direction.LEFT, Type.GRAVEL); + mMove = new Vector2(0, 1); } @Override - public void ai() { + public void ai(GameWorld gameWorld) { + if (mMove.isZero()) { + gameWorld.setForeMap(getMapX(), getMiddleMapY(), 11); + kill(); + } } @Override @@ -30,12 +36,7 @@ public class FallingGravel extends Mob { @Override public void draw(SpriteBatch spriteBatch, float x, float y) { - spriteBatch.draw(Assets.gravelSprite, x, y); - } - - @Override - public int getType() { - return 11; + spriteBatch.draw(GameItems.getBlockTex(11), x, y); } }