aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/script_lol.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2009-09-17 17:14:38 +0000
committerJohannes Schickel2009-09-17 17:14:38 +0000
commitcfd6d4722c6cafbdc79095e3eef910cf2a47123a (patch)
treed726bca675e967136c28ff66f43d98bcc9b91a70 /engines/kyra/script_lol.cpp
parent5f440854b7f0f4d9aefda208e9b79c5628adf50f (diff)
downloadscummvm-rg350-cfd6d4722c6cafbdc79095e3eef910cf2a47123a.tar.gz
scummvm-rg350-cfd6d4722c6cafbdc79095e3eef910cf2a47123a.tar.bz2
scummvm-rg350-cfd6d4722c6cafbdc79095e3eef910cf2a47123a.zip
Changed olol_restoreMagicShroud to be a bit more talkative on errors.
svn-id: r44174
Diffstat (limited to 'engines/kyra/script_lol.cpp')
-rw-r--r--engines/kyra/script_lol.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp
index 6b88c090cb..f97202c32d 100644
--- a/engines/kyra/script_lol.cpp
+++ b/engines/kyra/script_lol.cpp
@@ -2167,14 +2167,19 @@ int LoLEngine::olol_restoreMagicShroud(EMCState *script) {
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;