diff options
author | Nicola Mettifogo | 2007-11-18 21:32:22 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2007-11-18 21:32:22 +0000 |
commit | 28289fb694b1766a672bfc77f01e0cc3e88723de (patch) | |
tree | 7c07184436e317917a1eef19316660f0d082ca0d /engines/parallaction/parallaction.h | |
parent | 7731af9833dbc01e5ae66bbce4b3e364e414b99a (diff) | |
download | scummvm-rg350-28289fb694b1766a672bfc77f01e0cc3e88723de.tar.gz scummvm-rg350-28289fb694b1766a672bfc77f01e0cc3e88723de.tar.bz2 scummvm-rg350-28289fb694b1766a672bfc77f01e0cc3e88723de.zip |
Cleanup.
svn-id: r29562
Diffstat (limited to 'engines/parallaction/parallaction.h')
-rw-r--r-- | engines/parallaction/parallaction.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index 60889422b6..70cbc22278 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -488,7 +488,7 @@ public: Common::RandomSource _rnd; - virtual void jobShowInventory(void*, Job*) = 0; + virtual void showInventory() = 0; virtual void jobHideInventory(void*, Job*) = 0; @@ -527,11 +527,7 @@ protected: // data BackgroundInfo *_backgroundInfo; - Job *_jDrawLabel; - Job *_jEraseLabel; Zone *_hoverZone; - - Job *_jDrawInventory; Job *_jRunScripts; @@ -583,15 +579,17 @@ public: virtual void parseLocation(const char* name) = 0; - virtual void jobDisplayAnimations(void*, Job *j) = 0; - virtual void jobEraseAnimations(void *arg_0, Job *j) = 0; virtual void jobRunScripts(void*, Job *j) = 0; virtual void jobDisplayDroppedItem(void*, Job *j) = 0; virtual void jobRemovePickedItem(void*, Job *j) = 0; virtual void jobToggleDoor(void*, Job *j) = 0; virtual void jobWalk(void*, Job *j) = 0; - virtual void jobDisplayLabel(void *parm, Job *j) = 0; - virtual void jobEraseLabel(void *parm, Job *j) = 0; + + + virtual void drawAnimations() = 0; + virtual void eraseAnimations() = 0; + virtual void drawLabel() = 0; + virtual void eraseLabel() = 0; void beep(); @@ -737,18 +735,20 @@ private: const Callable *_callables; protected: - void jobDisplayAnimations(void*, Job *j); - void jobEraseAnimations(void *arg_0, Job *j); void jobRunScripts(void*, Job *j); void jobDisplayDroppedItem(void*, Job *j); void jobRemovePickedItem(void*, Job *j); void jobToggleDoor(void*, Job *j); void jobWalk(void*, Job *j); - void jobDisplayLabel(void *parm, Job *j); - void jobEraseLabel(void *parm, Job *j); - void jobShowInventory(void *parm, Job *j); void jobHideInventory(void *parm, Job *j); + void drawAnimations(); + void eraseAnimations(); + void drawLabel(); + void eraseLabel(); + void showInventory(); + + // location parser OpcodeSet _locationParsers; OpcodeSet _locationZoneParsers; |