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

aquadran aquadran at gmail.com
Sun Feb 28 09:05:34 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:
f15f20182c ICB: Removed not used code


Commit: f15f20182c56a2a6d6f4abd12c4f79a944df6933
    https://github.com/scummvm/scummvm/commit/f15f20182c56a2a6d6f4abd12c4f79a944df6933
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-02-28T10:05:29+01:00

Commit Message:
ICB: Removed not used code

Changed paths:
    engines/icb/options_manager_pc.cpp


diff --git a/engines/icb/options_manager_pc.cpp b/engines/icb/options_manager_pc.cpp
index 109587fcd5..c8a79158c5 100644
--- a/engines/icb/options_manager_pc.cpp
+++ b/engines/icb/options_manager_pc.cpp
@@ -1045,25 +1045,6 @@ void OptionsManager::LoadTitleScreenMovie() {
 	// Clean background res_man
 	rs_bg->Res_purge_all();
 
-	// Caculate memory needed for movie
-	uint32 movieSize = GetFileSz(filename);
-	if (movieSize == 0)
-		Fatal_error("Couldn't get filesize of title movie");
-#if 0
-	// Get the memory
-	uint32 moviehashID = 0xBEEF ;
-	uint32 nullhash = NULL_HASH ;
-	uint8 *mem = rs_bg->Res_alloc(moviehashID, filename, nullhash, movieSize) ;
-
-	// Open the movie file and read it straight into memory
-	Common::SeekableReadStream *movieStream = openDiskFileForBinaryStreamRead(filename.c_str()) ;
-	if (movieStream == NULL)
-		Fatal_error(pxVString("Failed to open movie file: %s for reading", (const char *)filename)) ;
-	if (movieStream->read(mem, movieSize) != movieSize)
-		Fatal_error("LoadTitleScreenMovie() failed to read from file") ;
-	// Close the file
-	delete movieStream;
-#endif
 	if (!g_personalSequenceManager->registerMovie(filename, FALSE8, TRUE8)) {
 		Fatal_error(pxVString("Couldn't register the title screen movie: %s", (const char *)filename));
 	}




More information about the Scummvm-git-logs mailing list