[Scummvm-git-logs] scummvm master -> 7acd975534e96ff294d41756deb11a713ae2a0c0

[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:
a8a01575e7 BAGEL: Make console var command case insensitive
7acd975534 BAGEL: Fix SAVTURNCOUNT getting reset as conv starts


Commit: a8a01575e7f7aa74c267b93c5cfe2d382eddd037
    https://github.com/scummvm/scummvm/commit/a8a01575e7f7aa74c267b93c5cfe2d382eddd037
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-05-16T21:47:47-07:00

Commit Message:
BAGEL: Make console var command case insensitive

Changed paths:
    engines/bagel/console.cpp


diff --git a/engines/bagel/console.cpp b/engines/bagel/console.cpp
index d412b645a3f..135dcfca2ec 100644
--- a/engines/bagel/console.cpp
+++ b/engines/bagel/console.cpp
@@ -46,10 +46,14 @@ bool Console::cmdVar(int argc, const char **argv) {
 		return true;
 	}
 
-	CBagVar *var = g_VarManager->getVariable(argv[1]);
-	assert(var);
+	Common::String varName = argv[1];
+	varName.toUppercase();
 
-	if (argc == 2) {
+	CBagVar *var = g_VarManager->getVariable(varName.c_str());
+
+	if (!var) {
+		debugPrintf("Unknown variable.\n");
+	} else if (argc == 2) {
 		debugPrintf("Current value = %s\n", var->getValue().getBuffer());
 	} else {
 		var->setValue(argv[2]);


Commit: 7acd975534e96ff294d41756deb11a713ae2a0c0
    https://github.com/scummvm/scummvm/commit/7acd975534e96ff294d41756deb11a713ae2a0c0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-05-16T21:47:47-07:00

Commit Message:
BAGEL: Fix SAVTURNCOUNT getting reset as conv starts

Changed paths:
    engines/bagel/boflib/gui/window.cpp


diff --git a/engines/bagel/boflib/gui/window.cpp b/engines/bagel/boflib/gui/window.cpp
index 7d562988258..c7fd212334b 100644
--- a/engines/bagel/boflib/gui/window.cpp
+++ b/engines/bagel/boflib/gui/window.cpp
@@ -566,9 +566,7 @@ void CBofWindow::handleEvents() {
 	Common::Event e;
 	CBofWindow *capture = CBofApp::getApp()->getCaptureControl();
 	CBofWindow *focus = CBofApp::getApp()->getFocusControl();
-
-	// Check for expired timers before handling events
-	checkTimers();
+	bool eventsPresent = false;
 
 	while (g_system->getEventManager()->pollEvent(e)) {
 		if (capture)
@@ -583,9 +581,20 @@ void CBofWindow::handleEvents() {
 			_mouseY = e.mouse.y;
 		}
 
-		if (e.type != Common::EVENT_MOUSEMOVE)
+		if (e.type != Common::EVENT_MOUSEMOVE) {
+			eventsPresent = true;
 			break;
+		}
 	}
+
+	// Only do timer checks when not processing other pending events.
+	// This simulates Windows behaviour, where the WM_TIMER events
+	// would be added at the end of the event queue
+	if (!eventsPresent)
+		// Check for expired timers
+		checkTimers();
+
+
 }
 
 void CBofWindow::handleEvent(const Common::Event &event) {