diff options
| author | Max Horn | 2003-05-05 09:19:15 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-05 09:19:15 +0000 |
| commit | fa0df19a1df16489b7319bfd27711409c15fa699 (patch) | |
| tree | 9b36f360ff75688c952163a558f4e53994bb8620 /scumm/intern.h | |
| parent | 93c7422879480c83aeb2fd01a313563975c90594 (diff) | |
| download | scummvm-rg350-fa0df19a1df16489b7319bfd27711409c15fa699.tar.gz scummvm-rg350-fa0df19a1df16489b7319bfd27711409c15fa699.tar.bz2 scummvm-rg350-fa0df19a1df16489b7319bfd27711409c15fa699.zip | |
cleanup / reduced code duplication
svn-id: r7339
Diffstat (limited to 'scumm/intern.h')
| -rw-r--r-- | scumm/intern.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index c120d1ee2b..59145b7472 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -47,6 +47,10 @@ protected: virtual void decodeParseString(); int getWordVararg(int *ptr); + virtual int getVar(); + virtual int getVarOrDirectByte(byte mask); + virtual int getVarOrDirectWord(byte mask); + /* Version 5 script opcodes */ void o5_actorFollowCamera(); void o5_actorFromPos(); @@ -196,6 +200,8 @@ protected: virtual void decodeParseString(); + virtual int getVar(); + void getResultPosIndirect(); virtual void getResultPos(); virtual int readVar(uint var); @@ -243,13 +249,6 @@ protected: void o2_walkActorTo(); void o2_putActor(); void o2_isEqual(); - void o2_isGreater(); - void o2_isGreaterEqual(); - void o2_lessOrEqual(); - void o2_isLess(); - void o2_isNotEqual(); - void o2_equalZero(); - void o2_notEqualZero(); void o2_startScript(); void o2_panCameraTo(); void o2_setActorElevation(); @@ -262,7 +261,6 @@ protected: void o2_getActorY(); void o2_loadRoomWithEgo(); void o2_setOwnerOf(); - void o2_delayVariable(); void o2_matrixOps(); void o2_setCameraAt(); void o2_roomOps(); |