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

[bluegr]

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:
effed966dd TINSEL: Resolve FIXMEs


Commit: effed966ddc12eb1b76c525d7991eb0cd1cbcc13
    https://github.com/scummvm/scummvm/commit/effed966ddc12eb1b76c525d7991eb0cd1cbcc13
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-01-10T01:51:02+02:00

Commit Message:
TINSEL: Resolve FIXMEs

We already verify the data read for the hopper screen via stream err().
Also, LockMem() has no side-effects when removing unused references.
Thanks to @digitall for spotting the unused variables

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


diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp
index 75c2d2e598f..7223622ac0c 100644
--- a/engines/tinsel/dialogs.cpp
+++ b/engines/tinsel/dialogs.cpp
@@ -900,8 +900,7 @@ void Dialogs::PrimeSceneHopper() {
 
 	// allocate a buffer for it all
 	assert(_pHopper == NULL);
-	// 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 6a80d103192..ffee160d690 100644
--- a/engines/tinsel/movers.cpp
+++ b/engines/tinsel/movers.cpp
@@ -720,8 +720,6 @@ 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));
-	// 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