Fix a bug where when shortcut key is pressed, the gui button is not d…

…rawn
casavaca · Jan 17, 2024 · 5b93d0c · 5b93d0c
1 parent e15ba3a
commit 5b93d0c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 16 deletions.
diff --git a/src/game.cpp b/src/game.cpp
@@ -103,8 +103,7 @@ void Sokoban::MoveBox(Pos p, Pos dp) {
 void Sokoban::Push(int dy, int dx) {
     Pos dp = {dy, dx};
     Pos newPos = playerPos + dp;
-    if (!InBound(newPos))
-        return;
+    assert(InBound(newPos));
     if (state[newPos.row][newPos.col] & TILE_BOX) {
         if (!IsSpace(newPos + dp))
             return SetPlayerPos(playerPos, dy,dx);

diff --git a/src/game_gui.cpp b/src/game_gui.cpp
@@ -161,7 +161,7 @@ GuiEvent Draw(raylib::Window& window, const Sokoban& game) {
             GuiSetState(STATE_NORMAL);
             return false;
         } else {
-            return (IsKeyPressed(b.shortcutKey) || GuiButton(rects[numRects++], b.text));
+            return (GuiButton(rects[numRects++], b.text) || IsKeyPressed(b.shortcutKey));
         }
     };
 

diff --git a/test/test.events b/test/test.events
@@ -60,6 +60,12 @@ e 586 2 32 0 0 0 // Event: INPUT_KEY_DOWN
 e 587 2 32 0 0 0 // Event: INPUT_KEY_DOWN
 e 588 2 32 0 0 0 // Event: INPUT_KEY_DOWN
 e 589 1 32 0 0 0 // Event: INPUT_KEY_UP
+e 595 2 262 0 0 0 // Event: INPUT_KEY_DOWN
+e 596 1 262 0 0 0 // Event: INPUT_KEY_UP
+e 600 2 90 0 0 0 // Event: INPUT_KEY_DOWN
+e 601 1 90 0 0 0 // Event: INPUT_KEY_UP
+e 610 2 90 0 0 0 // Event: INPUT_KEY_DOWN
+e 611 1 90 0 0 0 // Event: INPUT_KEY_UP
 e 622 2 265 0 0 0 // Event: INPUT_KEY_DOWN
 e 623 2 265 0 0 0 // Event: INPUT_KEY_DOWN
 e 624 2 265 0 0 0 // Event: INPUT_KEY_DOWN
@@ -267,19 +273,24 @@ e 747 2 262 0 0 0 // Event: INPUT_KEY_DOWN
 e 748 2 262 0 0 0 // Event: INPUT_KEY_DOWN
 e 749 2 262 0 0 0 // Event: INPUT_KEY_DOWN
 e 750 1 262 0 0 0 // Event: INPUT_KEY_UP
-e 753 2 262 0 0 0 // Event: INPUT_KEY_DOWN
-e 754 2 262 0 0 0 // Event: INPUT_KEY_DOWN
-e 755 2 262 0 0 0 // Event: INPUT_KEY_DOWN
-e 756 2 262 0 0 0 // Event: INPUT_KEY_DOWN
-e 757 1 262 0 0 0 // Event: INPUT_KEY_UP
-e 761 2 262 0 0 0 // Event: INPUT_KEY_DOWN
-e 762 2 262 0 0 0 // Event: INPUT_KEY_DOWN
-e 763 2 262 0 0 0 // Event: INPUT_KEY_DOWN
-e 764 2 262 0 0 0 // Event: INPUT_KEY_DOWN
-e 765 2 262 0 0 0 // Event: INPUT_KEY_DOWN
-e 766 2 262 0 0 0 // Event: INPUT_KEY_DOWN
-e 767 2 262 0 0 0 // Event: INPUT_KEY_DOWN
-e 768 1 262 0 0 0 // Event: INPUT_KEY_UP
+e 761 2 82 0 0 0 // Event: INPUT_KEY_DOWN
+e 762 2 82 0 0 0 // Event: INPUT_KEY_DOWN
+e 763 2 82 0 0 0 // Event: INPUT_KEY_DOWN
+e 764 2 82 0 0 0 // Event: INPUT_KEY_DOWN
+e 765 2 82 0 0 0 // Event: INPUT_KEY_DOWN
+e 766 2 82 0 0 0 // Event: INPUT_KEY_DOWN
+e 767 2 82 0 0 0 // Event: INPUT_KEY_DOWN
+e 768 1 82 0 0 0 // Event: INPUT_KEY_UP
+e 820 2 262 0 0 0 // Event: INPUT_KEY_DOWN
+e 821 1 262 0 0 0 // Event: INPUT_KEY_UP
+e 830 2 262 0 0 0 // Event: INPUT_KEY_DOWN
+e 831 1 262 0 0 0 // Event: INPUT_KEY_UP
+e 835 2 82 0 0 0 // Event: INPUT_KEY_DOWN
+e 836 1 82 0 0 0 // Event: INPUT_KEY_UP
+e 840 2 262 0 0 0 // Event: INPUT_KEY_DOWN
+e 841 1 262 0 0 0 // Event: INPUT_KEY_UP
+e 850 2 262 0 0 0 // Event: INPUT_KEY_DOWN
+e 851 1 262 0 0 0 // Event: INPUT_KEY_UP
 e 886 2 32 0 0 0 // Event: INPUT_KEY_DOWN
 e 887 2 32 0 0 0 // Event: INPUT_KEY_DOWN
 e 888 2 32 0 0 0 // Event: INPUT_KEY_DOWN