diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
index f8c44b310324762c20db96284c995471f3d6144c..e5b08381fbd10d0ad9285c4805dfe3a5bea00179 100644 (file)
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)) {
}
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() &&
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;
}
return mKeyDown;
}
- int getBlockDamage() {
+ public int getBlockDamage() {
return mBlockDamage;
}
- int getCurX() {
+ public int getCurX() {
return mCurX;
}
- int getCurY() {
+ public int getCurY() {
return mCurY;
}
- int getCreativeScroll() {
+ public int getCreativeScroll() {
return mCreativeScroll;
}