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

[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:
bc33beada0 TOT: refactor palette anim switch case to share common actions. PVS-Studio: V1037
d6b2e36551 TOT: call FlicDecoders readHeader function instead of virtual one. PVS-Studio: V1053


Commit: bc33beada02dd093212f991630c780a8b2305e7e
    https://github.com/scummvm/scummvm/commit/bc33beada02dd093212f991630c780a8b2305e7e
Author: kelmer (kelmer at gmail.com)
Date: 2025-10-03T08:38:15+02:00

Commit Message:
TOT: refactor palette anim switch case to share common actions. PVS-Studio: V1037

Changed paths:
    engines/tot/graphics.cpp


diff --git a/engines/tot/graphics.cpp b/engines/tot/graphics.cpp
index 08d7675e29e..a1960639b6f 100644
--- a/engines/tot/graphics.cpp
+++ b/engines/tot/graphics.cpp
@@ -293,29 +293,23 @@ void GraphicsManager::updatePalette(byte paletteIndex) {
 	case 2: {
 		switch (paletteIndex) {
 		case 0:
+		case 4:
 			ip = 0;
 			break;
 		case 1:
+		case 3:
 			ip = 4;
 			break;
 		case 2:
 			ip = 8;
 			break;
-		case 3:
-			ip = 4;
-			break;
-		case 4:
-			ip = 0;
-			break;
 		case 5:
+		case 7:
 			ip = -4;
 			break;
 		case 6:
 			ip = -8;
 			break;
-		case 7:
-			ip = -4;
-			break;
 		}
 
 		for (int i = 0; i < 3; i++) {


Commit: d6b2e36551bb53195e79cac3bd4aeda7a47de4e9
    https://github.com/scummvm/scummvm/commit/d6b2e36551bb53195e79cac3bd4aeda7a47de4e9
Author: kelmer (kelmer at gmail.com)
Date: 2025-10-03T08:45:53+02:00

Commit Message:
TOT: call FlicDecoders readHeader function instead of virtual one. PVS-Studio: V1053

Changed paths:
    engines/tot/cutscenes.cpp
    engines/tot/decoder/TotFlicDecoder.cpp


diff --git a/engines/tot/cutscenes.cpp b/engines/tot/cutscenes.cpp
index bb409cf0629..9eabba974f5 100644
--- a/engines/tot/cutscenes.cpp
+++ b/engines/tot/cutscenes.cpp
@@ -69,12 +69,11 @@ void putCreditsImg(uint x, uint y, const byte *img1, const byte *img2, bool dire
 
 	uint16 wImg1, hImg1;
 	uint horizontalAux;
-	byte *step;
 
 	wImg1 = READ_LE_UINT16(img1);
 	hImg1 = READ_LE_UINT16(img1 + 2);
 
-	step = (byte *)malloc((wImg1 + 1) * (hImg1 + 1) + 4);
+	byte * step = (byte *)malloc((wImg1 + 1) * (hImg1 + 1) + 4);
 
 	horizontalAux = wImg1 + 1;
 	uint yPos = hImg1 + y;
diff --git a/engines/tot/decoder/TotFlicDecoder.cpp b/engines/tot/decoder/TotFlicDecoder.cpp
index 5043c7949d7..dc98da4afaa 100644
--- a/engines/tot/decoder/TotFlicDecoder.cpp
+++ b/engines/tot/decoder/TotFlicDecoder.cpp
@@ -61,7 +61,7 @@ bool TotFlicDecoder::loadStream(Common::SeekableReadStream *stream) {
 
 TotFlicDecoder::TotVideoTrack::TotVideoTrack(Common::SeekableReadStream *stream, uint16 frameCount, uint16 width, uint16 height) : Video::FlicDecoder::FlicVideoTrack(stream, frameCount, width, height, true) {
 
-	readHeader();
+	FlicDecoder::FlicVideoTrack::readHeader();
 }
 
 TotFlicDecoder::TotVideoTrack::~TotVideoTrack() {