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

[Kirben at users.sourceforge.net]

Revision: 42499
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42499&view=rev
Author:   Kirben
Date:     2009-07-15 05:00:59 +0000 (Wed, 15 Jul 2009)

Log Message:
-----------
Hack is no longer required, due to revision 42498.

Revision Links:
--------------
    http://scummvm.svn.sourceforge.net/scummvm/?rev=42498&view=rev

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script.cpp

Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp	2009-07-15 02:06:26 UTC (rev 42498)
+++ scummvm/trunk/engines/scumm/script.cpp	2009-07-15 05:00:59 UTC (rev 42499)
@@ -1367,17 +1367,6 @@
 
 		VAR(VAR_OVERRIDE) = 1;
 		vm.cutScenePtr[idx] = 0;
-
-		// HACK to fix issues with SMUSH and the way it does keyboard handling.
-		// In particular, normally abortCutscene() is being called while no
-		// scripts are active. But SMUSH runs from *inside* the script engine.
-		// And it calls abortCutscene() if ESC is pressed... not good.
-		// Proper fix might be to let SMUSH/INSANE run from outside the script
-		// engine but that would require lots of changes and may actually have
-		// negative effects, too. So we cheat here, to fix bug #751670.
-		if (_game.version == 7)
-			getScriptEntryPoint();
-
 	}
 }
 


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