diff options
| author | Filippos Karapetis | 2010-06-15 07:21:52 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-06-15 07:21:52 +0000 |
| commit | 60d8cc5180c4033978e1bb38e6cc26dab8a126b2 (patch) | |
| tree | ce3d52a876dab7ca25c03d196eb3faec0e00ceaa | |
| parent | e93f8902a89cb969fd344e49e7086213c8609dbf (diff) | |
| download | scummvm-rg350-60d8cc5180c4033978e1bb38e6cc26dab8a126b2.tar.gz scummvm-rg350-60d8cc5180c4033978e1bb38e6cc26dab8a126b2.tar.bz2 scummvm-rg350-60d8cc5180c4033978e1bb38e6cc26dab8a126b2.zip | |
Removed the now unused EngineState parameter of script_adjust_opcode_formats(), as well as an obsolete TODO
svn-id: r49684
| -rw-r--r-- | engines/sci/engine/script.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/engine/script.h | 2 | ||||
| -rw-r--r-- | engines/sci/sci.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index cb112a90f9..19e0b6f81a 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -95,8 +95,7 @@ opcode_format g_opcode_formats[128][4] = { // 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; diff --git a/engines/sci/engine/script.h b/engines/sci/engine/script.h index e94e9f64e6..fe92dabe58 100644 --- a/engines/sci/engine/script.h +++ b/engines/sci/engine/script.h @@ -202,7 +202,7 @@ enum sci_opcodes { extern opcode_format g_opcode_formats[128][4]; -void script_adjust_opcode_formats(EngineState *s); +void script_adjust_opcode_formats(); } // End of namespace Sci diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index ee2f5845a2..e8847f380b 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -229,7 +229,7 @@ Common::Error SciEngine::run() { _kernel->loadKernelNames(_features); // Must be called after game_init() - script_adjust_opcode_formats(_gamestate); + script_adjust_opcode_formats(); SciVersion soundVersion = _features->detectDoSoundType(); |