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

[kelmer44]

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

Summary:
f01592936e TOT: Fixes flickering text on animations
acab8019c1 TOT: Fixes event handling with skipping frames on animations


Commit: f01592936e0dcffe42535a825a5718b2c8bd37cd
    https://github.com/scummvm/scummvm/commit/f01592936e0dcffe42535a825a5718b2c8bd37cd
Author: kelmer (kelmer at gmail.com)
Date: 2025-10-03T12:56:34+02:00

Commit Message:
TOT: Fixes flickering text on animations

Changed paths:
    engines/tot/anims.cpp


diff --git a/engines/tot/anims.cpp b/engines/tot/anims.cpp
index 4d75032af68..5a69a7d6a29 100644
--- a/engines/tot/anims.cpp
+++ b/engines/tot/anims.cpp
@@ -37,29 +37,27 @@ void drawText(uint x, uint y, const Common::String &str1, const Common::String &
 	littText(x, (y + 23), str3, borderColor);
 	littText(x, (y + 33), str4, borderColor);
 	littText(x, (y + 43), str5, borderColor);
-	g_engine->_screen->update();
-	delay(kEnforcedTextAnimDelay);
+
 	littText(x, (y + 1), str1,  borderColor);
 	littText(x, (y + 11), str2, borderColor);
 	littText(x, (y + 21), str3, borderColor);
 	littText(x, (y + 31), str4, borderColor);
 	littText(x, (y + 41), str5, borderColor);
+
 	g_engine->_screen->update();
-	delay(kEnforcedTextAnimDelay);
+
 	littText(x + 1, (y + 2), str1,  borderColor);
 	littText(x + 1, (y + 12), str2, borderColor);
 	littText(x + 1, (y + 22), str3, borderColor);
 	littText(x + 1, (y + 32), str4, borderColor);
 	littText(x + 1, (y + 42), str5, borderColor);
-	g_engine->_screen->update();
-	delay(kEnforcedTextAnimDelay);
+
 	littText(x - 1, (y + 2), str1,  borderColor);
 	littText(x - 1, (y + 12), str2, borderColor);
 	littText(x - 1, (y + 22), str3, borderColor);
 	littText(x - 1, (y + 32), str4, borderColor);
 	littText(x - 1, (y + 42), str5, borderColor);
-	g_engine->_screen->update();
-	delay(kEnforcedTextAnimDelay);
+
 	littText(x, (y + 2), str1,  textColor);
 	littText(x, (y + 12), str2, textColor);
 	littText(x, (y + 22), str3, textColor);


Commit: acab8019c1e923a5f1798a027354f85dc6eae919
    https://github.com/scummvm/scummvm/commit/acab8019c1e923a5f1798a027354f85dc6eae919
Author: kelmer (kelmer at gmail.com)
Date: 2025-10-03T13:03:49+02:00

Commit Message:
TOT: Fixes event handling with skipping frames on animations

Changed paths:
    engines/tot/anims.cpp


diff --git a/engines/tot/anims.cpp b/engines/tot/anims.cpp
index 5a69a7d6a29..4f3b19be9ca 100644
--- a/engines/tot/anims.cpp
+++ b/engines/tot/anims.cpp
@@ -338,6 +338,7 @@ void handleFlcEvent(byte eventNumber, uint loopNumber, byte frameCount) {
 					 255, 249);
 			delay(3500);
 			g_engine->_graphics->putImg(0, 0, g_engine->_graphics->_textAreaBackground);
+			g_engine->_screen->update();
 			drawText(5, 1,
 					 messages[105],
 					 messages[106],
@@ -928,8 +929,8 @@ void drawFlc(
 				if(speed == 9) {
 					skipFrame = !skipFrame;
 				}
-				handleFlcEvent(eventNumber, loopNumber, frameCount);
 				if (!skipFrame) {
+					handleFlcEvent(eventNumber, loopNumber, frameCount);
 					const Graphics::Surface *frame = flic->decodeNextFrame();
 					if (frame) {
 						frameCount++;