[Scummvm-git-logs] scummvm master -> 9cd6e2750a05a0ba36feced10b8e51d0921ec78f

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9cd6e2750a CHEWY: Clear pending keys in all dialogs - bug #13632


Commit: 9cd6e2750a05a0ba36feced10b8e51d0921ec78f
    https://github.com/scummvm/scummvm/commit/9cd6e2750a05a0ba36feced10b8e51d0921ec78f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-06-30T22:17:29+03:00

Commit Message:
CHEWY: Clear pending keys in all dialogs - bug #13632

This is a partial fix, we still have to properly handle dialog lines
when they are not skipped and speech is enabled

Changed paths:
    engines/chewy/globals.h
    engines/chewy/sprite.cpp
    engines/chewy/t_event.cpp


diff --git a/engines/chewy/globals.h b/engines/chewy/globals.h
index 676f4debe01..96a895f92fa 100644
--- a/engines/chewy/globals.h
+++ b/engines/chewy/globals.h
@@ -437,7 +437,7 @@ uint16 exit_flip_flop(int16 ani_nr, int16 eib_nr1, int16 eib_nr2,
                         int16 ats_nr1, int16 ats_nr2, int16 sib_nr,
                         int16 spr_nr1, int16 spr_nr2, int16 flag);
 
-int16 loadDialogCloseup(int16 diaNr);
+void loadDialogCloseup(int16 diaNr);
 
 void setSsiPos();
 
diff --git a/engines/chewy/sprite.cpp b/engines/chewy/sprite.cpp
index 93c80bea60c..9cfb51da073 100644
--- a/engines/chewy/sprite.cpp
+++ b/engines/chewy/sprite.cpp
@@ -575,9 +575,6 @@ void startDialogCloseupWait(int16 diaNr) {
 	if (!_G(flags).DialogCloseup) {
 		_G(menu_item) = CUR_TALK;
 		cursorChoice(_G(menu_item));
-		_G(minfo).button = 0;
-		g_events->_kbInfo._keyCode = '\0';
-		g_events->_kbInfo._scanCode = Common::KEYCODE_INVALID;
 
 		loadDialogCloseup(diaNr);
 
diff --git a/engines/chewy/t_event.cpp b/engines/chewy/t_event.cpp
index 252e63611db..e1fd03c314f 100644
--- a/engines/chewy/t_event.cpp
+++ b/engines/chewy/t_event.cpp
@@ -30,9 +30,13 @@
 
 namespace Chewy {
 
-int16 loadDialogCloseup(int16 diaNr) {
-	if (_G(flags).DialogCloseup == false) {
+void loadDialogCloseup(int16 diaNr) {
+	if (!_G(flags).DialogCloseup) {
 		if (_G(atds)->startDialogCloseup(diaNr)) {
+			_G(minfo).button = 0;
+			g_events->_kbInfo._keyCode = '\0';
+			g_events->_kbInfo._scanCode = Common::KEYCODE_INVALID;
+
 			_G(ads_blk_nr) = 0;
 			_G(dialogCloseupItemPtr) = _G(atds)->dialogCloseupItemPtr(diaNr, _G(ads_blk_nr), &_G(ads_item_nr));
 			_G(flags).DialogCloseup = true;
@@ -44,10 +48,8 @@ int16 loadDialogCloseup(int16 diaNr) {
 			_G(ads_dia_nr) = diaNr;
 			_G(talk_start_ani) = -1;
 			_G(talk_hide_static) = -1;
-			return true;
 		}
 	}
-	return false;
 }
 
 void setSsiPos() {