X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fwindows%2FGameWindowsManager.kt;h=b07f1fd5112ea2be09521f05808319a173286b71;hb=387ad284ceb79b07cba3726fa7350b7e83916815;hp=302562fb9b60d086b30bc79ca6b1baf22099ef12;hpb=fb34c4a469190cbcd436a10c8cf3102562d97faf;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/windows/GameWindowsManager.kt b/core/src/ru/deadsoftware/cavedroid/game/windows/GameWindowsManager.kt
index 302562f..b07f1fd 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/windows/GameWindowsManager.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/windows/GameWindowsManager.kt
@@ -5,6 +5,10 @@ import ru.deadsoftware.cavedroid.game.GameScope
 import ru.deadsoftware.cavedroid.game.GameUiWindow
 import ru.deadsoftware.cavedroid.game.mobs.MobsController
 import ru.deadsoftware.cavedroid.game.model.item.InventoryItem
+import ru.deadsoftware.cavedroid.game.windows.inventory.AbstractInventoryWindow
+import ru.deadsoftware.cavedroid.game.windows.inventory.CraftingInventoryWindow
+import ru.deadsoftware.cavedroid.game.windows.inventory.CreativeInventoryWindow
+import ru.deadsoftware.cavedroid.game.windows.inventory.SurvivalInventoryWindow
 import javax.inject.Inject
 
 @GameScope
@@ -15,22 +19,28 @@ class GameWindowsManager @Inject constructor(
 
     var creativeScrollAmount = 0
     var isDragging = false
-    var selectedItem: InventoryItem? = null
 
+    var currentWindow: AbstractInventoryWindow? = null
+
+    @JvmName("getCurrentWindowType")
     fun getCurrentWindow(): GameUiWindow {
-        return mainConfig.gameUiWindow
+        return currentWindow?.type ?: GameUiWindow.NONE
     }
 
     fun openInventory() {
         if (mobsController.player.gameMode == 1) {
-            mainConfig.gameUiWindow = GameUiWindow.CREATIVE_INVENTORY
+            currentWindow = CreativeInventoryWindow(GameUiWindow.CREATIVE_INVENTORY)
         } else {
-            mainConfig.gameUiWindow = GameUiWindow.SURVIVAL_INVENTORY
+            currentWindow = SurvivalInventoryWindow(GameUiWindow.SURVIVAL_INVENTORY)
         }
     }
 
+    fun openCrafting() {
+        currentWindow = CraftingInventoryWindow(GameUiWindow.CRAFTING_TABLE)
+    }
+
     fun closeWindow() {
-        mainConfig.gameUiWindow = GameUiWindow.NONE
+        currentWindow = null
     }
 
 }
\ No newline at end of file