X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Finput%2Fhandler%2Fmouse%2FAbstractInventoryItemsMouseInputHandler.kt;h=3b925b09b58f53bcb5b7de2865f3e37b4a87f3fb;hb=90daad1796cd59f11f12589686d9afe882ddb9b1;hp=4aaff27a031da16592f673cf116928d374253629;hpb=3d972278cf3a54b6a7b574690ca4b41577464dce;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/AbstractInventoryItemsMouseInputHandler.kt b/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/AbstractInventoryItemsMouseInputHandler.kt
index 4aaff27..3b925b0 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/AbstractInventoryItemsMouseInputHandler.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/AbstractInventoryItemsMouseInputHandler.kt
@@ -3,13 +3,12 @@ package ru.deadsoftware.cavedroid.game.input.handler.mouse
 import com.badlogic.gdx.graphics.g2d.TextureRegion
 import ru.deadsoftware.cavedroid.game.GameItemsHolder
 import ru.deadsoftware.cavedroid.game.GameUiWindow
-import ru.deadsoftware.cavedroid.game.input.IGameInputHandler
+import ru.deadsoftware.cavedroid.game.input.IMouseInputHandler
 import ru.deadsoftware.cavedroid.game.input.action.MouseInputAction
 import ru.deadsoftware.cavedroid.game.input.action.keys.MouseInputActionKey
 import ru.deadsoftware.cavedroid.game.input.isInsideWindow
 import ru.deadsoftware.cavedroid.game.model.item.InventoryItem
 import ru.deadsoftware.cavedroid.game.model.item.InventoryItem.Companion.isNoneOrNull
-import ru.deadsoftware.cavedroid.game.objects.container.Furnace
 import ru.deadsoftware.cavedroid.game.ui.windows.GameWindowsManager
 import ru.deadsoftware.cavedroid.game.ui.windows.inventory.AbstractInventoryWindow
 import ru.deadsoftware.cavedroid.game.ui.windows.inventory.AbstractInventoryWindowWithCraftGrid
@@ -18,7 +17,7 @@ abstract class AbstractInventoryItemsMouseInputHandler(
     private val gameItemsHolder: GameItemsHolder,
     private val gameWindowsManager: GameWindowsManager,
     private val windowType: GameUiWindow,
-) : IGameInputHandler<MouseInputAction> {
+) : IMouseInputHandler {
 
     protected abstract val windowTexture: TextureRegion
 
@@ -59,13 +58,13 @@ abstract class AbstractInventoryItemsMouseInputHandler(
                 if (action.actionKey.pointer == window.selectItemPointer) {
                     window.onLeftCLick(items, gameItemsHolder, index, action.actionKey.pointer)
                 } else {
-                    window.onRightClick(items, index)
+                    window.onRightClick(items, gameItemsHolder, index)
                 }
             }
         } else if (action.actionKey is MouseInputActionKey.Left) {
             window.onLeftCLick(items, gameItemsHolder, index)
         } else {
-            window.onRightClick(items, index)
+            window.onRightClick(items, gameItemsHolder, index)
         }
     }
 
@@ -88,7 +87,7 @@ abstract class AbstractInventoryItemsMouseInputHandler(
         } else {
             if (action.actionKey is MouseInputActionKey.Screen) {
                 if (!action.actionKey.touchUp) {
-                    window.onLeftCLick(items, gameItemsHolder, Furnace.RESULT_INDEX, action.actionKey.pointer)
+                    window.onLeftCLick(items, gameItemsHolder, index, action.actionKey.pointer)
                 }
             } else if (action.actionKey is MouseInputActionKey.Left) {
                 window.onLeftCLick(items, gameItemsHolder, index)