Merge pull request #25 from y0lo/bugxif/y0lo/clear-input-event-queue-…

…on-end-combat-turn Clear input envents on combat turn
roginvs · Nov 14, 2024 · 3e35f2c · 3e35f2c
2 parents 19becd8 + 2d88189
commit 3e35f2c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/combat.cc b/src/combat.cc
@@ -3233,6 +3233,7 @@ static int _combat_turn(Object* obj, bool a2)
     } else {
         if (obj == gDude) {
             keyboardReset();
+            inputEventQueueReset();
             interfaceRenderArmorClass(true);
             _combat_free_move = 2 * perkGetRank(gDude, PERK_BONUS_MOVE);
             interfaceRenderActionPoints(gDude->data.critter.combat.ap, _combat_free_move);

diff --git a/src/input.cc b/src/input.cc
@@ -303,6 +303,8 @@ void inputEventQueueReset()
 {
     gInputEventQueueReadIndex = -1;
     gInputEventQueueWriteIndex = 0;
+    SDL_Event e;
+    while (SDL_PollEvent(&e)) {} // Clear all input events
 }
 
 // 0x4C8D1C