[Scummvm-cvs-logs] SF.net SVN: scummvm:[44174] scummvm/trunk/engines/kyra/script_lol.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Thu Sep 17 19:14:38 CEST 2009


Revision: 44174
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44174&view=rev
Author:   lordhoto
Date:     2009-09-17 17:14:38 +0000 (Thu, 17 Sep 2009)

Log Message:
-----------
Changed olol_restoreMagicShroud to be a bit more talkative on errors.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_lol.cpp

Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp	2009-09-17 17:00:36 UTC (rev 44173)
+++ scummvm/trunk/engines/kyra/script_lol.cpp	2009-09-17 17:14:38 UTC (rev 44174)
@@ -2167,14 +2167,19 @@
 
 	WSAMovie_v2 *mov = new WSAMovie_v2(this);
 	mov->open("DARKLITE.WSA", 2, 0);
-	if (!mov->opened())
-		return 0;
+	if (!mov->opened()) {
+		warning("LoLEngine::olol_restoreMagicShroud: Could not open file: \"DARKLITE.WSA\"");
+		return 1;
+	}
 
 	_screen->hideMouse();
 
 	// TODO: This function could need some major cleanup to work with our
 	// new palette code without needless conversions.
 	uint8 *fadeTab = new uint8[21504];
+	assert(fadeTab);
+	memset(fadeTab, 0, sizeof(fadeTab));
+
 	uint8 *tpal1 = fadeTab;
 	uint8 *tpal2 = tpal1 + 768;
 	uint8 *tpal3 = tpal2 + 768;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list