[Scummvm-git-logs] scummvm master -> 5deacf341f15188d15457793a5558e7c66a1673e

[neuromancer]

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:
c6f3c4f772 FREESCAPE: missing usage of _eventManager
5deacf341f FREESCAPE: correctly redraw infoMenu in driller


Commit: c6f3c4f772f55a26f1a7f0e5877e95c0b9791065
    https://github.com/scummvm/scummvm/commit/c6f3c4f772f55a26f1a7f0e5877e95c0b9791065
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-01-04T21:56:42+01:00

Commit Message:
FREESCAPE: missing usage of _eventManager

Changed paths:
    engines/freescape/games/dark/dark.cpp
    engines/freescape/games/driller/driller.cpp
    engines/freescape/ui.cpp


diff --git a/engines/freescape/games/dark/dark.cpp b/engines/freescape/games/dark/dark.cpp
index 819e9dfd5cc..a1916efb596 100644
--- a/engines/freescape/games/dark/dark.cpp
+++ b/engines/freescape/games/dark/dark.cpp
@@ -698,7 +698,7 @@ void DarkEngine::drawInfoMenu() {
 	Common::Event event;
 	bool cont = true;
 	while (!shouldQuit() && cont) {
-		while (g_system->getEventManager()->pollEvent(event)) {
+		while (_eventManager->pollEvent(event)) {
 
 			// Events
 			switch (event.type) {
diff --git a/engines/freescape/games/driller/driller.cpp b/engines/freescape/games/driller/driller.cpp
index aab9d593efd..e97553a8b0f 100644
--- a/engines/freescape/games/driller/driller.cpp
+++ b/engines/freescape/games/driller/driller.cpp
@@ -315,7 +315,7 @@ void DrillerEngine::drawInfoMenu() {
 	Common::Event event;
 	bool cont = true;
 	while (!shouldQuit() && cont) {
-		while (g_system->getEventManager()->pollEvent(event)) {
+		while (_eventManager->pollEvent(event)) {
 
 			// Events
 			switch (event.type) {
diff --git a/engines/freescape/ui.cpp b/engines/freescape/ui.cpp
index a528bcab073..8e6b9eca6c8 100644
--- a/engines/freescape/ui.cpp
+++ b/engines/freescape/ui.cpp
@@ -30,7 +30,7 @@ void FreescapeEngine::titleScreen() {
 	int maxWait = 60 * 6;
 	for (int i = 0; i < maxWait; i++ ) {
 		Common::Event event;
-		while (g_system->getEventManager()->pollEvent(event)) {
+		while (_eventManager->pollEvent(event)) {
 			switch (event.type) {
 			case Common::EVENT_QUIT:
 			case Common::EVENT_RETURN_TO_LAUNCHER:
@@ -205,7 +205,7 @@ void FreescapeEngine::drawFullscreenMessageAndWait(Common::String message) {
 	Common::Event event;
 	bool cont = true;
 	while (!shouldQuit() && cont) {
-		while (g_system->getEventManager()->pollEvent(event)) {
+		while (_eventManager->pollEvent(event)) {
 
 			// Events
 			switch (event.type) {
@@ -248,7 +248,7 @@ void FreescapeEngine::drawBorderScreenAndWait(Graphics::Surface *surface) {
 	int maxWait = 6 * 60;
 	for (int i = 0; i < maxWait; i++ ) {
 		Common::Event event;
-		while (g_system->getEventManager()->pollEvent(event)) {
+		while (_eventManager->pollEvent(event)) {
 			switch (event.type) {
 			case Common::EVENT_QUIT:
 			case Common::EVENT_RETURN_TO_LAUNCHER:


Commit: 5deacf341f15188d15457793a5558e7c66a1673e
    https://github.com/scummvm/scummvm/commit/5deacf341f15188d15457793a5558e7c66a1673e
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-01-04T22:12:31+01:00

Commit Message:
FREESCAPE: correctly redraw infoMenu in driller

Changed paths:
    engines/freescape/games/driller/driller.cpp


diff --git a/engines/freescape/games/driller/driller.cpp b/engines/freescape/games/driller/driller.cpp
index e97553a8b0f..60ffa7c2f04 100644
--- a/engines/freescape/games/driller/driller.cpp
+++ b/engines/freescape/games/driller/driller.cpp
@@ -353,7 +353,14 @@ void DrillerEngine::drawInfoMenu() {
 				break;
 			}
 		}
-		g_system->delayMillis(10);
+		_gfx->clear(0, 0, 0, true);
+		drawBorder();
+		drawUI();
+		if (surface)
+			drawFullscreenSurface(surface);
+		_gfx->flipBuffer();
+		g_system->updateScreen();
+		g_system->delayMillis(15); // try to target ~60 FPS
 	}
 
 	_savedScreen->free();