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

somaen einarjohants at gmail.com
Tue Feb 23 21:22:18 UTC 2021


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:
e8111e282b TINSEL: Fix uninitialized pFilm in StartupBackground for Noir


Commit: e8111e282b7266ef73273351ba949ba0b4207a23
    https://github.com/scummvm/scummvm/commit/e8111e282b7266ef73273351ba949ba0b4207a23
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-02-23T22:13:30+01:00

Commit Message:
TINSEL: Fix uninitialized pFilm in StartupBackground for Noir

Changed paths:
    engines/tinsel/bg.cpp


diff --git a/engines/tinsel/bg.cpp b/engines/tinsel/bg.cpp
index 2e69cf7925..cd657a5709 100644
--- a/engines/tinsel/bg.cpp
+++ b/engines/tinsel/bg.cpp
@@ -168,12 +168,13 @@ void Background::StartupBackground(CORO_PARAM, SCNHANDLE hFilm) {
 	CORO_BEGIN_CODE(_ctx);
 
 	const FILM *pfilm;
+	IMAGE *pim;
 
 	_hBackground = hFilm;		// Save handle in case of Save_Scene()
 
-	if (!TinselV3) {
-		IMAGE *pim = _vm->_cursor->GetImageFromFilm(hFilm, 0, NULL, NULL, &pfilm);
+	pim = _vm->_cursor->GetImageFromFilm(hFilm, 0, NULL, NULL, &pfilm);
 
+	if (!TinselV3) {
 		SetBackPal(FROM_32(pim->hImgPal));
 	}
 




More information about the Scummvm-git-logs mailing list