[Scummvm-cvs-logs] SF.net SVN: scummvm:[33536] residual/trunk/engine
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Sat Aug 2 23:03:25 CEST 2008
Revision: 33536
http://scummvm.svn.sourceforge.net/scummvm/?rev=33536&view=rev
Author: aquadran
Date: 2008-08-02 21:03:23 +0000 (Sat, 02 Aug 2008)
Log Message:
-----------
added checks
Modified Paths:
--------------
residual/trunk/engine/engine.cpp
residual/trunk/engine/lua.cpp
Modified: residual/trunk/engine/engine.cpp
===================================================================
--- residual/trunk/engine/engine.cpp 2008-08-02 20:59:25 UTC (rev 33535)
+++ residual/trunk/engine/engine.cpp 2008-08-02 21:03:23 UTC (rev 33536)
@@ -489,7 +489,8 @@
strcpy(filename, _savegameFileName);
}
_savedState = new SaveGame(filename, false);
-
+ if (!_savedState)
+ return;
g_imuse->stopAllSounds();
g_imuse->resetState();
g_smush->stop();
@@ -555,6 +556,8 @@
strcpy(filename, _savegameFileName);
}
_savedState = new SaveGame(filename, true);
+ if (!_savedState)
+ return;
storeSaveGameImage(_savedState);
Modified: residual/trunk/engine/lua.cpp
===================================================================
--- residual/trunk/engine/lua.cpp 2008-08-02 20:59:25 UTC (rev 33535)
+++ residual/trunk/engine/lua.cpp 2008-08-02 21:03:23 UTC (rev 33536)
@@ -2061,6 +2061,8 @@
static void SaveIMuse() {
DEBUG_FUNCTION();
SaveGame *savedIMuse = new SaveGame("grim.tmp", true);
+ if (savedIMuse)
+ return;
g_imuse->saveState(savedIMuse);
delete savedIMuse;
}
@@ -2068,6 +2070,8 @@
static void RestoreIMuse() {
DEBUG_FUNCTION();
SaveGame *savedIMuse = new SaveGame("grim.tmp", false);
+ if (savedIMuse)
+ return;
g_imuse->stopAllSounds();
g_imuse->resetState();
g_imuse->restoreState(savedIMuse);
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