[Scummvm-git-logs] scummvm master -> 1cd05f701d3cba8de1d81d3d750d7e5ffbfbfea1

[digitall]

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

Summary:
1cd05f701d TINSEL: Fix GCC Compiler Warnings


Commit: 1cd05f701d3cba8de1d81d3d750d7e5ffbfbfea1
    https://github.com/scummvm/scummvm/commit/1cd05f701d3cba8de1d81d3d750d7e5ffbfbfea1
Author: D G Turner (digitall at scummvm.org)
Date: 2022-01-09T22:58:05Z

Commit Message:
TINSEL: Fix GCC Compiler Warnings

Changed paths:
    engines/tinsel/dialogs.cpp
    engines/tinsel/movers.cpp
    engines/tinsel/text.cpp


diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp
index d2dee777526..75c2d2e598f 100644
--- a/engines/tinsel/dialogs.cpp
+++ b/engines/tinsel/dialogs.cpp
@@ -900,7 +900,8 @@ void Dialogs::PrimeSceneHopper() {
 
 	// allocate a buffer for it all
 	assert(_pHopper == NULL);
-	uint32 size = f.size() - 8;
+	// FIXME: validate vSize against size?
+	//uint32 size = f.size() - 8;
 	_numScenes = vSize / sizeof(HOPPER);
 
 	_pHopper = new HOPPER[_numScenes];
diff --git a/engines/tinsel/movers.cpp b/engines/tinsel/movers.cpp
index 3c77cc69c44..6a80d103192 100644
--- a/engines/tinsel/movers.cpp
+++ b/engines/tinsel/movers.cpp
@@ -720,7 +720,8 @@ static void InitialPathChecks(PMOVER pMover, int xpos, int ypos) {
 static void MoverProcessHelper(int X, int Y, int id, PMOVER pMover) {
 	const FILM *pfilm = (const FILM *)_vm->_handle->LockMem(pMover->walkReels[0][FORWARD]);
 	const MULTI_INIT *pmi = (const MULTI_INIT *)_vm->_handle->LockMem(FROM_32(pfilm->reels[0].mobj));
-	const FRAME *pFrame = (const FRAME *)_vm->_handle->LockMem(FROM_32(pmi->hMulFrame));
+	// FIXME: pFrame unused, but LockMem call may have side-effects so unclear if this can be removed
+	/* const FRAME *pFrame = (const FRAME *) */_vm->_handle->LockMem(FROM_32(pmi->hMulFrame));
 
 	assert(_vm->_bg->BgPal()); // Can't start actor without a background palette
 	assert(pMover->walkReels[0][FORWARD]); // Starting actor process without walk reels
diff --git a/engines/tinsel/text.cpp b/engines/tinsel/text.cpp
index 6b88ea87848..406dac6e470 100644
--- a/engines/tinsel/text.cpp
+++ b/engines/tinsel/text.cpp
@@ -134,9 +134,9 @@ OBJECT *ObjectTextOut(OBJECT **pList, char *szStr, int color,
 	assert(imgHandle);
 
 	// get height of capital W for offset to next line
-	const IMAGE *pImg = _vm->_handle->GetImage(imgHandle);
-	yOffset = pImg->imgHeight & ~C16_FLAG_MASK;
-	delete pImg;
+	const IMAGE *pImgCapitalW = _vm->_handle->GetImage(imgHandle);
+	yOffset = pImgCapitalW->imgHeight & ~C16_FLAG_MASK;
+	delete pImgCapitalW;
 
 	while (*szStr) {
 		// x justify the text according to the mode flags