From 1c8c2543cbea3e2f0656df540c17706c89f73dcf Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Mon, 27 Jan 2020 11:11:21 -0500 Subject: [PATCH] - fixed: Shadow Warrior: End sequence was still 'hung' --- source/sw/src/anim.cpp | 3 +++ source/sw/src/game.cpp | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source/sw/src/anim.cpp b/source/sw/src/anim.cpp index ce75ad348..7294d47bf 100644 --- a/source/sw/src/anim.cpp +++ b/source/sw/src/anim.cpp @@ -313,6 +313,9 @@ playanm(short anim_num) rotatesprite(0 << 16, 0 << 16, 65536L, 512, ANIM_TILE(ANIMnum), 0, 0, 2 + 4 + 8 + 16 + 64, 0, 0, xdim - 1, ydim - 1); videoNextPage(); + handleevents(); + if (inputState.CheckAllInput()) + break; } // pause on final frame diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp index b1bcf1b6c..1ef03eb9e 100644 --- a/source/sw/src/game.cpp +++ b/source/sw/src/game.cpp @@ -1548,7 +1548,7 @@ void CreditsLevel(void) inputState.ClearAllInput(); curpic = CREDITS1_PIC; - while (TRUE) + while (!inputState.CheckAllInput()) { // taken from top of faketimerhandler // limits checks to max of 40 times a second @@ -1572,9 +1572,7 @@ void CreditsLevel(void) timer = 0; curpic = CREDITS1_PIC; } - - if (inputState.CheckAllInput()) - break; + handleevents(); } // put up a blank screen while loading