diff options
| author | Max Horn | 2004-01-19 19:47:47 +0000 |
|---|---|---|
| committer | Max Horn | 2004-01-19 19:47:47 +0000 |
| commit | e8164dfb705ef94dcc237bbd2a6bafd8d772d617 (patch) | |
| tree | e593da27169d148988655d2a4f39b36f03c00232 /scumm/intern.h | |
| parent | d094989ae24bfba1cbff2f7a230d3b68e51c68bb (diff) | |
| download | scummvm-rg350-e8164dfb705ef94dcc237bbd2a6bafd8d772d617.tar.gz scummvm-rg350-e8164dfb705ef94dcc237bbd2a6bafd8d772d617.tar.bz2 scummvm-rg350-e8164dfb705ef94dcc237bbd2a6bafd8d772d617.zip | |
moved some V6-only scumm vars to ScummEngine_v6
svn-id: r12517
Diffstat (limited to 'scumm/intern.h')
| -rw-r--r-- | scumm/intern.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index 29a5d86065..efd5aaf06e 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -49,8 +49,8 @@ protected: virtual const char *getOpcodeDesc(byte i); virtual void setupScummVars(); - virtual void decodeParseString(); + int getWordVararg(int *ptr); void saveVars(); void loadVars(); @@ -208,7 +208,6 @@ protected: virtual const char *getOpcodeDesc(byte i); virtual void setupScummVars(); - virtual void decodeParseString(); virtual int getVar(); @@ -331,6 +330,8 @@ protected: public: ScummEngine_v6(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs) : ScummEngine(detector, syst, gs) { VAR_VIDEONAME = 0xFF; + VAR_RANDOM_NR = 0xFF; + VAR_STRING2DRAW = 0xFF; VAR_TIMEDATE_YEAR = 0xFF; VAR_TIMEDATE_MONTH = 0xFF; @@ -346,11 +347,10 @@ protected: virtual const char *getOpcodeDesc(byte i); virtual void setupScummVars(); + virtual void decodeParseString(int a, int b); virtual void palManipulateInit(int resID, int start, int end, int time); - virtual void decodeParseString(int a, int b); - int getStackList(int *args, uint maxnum); int popRoomAndObj(int *room); void shuffleArray(int num, int minIdx, int maxIdx); @@ -531,6 +531,8 @@ protected: void o6_readINI(); byte VAR_VIDEONAME; + byte VAR_RANDOM_NR; + byte VAR_STRING2DRAW; byte VAR_TIMEDATE_YEAR; byte VAR_TIMEDATE_MONTH; @@ -572,7 +574,6 @@ protected: virtual const char *getOpcodeDesc(byte i); virtual void setupScummVars(); - virtual void decodeParseString(int m, int n); virtual uint fetchScriptWord(); |