mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-30 23:43:10 +00:00
Fixed compilation (along with it const correctness).
svn-id: r38287
This commit is contained in:
parent
78282ea586
commit
da3516248c
@ -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:
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user