diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
index 7647e69c2a6c0ad9d782de5b5533ccc75123fec1..8118fec05abe59756d90d568f06851b4e7243c45 100644 (file)
import ru.deadsoftware.cavedroid.game.mobs.Player;
import ru.deadsoftware.cavedroid.game.objects.TouchButton;
import ru.deadsoftware.cavedroid.game.render.IGameRenderer;
+import ru.deadsoftware.cavedroid.game.windows.GameWindowsManager;
import ru.deadsoftware.cavedroid.misc.Assets;
import ru.deadsoftware.cavedroid.misc.Renderer;
private final KeyboardInputActionMapper mKeyboardInputActionMapper;
private final Set<IGameInputHandler<MouseInputAction>> mMouseInputHandlers;
private final Set<IGameInputHandler<KeyboardInputAction>> mKeyboardInputHandlers;
+ private final GameWindowsManager mGameWindowsManager;
@Inject
GameRenderer(MainConfig mainConfig,
MouseInputActionMapper mouseInputActionMapper,
KeyboardInputActionMapper keyboardInputActionMapper,
Set<IGameInputHandler<MouseInputAction>> mouseInputHandlers,
- Set<IGameInputHandler<KeyboardInputAction>> keyboardInputHandlers) {
+ Set<IGameInputHandler<KeyboardInputAction>> keyboardInputHandlers,
+ GameWindowsManager gameWindowsManager) {
super(mainConfig.getWidth(), mainConfig.getHeight());
mMainConfig = mainConfig;
mKeyboardInputActionMapper = keyboardInputActionMapper;
mMouseInputHandlers = mouseInputHandlers;
mKeyboardInputHandlers = keyboardInputHandlers;
+ mGameWindowsManager = gameWindowsManager;
Gdx.gl.glClearColor(0f, .6f, .6f, 1f);
}
}
private TouchButton getTouchedKey(float touchX, float touchY) {
+ if (mGameWindowsManager.getCurrentWindow() != GameUiWindow.NONE) {
+ return nullButton;
+ }
for (ObjectMap.Entry<String, TouchButton> entry : Assets.guiMap) {
TouchButton button = entry.value;
if (button.getRect().contains(touchX, touchY)) {