X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Frender%2FTouchControlsRenderer.kt;h=5c95d696c675cadba52dcaf7fd1d8186e9a79491;hb=dfe9ff3e9253c250f62ee029411f773916948601;hp=e8b19d013f0d5a1431f27582f0d39b59c4b137b2;hpb=fd73b6dd24b9fe55c0bc8f52f8aa1104a5fe3cb0;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/render/TouchControlsRenderer.kt b/core/src/ru/deadsoftware/cavedroid/game/render/TouchControlsRenderer.kt
index e8b19d0..5c95d69 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/render/TouchControlsRenderer.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/render/TouchControlsRenderer.kt
@@ -3,17 +3,22 @@ package ru.deadsoftware.cavedroid.game.render
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer
 import com.badlogic.gdx.math.Rectangle
-import ru.deadsoftware.cavedroid.game.GameInput
+import ru.deadsoftware.cavedroid.MainConfig
 import ru.deadsoftware.cavedroid.game.GameScope
+import ru.deadsoftware.cavedroid.game.GameUiWindow
+import ru.deadsoftware.cavedroid.game.mobs.MobsController
+import ru.deadsoftware.cavedroid.game.mobs.Player.ControlMode
+import ru.deadsoftware.cavedroid.game.windows.GameWindowsManager
 import ru.deadsoftware.cavedroid.misc.Assets
-import ru.deadsoftware.cavedroid.misc.ControlMode
 import ru.deadsoftware.cavedroid.misc.utils.ArrayMapExtensions.component1
 import ru.deadsoftware.cavedroid.misc.utils.ArrayMapExtensions.component2
 import javax.inject.Inject
 
 @GameScope
 class TouchControlsRenderer @Inject constructor(
-    private val gameInput: GameInput
+    private val mainConfig: MainConfig,
+    private val mobsController: MobsController,
+    private val gameWindowsManager: GameWindowsManager,
 ) : IGameRenderer {
 
     override val renderLayer get() = RENDER_LAYER
@@ -21,6 +26,10 @@ class TouchControlsRenderer @Inject constructor(
     private val shadeTexture get() = Assets.textureRegions[SHADE_KEY]
 
     override fun draw(spriteBatch: SpriteBatch, shapeRenderer: ShapeRenderer, viewport: Rectangle, delta: Float) {
+        if (!mainConfig.isTouch || gameWindowsManager.getCurrentWindow() != GameUiWindow.NONE) {
+            return
+        }
+
         val touchControlsMap = Assets.guiMap
 
         touchControlsMap.forEach { (key, value) ->
@@ -35,7 +44,7 @@ class TouchControlsRenderer @Inject constructor(
         }
 
         // FIXME: Add pressed state for buttons
-        if (gameInput.controlMode == ControlMode.CURSOR) {
+        if (mobsController.player.controlMode == ControlMode.CURSOR) {
             val altKeyRect = touchControlsMap.get("alt").rect
             spriteBatch.draw(shadeTexture, altKeyRect.x, altKeyRect.y, altKeyRect.width, altKeyRect.height)
         }