[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / input / handler / mouse / CloseGameWindowMouseInputHandler.kt
diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/CloseGameWindowMouseInputHandler.kt b/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/CloseGameWindowMouseInputHandler.kt
index bee22dc621d77b89b2029dbfec40eb6b05935cdc..ffda344c1e25863926cc9e1bf8ae780cfbec2b45 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/CloseGameWindowMouseInputHandler.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/CloseGameWindowMouseInputHandler.kt
override fun checkConditions(action: MouseInputAction): Boolean {
return gameWindowsManager.getCurrentWindow() != GameUiWindow.NONE &&
- (action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Touch) &&
- !action.actionKey.touchUp &&
+ (action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Screen) &&
+ action.actionKey.touchUp &&
!isInsideWindow(action, getCurrentWindowTexture())
}
override fun handle(action: MouseInputAction) {
val selectedItem = gameWindowsManager.currentWindow?.selectedItem
if (selectedItem != null) {
- for (i in 1 .. selectedItem.amount) {
dropController.addDrop(
/* x = */ mobsController.player.x + (32f * mobsController.player.direction.basis),
/* y = */ mobsController.player.y,
- /* item = */ selectedItem.item
+ /* item = */ selectedItem.item,
+ /* count = */ selectedItem.amount,
)
- }
gameWindowsManager.currentWindow?.selectedItem = null
}
gameWindowsManager.closeWindow()