diff options
author | Johannes Schickel | 2009-02-15 20:19:06 +0000 |
---|---|---|
committer | Johannes Schickel | 2009-02-15 20:19:06 +0000 |
commit | da3516248cb1f71b8afe94ac769c87617a378842 (patch) | |
tree | 411d4129249f6ec0ae14620e64802a54826d0204 /engines/cine | |
parent | 78282ea586a4cfbf16b57782c4905d751911e210 (diff) | |
download | scummvm-rg350-da3516248cb1f71b8afe94ac769c87617a378842.tar.gz scummvm-rg350-da3516248cb1f71b8afe94ac769c87617a378842.tar.bz2 scummvm-rg350-da3516248cb1f71b8afe94ac769c87617a378842.zip |
Fixed compilation (along with it const correctness).
svn-id: r38287
Diffstat (limited to 'engines/cine')
-rw-r--r-- | engines/cine/script.h | 6 | ||||
-rw-r--r-- | engines/cine/script_fw.cpp | 4 | ||||
-rw-r--r-- | engines/cine/script_os.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/cine/script.h b/engines/cine/script.h index 0559720ecd..2d546b39a0 100644 --- a/engines/cine/script.h +++ b/engines/cine/script.h @@ -47,7 +47,7 @@ class FWScript; typedef int (FWScript::*opFunc)(); struct Opcode { - opFunc proc; + const opFunc proc; const char *args; }; @@ -148,7 +148,7 @@ private: FWScriptInfo *_info; ///< Script info protected: - static Opcode *_opcodeTable; + static const Opcode *_opcodeTable; static unsigned int _numOpcodes; int o1_modifyObjectParam(); @@ -300,7 +300,7 @@ public: */ class OSScript : public FWScript { private: - static Opcode *_opcodeTable; + static const Opcode *_opcodeTable; static unsigned int _numOpcodes; protected: diff --git a/engines/cine/script_fw.cpp b/engines/cine/script_fw.cpp index b4c4d72701..f7037db61c 100644 --- a/engines/cine/script_fw.cpp +++ b/engines/cine/script_fw.cpp @@ -49,7 +49,7 @@ ScriptVars globalVars(NUM_MAX_VAR + 1); uint16 compareVars(int16 a, int16 b); -Opcode *FWScript::_opcodeTable = 0; +const Opcode *FWScript::_opcodeTable = 0; unsigned int FWScript::_numOpcodes = 0; void FWScript::setupTable() { @@ -211,7 +211,7 @@ void FWScript::setupTable() { { &FWScript::o1_unloadMask5, "b" } }; - FWScript::_opcodeTable = (Opcode *)opcodeTable; + FWScript::_opcodeTable = (const Opcode *)opcodeTable; FWScript::_numOpcodes = ARRAYSIZE(opcodeTable); } diff --git a/engines/cine/script_os.cpp b/engines/cine/script_os.cpp index 28bb70c36c..8e7511f387 100644 --- a/engines/cine/script_os.cpp +++ b/engines/cine/script_os.cpp @@ -38,7 +38,7 @@ namespace Cine { -Opcode *OSScript::_opcodeTable = 0; +const Opcode *OSScript::_opcodeTable = 0; unsigned int OSScript::_numOpcodes = 0; void OSScript::setupTable() { @@ -257,7 +257,7 @@ void OSScript::setupTable() { { 0, 0 }, { &FWScript::o1_changeDataDisk, "b" } /* Same as opcodes 0x6B and 0x95. */ }; - OSScript::_opcodeTable = (Opcode *)opcodeTable; + OSScript::_opcodeTable = (const Opcode *)opcodeTable; OSScript::_numOpcodes = ARRAYSIZE(opcodeTable); } |