[Scummvm-git-logs] scummvm master -> b73ca790acb4d6639dcea71badcfe1674e0b49ee

[dreammaster]

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

Summary:
1a67d84723 AGS: Do shouldQuit() check when showing quit dialog
b73ca790ac AGS: Have AGSCreditz2 only do pollSystem calls when active


Commit: 1a67d84723928344660fd23af9e24292e9d92427
    https://github.com/scummvm/scummvm/commit/1a67d84723928344660fd23af9e24292e9d92427
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-03-14T17:05:45-07:00

Commit Message:
AGS: Do shouldQuit() check when showing quit dialog

Changed paths:
    engines/ags/engine/gui/cscidialog.cpp
    engines/ags/engine/gui/guidialog.cpp


diff --git a/engines/ags/engine/gui/cscidialog.cpp b/engines/ags/engine/gui/cscidialog.cpp
index 41335434da..e3d6f38ec5 100644
--- a/engines/ags/engine/gui/cscidialog.cpp
+++ b/engines/ags/engine/gui/cscidialog.cpp
@@ -42,6 +42,7 @@
 #include "ags/engine/platform/base/agsplatformdriver.h"
 #include "ags/engine/ac/timer.h"
 #include "ags/globals.h"
+#include "ags/ags.h"
 
 namespace AGS3 {
 
@@ -127,7 +128,7 @@ int CSCIWaitMessage(CSCIMessage *cscim) {
 
 	prepare_gui_screen(win_x, win_y, win_width, win_height, true);
 
-	while (1) {
+	while (!SHOULD_QUIT) {
 		update_audio_system_on_game_loop();
 		refresh_gui_screen();
 
diff --git a/engines/ags/engine/gui/guidialog.cpp b/engines/ags/engine/gui/guidialog.cpp
index 881ad850f0..fd7cd8f0b6 100644
--- a/engines/ags/engine/gui/guidialog.cpp
+++ b/engines/ags/engine/gui/guidialog.cpp
@@ -442,6 +442,9 @@ int myscimessagebox(const char *lpprompt, char *btn1, char *btn2) {
 	_GP(smes).code = 0;
 
 	do {
+		if (SHOULD_QUIT)
+			return 1;
+
 		CSCIWaitMessage(&_GP(smes));
 	} while (_GP(smes).code != CM_COMMAND);
 


Commit: b73ca790acb4d6639dcea71badcfe1674e0b49ee
    https://github.com/scummvm/scummvm/commit/b73ca790acb4d6639dcea71badcfe1674e0b49ee
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-03-14T17:06:00-07:00

Commit Message:
AGS: Have AGSCreditz2 only do pollSystem calls when active

Changed paths:
    engines/ags/plugins/ags_creditz/ags_creditz2.cpp


diff --git a/engines/ags/plugins/ags_creditz/ags_creditz2.cpp b/engines/ags/plugins/ags_creditz/ags_creditz2.cpp
index 42a3054e2d..4efa02f7cd 100644
--- a/engines/ags/plugins/ags_creditz/ags_creditz2.cpp
+++ b/engines/ags/plugins/ags_creditz/ags_creditz2.cpp
@@ -345,9 +345,10 @@ int AGSCreditz2::VGACheck(int value) {
 
 void AGSCreditz2::draw() {
 	int endPoint;
-	_engine->PollSystem();
 
 	if (_state->_creditsRunning) {
+		_engine->PollSystem();
+
 		if (!_state->_staticCredits) {
 			// Scrolling credits
 			drawMask(_state->_creditSequence, 0);