From 7266742b336e56e278ef52d385dcac1050944201 Mon Sep 17 00:00:00 2001 From: trivernis Date: Sat, 19 Nov 2022 23:39:38 +0100 Subject: [PATCH] Meerge --- core/src/main/kotlin/com/last/commit/config/GameSettings.kt | 1 - core/src/main/kotlin/com/last/commit/screen/FirstScreen.kt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/kotlin/com/last/commit/config/GameSettings.kt b/core/src/main/kotlin/com/last/commit/config/GameSettings.kt index 76a3ea1..7d3f4cc 100644 --- a/core/src/main/kotlin/com/last/commit/config/GameSettings.kt +++ b/core/src/main/kotlin/com/last/commit/config/GameSettings.kt @@ -16,7 +16,6 @@ class GameSettings { actionKeys[ActionCommand.LEFT] = listOf(Keys.LEFT, Keys.A) actionKeys[ActionCommand.RIGHT] = listOf(Keys.RIGHT, Keys.D) actionKeys[ActionCommand.OPEN_MENU] = listOf(Keys.ESCAPE) - actionKeys[ActionCommand.OPEN_INVENTORY] = listOf(Keys.I) actionKeys[ActionCommand.TIME_TRAVEL] = listOf(Keys.T) actionKeys[ActionCommand.INTERACT] = listOf(Keys.E) diff --git a/core/src/main/kotlin/com/last/commit/screen/FirstScreen.kt b/core/src/main/kotlin/com/last/commit/screen/FirstScreen.kt index 18caa28..9ab021a 100644 --- a/core/src/main/kotlin/com/last/commit/screen/FirstScreen.kt +++ b/core/src/main/kotlin/com/last/commit/screen/FirstScreen.kt @@ -74,6 +74,7 @@ class FirstScreen(private val parent: Game) : TimeTravelScreen() { ActionCommand.TIME_TRAVEL -> { map.teleport(player) } + else -> {} } println(action) println(gameState.settings.getKeyCode(ActionCommand.OPEN_MENU))