X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FFallingSand.java;h=bce918e34fb811024815022970dd00ffa834e316;hb=a21a93fd9fa33adebe52d1f4478866dcc3b66d96;hp=14ec825d5735d37f7000ca84df0e4851b582c9e1;hpb=1c004c0ce7e183e773b5b486295c25e39732e899;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 14ec825..bce918e 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.java +++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingSand.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; /** @@ -13,6 +17,8 @@ import ru.deadsoftware.cavedroid.game.world.GameWorld; */ public class FallingSand extends Mob { + private static final String TAG = "FallingSand"; + /** * Creates a FallingSand mob at coordinates * @@ -48,7 +54,15 @@ public class FallingSand extends Mob { @Override public void draw(SpriteBatch spriteBatch, float x, float y, float delta) { - spriteBatch.draw(GameItems.getBlockTex(10), x, y); + @CheckForNull final Texture texture = Assets.blockTextures.get("sand"); + + if (texture == null) { + Gdx.app.error(TAG, "Couldn't draw: texture not found"); + kill(); + return; + } + + spriteBatch.draw(texture, x, y); } }