[Scummvm-cvs-logs] SF.net SVN: scummvm:[49684] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 49684
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49684&view=rev
Author:   thebluegr
Date:     2010-06-15 07:21:52 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
Removed the now unused EngineState parameter of script_adjust_opcode_formats(), as well as an obsolete TODO

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/script.cpp
    scummvm/trunk/engines/sci/engine/script.h
    scummvm/trunk/engines/sci/sci.cpp

Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp	2010-06-15 07:20:53 UTC (rev 49683)
+++ scummvm/trunk/engines/sci/engine/script.cpp	2010-06-15 07:21:52 UTC (rev 49684)
@@ -95,8 +95,7 @@
 
 // TODO: script_adjust_opcode_formats should probably be part of the
 // constructor (?) of a VirtualMachine or a ScriptManager class.
-void script_adjust_opcode_formats(EngineState *s) {
-	// TODO: Check that this is correct
+void script_adjust_opcode_formats() {
 	if (g_sci->_features->detectLofsType() != SCI_VERSION_0_EARLY) {
 		g_opcode_formats[op_lofsa][0] = Script_Offset;
 		g_opcode_formats[op_lofss][0] = Script_Offset;

Modified: scummvm/trunk/engines/sci/engine/script.h
===================================================================
--- scummvm/trunk/engines/sci/engine/script.h	2010-06-15 07:20:53 UTC (rev 49683)
+++ scummvm/trunk/engines/sci/engine/script.h	2010-06-15 07:21:52 UTC (rev 49684)
@@ -202,7 +202,7 @@
 
 extern opcode_format g_opcode_formats[128][4];
 
-void script_adjust_opcode_formats(EngineState *s);
+void script_adjust_opcode_formats();
 
 } // End of namespace Sci
 

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-06-15 07:20:53 UTC (rev 49683)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-06-15 07:21:52 UTC (rev 49684)
@@ -229,7 +229,7 @@
 		
 	_kernel->loadKernelNames(_features);	// Must be called after game_init()
 
-	script_adjust_opcode_formats(_gamestate);
+	script_adjust_opcode_formats();
 
 	SciVersion soundVersion = _features->detectDoSoundType();
 


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