diff options
| author | Lars Persson | 2010-10-13 07:14:38 +0000 |
|---|---|---|
| committer | Lars Persson | 2010-10-13 07:14:38 +0000 |
| commit | c0e2f1c6f8f7df66ae6c090f6c16aea14ebe8bf3 (patch) | |
| tree | 812422f7f16527311b658b7b196d55753372d6f6 /engines/toon/script.h | |
| parent | 6527c01cb501958bc04117da3d965b956e77704c (diff) | |
| download | scummvm-rg350-c0e2f1c6f8f7df66ae6c090f6c16aea14ebe8bf3.tar.gz scummvm-rg350-c0e2f1c6f8f7df66ae6c090f6c16aea14ebe8bf3.tar.bz2 scummvm-rg350-c0e2f1c6f8f7df66ae6c090f6c16aea14ebe8bf3.zip | |
TOON: Updated code to build properly for WINSCW and GCCE(symbian)
Added templates to MAX & MIN functions. Correct usage of OpcodeV2(instead of Opcode)
Match implementation with function definition. (int32 is not == int on all platforms)
svn-id: r53401
Diffstat (limited to 'engines/toon/script.h')
| -rw-r--r-- | engines/toon/script.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/toon/script.h b/engines/toon/script.h index 47e04e8c82..d7f45096c2 100644 --- a/engines/toon/script.h +++ b/engines/toon/script.h @@ -36,7 +36,8 @@ namespace Toon { struct EMCState; -typedef Common::Functor1<EMCState *, int> Opcode; +class ScriptFunc; +typedef Common::Functor1Mem<EMCState *, int32, ScriptFunc> OpcodeV2; struct EMCData { char filename[13]; @@ -46,7 +47,7 @@ struct EMCData { uint16 *ordr; uint16 dataSize; - const Common::Array<const Opcode *> *sysFuncs; + const Common::Array<const OpcodeV2 *> *sysFuncs; }; struct EMCState { @@ -98,7 +99,7 @@ class EMCInterpreter { public: EMCInterpreter(ToonEngine *vm); - bool load(const char *filename, EMCData *data, const Common::Array<const Opcode *> *opcodes); + bool load(const char *filename, EMCData *data, const Common::Array<const OpcodeV2 *> *opcodes); void unload(EMCData *data); void init(EMCState *scriptState, const EMCData *data); |