X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FFallingGravel.java;h=4743fcfc54289382a255855e97210dc113c1bc34;hb=121928e90bdfa3a9d9c8bd708b9f8da28d3807c0;hp=e80f91b5e70987b2697fe9005a2d10d6e1841248;hpb=c1fdecd8692e21b59a720eca1a3617cb5eb7c07f;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 e80f91b..4743fcf 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java @@ -1,10 +1,14 @@ package ru.deadsoftware.cavedroid.game.mobs; +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.math.Vector2; -import ru.deadsoftware.cavedroid.game.GameItems; import ru.deadsoftware.cavedroid.game.GameItemsHolder; import ru.deadsoftware.cavedroid.game.world.GameWorld; +import ru.deadsoftware.cavedroid.misc.Assets; + +import javax.annotation.CheckForNull; /** * Falling gravel is actually a mob, that spawns in place of gravel when there is no block under it, @@ -12,6 +16,8 @@ import ru.deadsoftware.cavedroid.game.world.GameWorld; */ public class FallingGravel extends Mob { + private static final String TAG = "FallingGravel"; + /** * Creates a FallingGravel mob at coordinates * @@ -47,7 +53,15 @@ public class FallingGravel extends Mob { @Override public void draw(SpriteBatch spriteBatch, float x, float y, float delta) { - spriteBatch.draw(GameItems.getBlockTex(11), x, y); + @CheckForNull final Texture texture = Assets.blockTextures.get("gravel"); + + if (texture == null) { + Gdx.app.error(TAG, "Couldn't draw: texture not found"); + kill(); + return; + } + + spriteBatch.draw(texture, x, y); } }