Fix keyboard issues

armin-reichert · Nov 10, 2024 · 81678e7 · 81678e7
1 parent 94abf7a
commit 81678e7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/pacman-ui-2d/src/main/java/de/amr/games/pacman/ui2d/scene/common/PlayScene2D.java b/pacman-ui-2d/src/main/java/de/amr/games/pacman/ui2d/scene/common/PlayScene2D.java
@@ -51,6 +51,10 @@ public void bindGameActions() {}
     @Override
     protected void doInit() {
         context.setScoreVisible(true);
+        ArcadeKeyAdapter arcadeController = context.arcade();
+        bindDefaultArcadeControllerActions(this, arcadeController);
+        bindFallbackPlayerControlActions(this);
+        registerGameActionKeyBindings(context.keyboard());
     }
 
     @Override

diff --git a/pacman-ui-3d/src/main/java/de/amr/games/pacman/ui3d/scene/common/PlayScene3D.java b/pacman-ui-3d/src/main/java/de/amr/games/pacman/ui3d/scene/common/PlayScene3D.java
@@ -136,22 +136,24 @@ public final void end() {
     public void bindGameActions() {
         bind(GameActions3D.PREV_PERSPECTIVE, alt(KeyCode.LEFT));
         bind(GameActions3D.NEXT_PERSPECTIVE, alt(KeyCode.RIGHT));
-        if (context.level().isDemoLevel()) {
-            if (context.currentGameVariant() == GameVariant.MS_PACMAN_TENGEN) {
-                bind(TengenGameActions.QUIT_DEMO_LEVEL, context.joypad().keyCombination(NES.Joypad.START));
-            } else {
-                bind(GameActions2D.ADD_CREDIT, context.arcade().keyCombination(Arcade.Controls.COIN));
+        if (context.game().level().isPresent()) {
+            if (context.level().isDemoLevel()) {
+                if (context.currentGameVariant() == GameVariant.MS_PACMAN_TENGEN) {
+                    bind(TengenGameActions.QUIT_DEMO_LEVEL, context.joypad().keyCombination(NES.Joypad.START));
+                } else {
+                    bind(GameActions2D.ADD_CREDIT, context.arcade().keyCombination(Arcade.Controls.COIN));
+                }
             }
-        }
-        else {
-            if (context.currentGameVariant() == GameVariant.MS_PACMAN_TENGEN) {
-                bindDefaultJoypadActions(this, context.joypad());
-            } else {
-                bindDefaultArcadeControllerActions(this, context.arcade());
+            else {
+                if (context.currentGameVariant() == GameVariant.MS_PACMAN_TENGEN) {
+                    bindDefaultJoypadActions(this, context.joypad());
+                } else {
+                    bindDefaultArcadeControllerActions(this, context.arcade());
+                }
+                bindFallbackPlayerControlActions(this);
+                bindCheatActions(this);
+                context.setScoreVisible(true); //TODO check this
             }
-            bindFallbackPlayerControlActions(this);
-            bindCheatActions(this);
-            context.setScoreVisible(true); //TODO check this
         }
         registerGameActionKeyBindings(context.keyboard());
     }