[Scummvm-cvs-logs] SF.net SVN: scummvm: [21306] scummvm/trunk/engines/scumm/script.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Tue Mar 14 22:00:06 CET 2006


Revision: 21306
Author:   kirben
Date:     2006-03-14 21:59:30 -0800 (Tue, 14 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21306&view=rev

Log Message:
-----------
Minor cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script.cpp
Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp	2006-03-15 05:06:36 UTC (rev 21305)
+++ scummvm/trunk/engines/scumm/script.cpp	2006-03-15 05:59:30 UTC (rev 21306)
@@ -923,7 +923,7 @@
 }
 
 void ScummEngine::runExitScript() {
-	if (_game.version > 2 && VAR(VAR_EXIT_SCRIPT))
+	if (VAR_EXIT_SCRIPT != 0xFF && VAR(VAR_EXIT_SCRIPT))
 		runScript(VAR(VAR_EXIT_SCRIPT), 0, 0, 0);
 	if (_EXCD_offs) {
 		int slot = getScriptSlot();
@@ -952,12 +952,12 @@
 		initializeLocals(slot, 0);
 		runScriptNested(slot);
 	}
-	if (_game.version > 2 && VAR(VAR_EXIT_SCRIPT2))
+	if (VAR_EXIT_SCRIPT2 != 0xFF && VAR(VAR_EXIT_SCRIPT2))
 		runScript(VAR(VAR_EXIT_SCRIPT2), 0, 0, 0);
 }
 
 void ScummEngine::runEntryScript() {
-	if (_game.version > 2 && VAR(VAR_ENTRY_SCRIPT))
+	if (VAR_ENTRY_SCRIPT != 0xFF && VAR(VAR_ENTRY_SCRIPT))
 		runScript(VAR(VAR_ENTRY_SCRIPT), 0, 0, 0);
 	if (_ENCD_offs) {
 		int slot = getScriptSlot();
@@ -973,7 +973,7 @@
 		initializeLocals(slot, 0);
 		runScriptNested(slot);
 	}
-	if (_game.version > 2 && VAR(VAR_ENTRY_SCRIPT2))
+	if (VAR_ENTRY_SCRIPT2 != 0xFF && VAR(VAR_ENTRY_SCRIPT2))
 		runScript(VAR(VAR_ENTRY_SCRIPT2), 0, 0, 0);
 }
 


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