diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
index f8c44b310324762c20db96284c995471f3d6144c..fb20d8fb0520ff9fe125d29ce1de5a4645f1161c 100644 (file)
private void holdMB() {
if (mTouchDownBtn == Input.Buttons.RIGHT) {
private void holdMB() {
if (mTouchDownBtn == Input.Buttons.RIGHT) {
- useItem(mCurX, mCurY, mPlayer.inventory[mPlayer.slot], true);
+ useItem(mCurX, mCurY, mPlayer.inventory[mPlayer.slot].getItem(), true);
mTouchedDown = false;
} else {
if (insideHotbar(mTouchDownX, mTouchDownY)) {
mTouchedDown = false;
} else {
if (insideHotbar(mTouchDownX, mTouchDownY)) {
}
System.arraycopy(mPlayer.inventory, 0, mPlayer.inventory, 1, 8);
}
System.arraycopy(mPlayer.inventory, 0, mPlayer.inventory, 1, 8);
- mPlayer.inventory[0] = mGameItemsHolder.getItemFromCreativeInventory(itemPos);
+ mPlayer.inventory[0] = mGameItemsHolder.getItemFromCreativeInventory(itemPos).toInventoryItem();
} else if (mMainConfig.checkGameUiWindow(GameUiWindow.CREATIVE_INVENTORY)) {
mMainConfig.setGameUiWindow(GameUiWindow.NONE);
} else if (screenY < hotbar.getRegionHeight() &&
} else if (mMainConfig.checkGameUiWindow(GameUiWindow.CREATIVE_INVENTORY)) {
mMainConfig.setGameUiWindow(GameUiWindow.NONE);
} else if (screenY < hotbar.getRegionHeight() &&
mPlayer.slot = (int) ((screenX - (mMainConfig.getWidth() / 2 - hotbar.getRegionWidth() / 2)) / 20);
} else if (button == Input.Buttons.RIGHT) {
useItem(mCurX, mCurY,
mPlayer.slot = (int) ((screenX - (mMainConfig.getWidth() / 2 - hotbar.getRegionWidth() / 2)) / 20);
} else if (button == Input.Buttons.RIGHT) {
useItem(mCurX, mCurY,
- mPlayer.inventory[mPlayer.slot], false);
+ mPlayer.inventory[mPlayer.slot].getItem(), false);
} else if (button == Input.Buttons.LEFT) {
mBlockDamage = 0;
}
} else if (button == Input.Buttons.LEFT) {
mBlockDamage = 0;
}