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

[bluegr]

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:
c563263971 CHEWY: Remove unused variable
ab901983b8 CHEWY: Fix unlocked cutscenes in cinema screen - bug #15170


Commit: c563263971873a5a7bec0b0e52bd4f4cbeda1169
    https://github.com/scummvm/scummvm/commit/c563263971873a5a7bec0b0e52bd4f4cbeda1169
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-09T23:32:25+02:00

Commit Message:
CHEWY: Remove unused variable

Changed paths:
    engines/chewy/dialogs/cinema.cpp


diff --git a/engines/chewy/dialogs/cinema.cpp b/engines/chewy/dialogs/cinema.cpp
index 0a746527128..74b7ae72d91 100644
--- a/engines/chewy/dialogs/cinema.cpp
+++ b/engines/chewy/dialogs/cinema.cpp
@@ -44,7 +44,6 @@ static const uint8 CINEMA_FLICS[35] = {
 };
 
 void Cinema::execute() {
-	int16 txt_anz = 0;
 	int topIndex = 0;
 	int selected = 0;
 	bool flag = true;
@@ -172,19 +171,16 @@ void Cinema::execute() {
 		// The below are hacks to get the dialog to work in ScummVM
 		g_events->_kbInfo._scanCode = 0;
 		_G(minfo).button = 0;
-		txt_anz = 0;
 
-		if (!txt_anz) {
-			_G(cur)->updateCursor();
+		_G(cur)->updateCursor();
 
-			if (flag) {
-				flag = false;
-				_G(out)->setPointer((byte *)g_screen->getPixels());
-				_G(room)->set_ak_pal(&_G(room_blk));
-				_G(fx)->blende1(_G(workptr), _G(pal), 0, 0);
-			} else {
-				_G(out)->copyToScreen();
-			}
+		if (flag) {
+			flag = false;
+			_G(out)->setPointer((byte *)g_screen->getPixels());
+			_G(room)->set_ak_pal(&_G(room_blk));
+			_G(fx)->blende1(_G(workptr), _G(pal), 0, 0);
+		} else {
+			_G(out)->copyToScreen();
 		}
 
 		g_events->update();


Commit: ab901983b8826a97be4410b0f8481ef6ab335946
    https://github.com/scummvm/scummvm/commit/ab901983b8826a97be4410b0f8481ef6ab335946
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-09T23:33:43+02:00

Commit Message:
CHEWY: Fix unlocked cutscenes in cinema screen - bug #15170

Changed paths:
    engines/chewy/dialogs/cinema.cpp


diff --git a/engines/chewy/dialogs/cinema.cpp b/engines/chewy/dialogs/cinema.cpp
index 74b7ae72d91..35d4b09aaa5 100644
--- a/engines/chewy/dialogs/cinema.cpp
+++ b/engines/chewy/dialogs/cinema.cpp
@@ -72,7 +72,7 @@ void Cinema::execute() {
 					continue;
 
 				cutsceneName = _G(atds)->getTextEntry(98,
-					546 + cutscenes[topIndex + i], ATS_DATA);
+					546 + cutscenes[topIndex + i] - 1, ATS_DATA);
 				int yp = i * 10 + 68;
 
 				if (i == selected)
@@ -157,7 +157,7 @@ void Cinema::execute() {
 			_G(out)->setPointer((byte *)g_screen->getPixels());
 			_G(fx)->blende1(_G(workptr), _G(pal), 0, 0);
 
-			flic_cut(CINEMA_FLICS[cutscenes[topIndex + selected]]);
+			flic_cut(CINEMA_FLICS[cutscenes[topIndex + selected] - 1]);
 			_G(fontMgr)->setFont(_G(font6));
 			showCur();
 			delay = 0;