[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / input / handler / mouse / HotbarMouseInputHandler.kt
diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/HotbarMouseInputHandler.kt b/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/HotbarMouseInputHandler.kt
index 5f983c5967feb860175e45c78effe82b919f46c4..0725abee6fc190dbbc230a82d1e7f1407790abc4 100644 (file)
import com.badlogic.gdx.utils.Timer
import ru.deadsoftware.cavedroid.game.GameScope
import ru.deadsoftware.cavedroid.game.GameUiWindow
-import ru.deadsoftware.cavedroid.game.windows.GameWindowsManager
+import ru.deadsoftware.cavedroid.game.ui.windows.GameWindowsManager
import ru.deadsoftware.cavedroid.game.input.IGameInputHandler
import ru.deadsoftware.cavedroid.game.input.action.MouseInputAction
import ru.deadsoftware.cavedroid.game.input.action.keys.MouseInputActionKey
import ru.deadsoftware.cavedroid.game.input.isInsideHotbar
import ru.deadsoftware.cavedroid.game.mobs.MobsController
+import ru.deadsoftware.cavedroid.game.mobs.player.Player
import ru.deadsoftware.cavedroid.misc.Assets
import javax.inject.Inject
}
private fun handleUp(action: MouseInputAction) {
- mobsController.player.slot =
+ mobsController.player.inventory.activeSlot =
((action.screenX -
(action.cameraViewport.width / 2 - hotbarTexture.regionWidth / 2))
/ HOTBAR_CELL_WIDTH).toInt()
if (action.actionKey !is MouseInputActionKey.Scroll) {
return
}
- mobsController.player.slot += action.actionKey.amountY.toInt()
- if (mobsController.player.slot < 0) {
- mobsController.player.slot = HOTBAR_ITEMS - 1
- } else if (mobsController.player.slot >= HOTBAR_ITEMS){
- mobsController.player.slot = 0
+ mobsController.player.inventory.activeSlot += action.actionKey.amountY.toInt()
+ if (mobsController.player.inventory.activeSlot < 0) {
+ mobsController.player.inventory.activeSlot = Player.HOTBAR_SIZE - 1
+ } else if (mobsController.player.inventory.activeSlot >= Player.HOTBAR_SIZE){
+ mobsController.player.inventory.activeSlot = 0
}
}
cancelHold()
}
- if (action.actionKey !is MouseInputActionKey.Left) {
+ if (action.actionKey !is MouseInputActionKey.Left && action.actionKey !is MouseInputActionKey.Touch ) {
if (action.actionKey is MouseInputActionKey.Scroll) {
handleScroll(action)
}
companion object {
private const val TOUCH_HOLD_TIME_SEC = 0.5f
private const val HOTBAR_CELL_WIDTH = 20
- private const val HOTBAR_ITEMS = 9
}
}
\ No newline at end of file