[Scummvm-cvs-logs] SF.net SVN: scummvm: [26212] scummvm/trunk/engines/sword1
lavosspawn at users.sourceforge.net
lavosspawn at users.sourceforge.net
Sun Mar 18 17:50:40 CET 2007
Revision: 26212
http://scummvm.svn.sourceforge.net/scummvm/?rev=26212&view=rev
Author: lavosspawn
Date: 2007-03-18 09:50:39 -0700 (Sun, 18 Mar 2007)
Log Message:
-----------
minor cleanup
Modified Paths:
--------------
scummvm/trunk/engines/sword1/logic.cpp
scummvm/trunk/engines/sword1/sound.cpp
Modified: scummvm/trunk/engines/sword1/logic.cpp
===================================================================
--- scummvm/trunk/engines/sword1/logic.cpp 2007-03-18 16:15:19 UTC (rev 26211)
+++ scummvm/trunk/engines/sword1/logic.cpp 2007-03-18 16:50:39 UTC (rev 26212)
@@ -1633,7 +1633,7 @@
SwordEngine::_systemVars.engineQuit = true;
} else
error("fnQuitGame() called");
- return SCRIPT_STOP;
+ return fnQuit(cpt, id, 0, 0, 0, 0, 0, 0);;
}
int Logic::fnDeathScreen(Object *cpt, int32 id, int32 a, int32 b, int32 c, int32 d, int32 z, int32 x) {
Modified: scummvm/trunk/engines/sword1/sound.cpp
===================================================================
--- scummvm/trunk/engines/sword1/sound.cpp 2007-03-18 16:15:19 UTC (rev 26211)
+++ scummvm/trunk/engines/sword1/sound.cpp 2007-03-18 16:50:39 UTC (rev 26212)
@@ -69,10 +69,6 @@
warning("Sound queue overflow");
return 0;
}
- if ((fxNo == 168) && (SwordEngine::_systemVars.isDemo)) {
- // this sound doesn't exist in demo
- return 0;
- }
_resMan->resOpen(_fxList[fxNo].sampleId);
_fxQueue[_endOfQueue].id = fxNo;
if (_fxList[fxNo].type == FX_SPOT)
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