diff options
| author | Max Horn | 2002-12-25 14:46:39 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-25 14:46:39 +0000 |
| commit | 004ea9f8eb7aa3cd79540c72b75986a9fa182cf6 (patch) | |
| tree | 136ede26c4d6b73c99b3b102b18d548b1aae9ab3 /scumm/scumm.h | |
| parent | a01b169434b87aacb67fd1939545f3b3120ae235 (diff) | |
| download | scummvm-rg350-004ea9f8eb7aa3cd79540c72b75986a9fa182cf6.tar.gz scummvm-rg350-004ea9f8eb7aa3cd79540c72b75986a9fa182cf6.tar.bz2 scummvm-rg350-004ea9f8eb7aa3cd79540c72b75986a9fa182cf6.zip | |
converted heaps of int16 to int for V8 compatibility; fixed defineArray for V8; added some work in o8_kludge2
svn-id: r6132
Diffstat (limited to 'scumm/scumm.h')
| -rw-r--r-- | scumm/scumm.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index 47113673c6..502fc26667 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -400,7 +400,8 @@ public: uint16 _mouseButStat; byte _leftBtnPressed, _rightBtnPressed; - int16 _virtual_mouse_x, _virtual_mouse_y, _bootParam; + int16 _virtual_mouse_x, _virtual_mouse_y; + int _bootParam; uint16 _debugMode, _soundCardType; /* Not sure where this stuff goes */ @@ -464,15 +465,15 @@ public: uint16 _curExecScript; byte **_lastCodePtr; int _resultVarNumber, _scummStackPos; - int16 _localParamList[16], _scummStack[150]; + int _localParamList[16], _scummStack[150]; virtual void setupOpcodes() = 0; virtual void executeOpcode(int i) = 0; virtual const char *getOpcodeDesc(int i) = 0; - void initializeLocals(int slot, int16 *vars); + void initializeLocals(int slot, int *vars); int getScriptSlot(); - void runScript(int script, int a, int b, int16 *lvarptr); + void runScript(int script, int a, int b, int *lvarptr); void stopScriptNr(int script); void runScriptNested(int script); void executeScript(); @@ -497,7 +498,7 @@ public: void freezeScripts(int scr); void unfreezeScripts(); void runAllScripts(); - void cutscene(int16 *args); + void cutscene(int *args); void endCutscene(); void exitCutscene(); void runExitScript(); @@ -648,7 +649,7 @@ public: int getVerbEntrypoint(int obj, int entry); int getVerbSlot(int id, int mode); void killVerb(int slot); - void runVerbCode(int script, int entry, int a, int b, int16 *vars); + void runVerbCode(int script, int entry, int a, int b, int *vars); void setVerbObject(uint room, uint object, uint verb); /* Should be in Actor class */ |