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

[kelmer44]

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

Summary:
e37510c6ab TOT: Fix glitch when clearing text on FLI anims


Commit: e37510c6aba0eb05e471ced54f8b72089351f457
    https://github.com/scummvm/scummvm/commit/e37510c6aba0eb05e471ced54f8b72089351f457
Author: kelmer (kelmer at gmail.com)
Date: 2025-09-11T06:20:58+02:00

Commit Message:
TOT: Fix glitch when clearing text on FLI anims

Changed paths:
    engines/tot/anims.cpp
    engines/tot/cutscenes.cpp


diff --git a/engines/tot/anims.cpp b/engines/tot/anims.cpp
index 410a6eadbd9..f73f107cc91 100644
--- a/engines/tot/anims.cpp
+++ b/engines/tot/anims.cpp
@@ -83,7 +83,7 @@ void drawTvText(const Common::String &str1, const Common::String &str2, const Co
 }
 
 void clearTvText() {
-	removeText(80, 0, 319, 53, 0);
+	removeText(80, 0, 319, 54, 0);
 }
 
 void drawCharacterText(const Common::String &str1, const Common::String &str2, const Common::String &str3, const Common::String &str4, const Common::String &str5) {
@@ -834,10 +834,6 @@ void handleFlcEvent(byte eventNumber, uint loopNumber, byte frameCount) {
 	}
 }
 
-void drawFlc(uint x, uint y, int32 fliOffset, uint loop,
-			 byte speed, byte eventNumber, bool fullPalette, bool isSkipAllowed,
-			 bool doscientos, bool &salidaflis);
-
 static void exitProcedure(bool &exitLoop, bool isSkipAllowed) {
 	exitLoop = false;
 	Common::Event e;
@@ -917,9 +913,6 @@ void drawFlc(
 	TotFlicDecoder *flic = new TotFlicDecoder();
 
 	flic->loadStream(thisFlic);
-	if(speed == 9) {
-		debug("Playing at half speed!");
-	}
 	flic->start();
 	bool skipFrame = false;
 	do {
diff --git a/engines/tot/cutscenes.cpp b/engines/tot/cutscenes.cpp
index d6f4d956a5c..d840f434b6b 100644
--- a/engines/tot/cutscenes.cpp
+++ b/engines/tot/cutscenes.cpp
@@ -369,10 +369,10 @@ void TotEngine::introduction() {
 	_screen->clear();
 	drawFlc(136, 53, offsets[2], 136, 9, 1, true, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(135, 54, offsets[3], 0, 9, 2, true, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	_graphics->totalFadeOut(0);
 	_screen->clear();
 	if (isSpanish) {
@@ -406,7 +406,7 @@ void TotEngine::introduction() {
 		Common::Event e;
 		g_system->getEventManager()->pollEvent(e);
 		if (e.type == Common::EVENT_KEYDOWN || e.type == Common::EVENT_LBUTTONUP) {
-			goto Lsalirpres;
+			goto LexitIntro;
 		}
 
 		if (g_engine->_chrono->_gameTick) {
@@ -419,64 +419,63 @@ void TotEngine::introduction() {
 	_screen->clear();
 	drawFlc(0, 0, offsets[4], 0, 9, 3, true, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(110, 30, offsets[5], 2, 9, 4, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(110, 30, offsets[6], 3, 9, 5, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(110, 30, offsets[7], 0, 9, 0, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(110, 30, offsets[8], isSpanish ? 4 : 8, 9, 6, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(110, 30, offsets[9], 3, 9, 7, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(110, 30, offsets[8], isSpanish ? 3 : 8, 9, 8, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(110, 30, offsets[9], 2, 9, 9, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(0, 0, offsets[10], 0, 9, 0, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(235, 100, offsets[11], 3, 9, 10, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(150, 40, offsets[12], 0, 9, 11, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(235, 100, offsets[11], 3, 9, 12, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(150, 40, offsets[12], isSpanish ? 0 : 2, 9, 13, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(235, 100, offsets[11], isSpanish ? 3 : 8, 9, 14, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(150, 40, offsets[12], 0, 9, 15, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(173, 98, offsets[13], 0, 9, 0, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(224, 100, offsets[14], 2, 9, 16, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(0, 0, offsets[15], 0, 18, 17, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	drawFlc(150, 40, offsets[16], 0, 9, 18, false, true, false, exitPressed);
 	if (exitPressed)
-		goto Lsalirpres;
+		goto LexitIntro;
 	delay(1000);
-Lsalirpres:
-	debug("Exiting intro!");
+LexitIntro:
 	_graphics->totalFadeOut(0);
 	_screen->clear();
 	_mouse->show();