diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
index 762492f4282d1bad8158f8fa1bb2395bec196ca8..a34f0c871e5ba786f71d25598998cf6de00d5d6d 100644 (file)
if (drawBG) {
if ((GP.world.getForeMap(x, y) == 0 || GameItems.getBlock(GP.world.getForeMap(x, y)).isTransparent())
&& GP.world.getBackMap(x, y) > 0) {
- spriter.draw(
- Assets.blockTex[GameItems.getBlock(GP.world.getBackMap(x, y)).getTex()],
- drawX(x), drawY(y));
+ spriter.draw(GameItems.getBlock(GP.world.getBackMap(x, y)).getTex(), drawX(x), drawY(y));
if (GP.world.getForeMap(x, y) == 0 && x == GP.curX && y == GP.curY)
drawWreck(GP.world.getBackMap(GP.curX, GP.curY));
}
}
if (GP.world.getForeMap(x, y) > 0 && GameItems.getBlock(GP.world.getForeMap(x, y)).isBackground() == drawBG) {
- spriter.draw(
- Assets.blockTex[GameItems.getBlock(GP.world.getForeMap(x, y)).getTex()],
- drawX(x), drawY(y));
+ spriter.draw(GameItems.getBlock(GP.world.getForeMap(x, y)).getTex(), drawX(x), drawY(y));
if (x == GP.curX && y == GP.curY)
drawWreck(GP.world.getForeMap(GP.curX, GP.curY));
}
}
private void drawDrop(Drop drop) {
- switch (GameItems.getItem(drop.getId()).getType()) {
- case 0:
- Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].setPosition(
- drop.pos.x - getCamX() - GP.world.getWidthPx(),
- drop.pos.y - getCamY());
- Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].draw(spriter);
- Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].setPosition(
- drop.pos.x - getCamX(),
- drop.pos.y - getCamY());
- Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].draw(spriter);
- Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].setPosition(
- drop.pos.x - getCamX() + GP.world.getWidthPx(),
- drop.pos.y - getCamY());
- Assets.blockTex[GameItems.getItem(drop.getId()).getTex()].draw(spriter);
- }
}
@SuppressWarnings("IntegerDivisionInFloatingPointContext")
y + 18 + (GP.creativeScroll * (72f / GP.maxCreativeScroll)));
for (int i = GP.creativeScroll * 8; i < GP.creativeScroll * 8 + 40; i++) {
if (i > 0 && i < GameItems.getItemsSize())
- switch (GameItems.getItem(i).getType()) {
- case 0:
- spriter.draw(Assets.blockTex[GameItems.getItem(i).getTex()],
- x + 8 + ((i - GP.creativeScroll * 8) % 8) * 18,
- y + 18 + ((i - GP.creativeScroll * 8) / 8) * 18);
- break;
- case 1:
- spriter.draw(Assets.itemTex[GameItems.getItem(i).getTex()],
- x + 8 + ((i - GP.creativeScroll * 8) % 8) * 18,
- y + 18 + ((i - GP.creativeScroll * 8) / 8) * 18);
- break;
+ if (GameItems.getItem(i).isBlock()) {
+ spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(i)).getTex(),
+ x + 8 + ((i - GP.creativeScroll * 8) % 8) * 18,
+ y + 18 + ((i - GP.creativeScroll * 8) / 8) * 18);
+ } else {
+ spriter.draw(GameItems.getItem(i).getTex(),
+ x + 8 + ((i - GP.creativeScroll * 8) % 8) * 18,
+ y + 18 + ((i - GP.creativeScroll * 8) / 8) * 18);
}
}
for (int i = 0; i < 9; i++) {
if (GP.player.inv[i] > 0)
- switch (GameItems.getItem(GP.player.inv[i]).getType()) {
- case 0:
- spriter.draw(Assets.blockTex[GameItems.getItem(GP.player.inv[i]).getTex()],
- x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24);
- break;
- case 1:
- spriter.draw(Assets.itemTex[GameItems.getItem(GP.player.inv[i]).getTex()],
- x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24);
- break;
+ if (GameItems.getItem(GP.player.inv[i]).isBlock()) {
+ spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(GP.player.inv[i])).getTex(),
+ x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24);
+ } else {
+ spriter.draw(GameItems.getItem(GP.player.inv[i]).getTex(),
+ x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24);
}
}
+
}
private void drawGUI() {
spriter.draw(Assets.invBar, getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2, 0);
for (int i = 0; i < 9; i++) {
if (GP.player.inv[i] > 0) {
- switch (GameItems.getItem(GP.player.inv[i]).getType()) {
- case 0:
- spriter.draw(Assets.blockTex[GameItems.getItem(GP.player.inv[i]).getTex()],
- getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 + 3 + i * 20,
- 3);
- break;
- case 1:
- spriter.draw(Assets.itemTex[GameItems.getItem(GP.player.inv[i]).getTex()],
- getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 + 3 + i * 20,
- 3);
- break;
+ if (GameItems.getItem(GP.player.inv[i]).isBlock()) {
+ spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(GP.player.inv[i])).getTex(),
+ getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 + 3 + i * 20,
+ 3);
+ } else {
+ spriter.draw(GameItems.getItem(GP.player.inv[i]).getTex(),
+ getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 + 3 + i * 20,
+ 3);
}
}
}
spriter.draw(Assets.touchRMB, getWidth() - 26, getHeight() - 26);
spriter.draw(Assets.touchMode, 78, getHeight() - 26);
if (GP.ctrlMode == 1) {
- Assets.shade.setPosition(83, getHeight() - 21);
- Assets.shade.draw(spriter);
+ spriter.draw(Assets.shade, 83, getHeight() - 21);
}
}