X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Finput%2Fhandler%2Fmouse%2FSelectSurvivalInventoryItemMouseInputHandler.kt;h=0d0a64771f6cf6f7097d2cd54316ff850075b448;hb=6b49d51c59f6d639d949d1e9c264f7f144a305ab;hp=ab65fb8c05d888d644bb63fcc618b46b453588d6;hpb=13157246344c2b94d24354040f0f2d2fb5beb7ea;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectSurvivalInventoryItemMouseInputHandler.kt b/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectSurvivalInventoryItemMouseInputHandler.kt index ab65fb8..0d0a647 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectSurvivalInventoryItemMouseInputHandler.kt +++ b/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/SelectSurvivalInventoryItemMouseInputHandler.kt @@ -28,7 +28,7 @@ class SelectSurvivalInventoryItemMouseInputHandler @Inject constructor( override fun checkConditions(action: MouseInputAction): Boolean { return gameWindowsManager.getCurrentWindow() == GameUiWindow.SURVIVAL_INVENTORY && isInsideWindow(action, survivalWindowTexture) && - (action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Right || action.actionKey is MouseInputActionKey.Touch) + (action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Right || action.actionKey is MouseInputActionKey.Screen) && action.actionKey.touchUp } @@ -73,7 +73,7 @@ class SelectSurvivalInventoryItemMouseInputHandler @Inject constructor( itemIndex -= 36 } - if (action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Touch) { + if (action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Screen) { onLeftCLick(mobsController.player.inventory.items as MutableList, window, itemIndex) } else { onRightClick(mobsController.player.inventory.items as MutableList, window, itemIndex) @@ -89,7 +89,7 @@ class SelectSurvivalInventoryItemMouseInputHandler @Inject constructor( val window = gameWindowsManager.currentWindow as SurvivalInventoryWindow val index = xOnCraft + yOnCraft * GameWindowsConfigs.Crafting.craftGridSize // this is crafting on purpose!! - if (action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Touch) { + if (action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Screen) { onLeftCLick(window.craftingItems, window, index) } else { onRightClick(window.craftingItems, window, index)