diff options
author | Arnaud Boutonné | 2011-01-19 00:49:49 +0000 |
---|---|---|
committer | Arnaud Boutonné | 2011-01-19 00:49:49 +0000 |
commit | 3ba7a21c622f63bfbebe39279a4f40507e74f7f4 (patch) | |
tree | 87e882b6d4d78a4ac7500ac412053fde3c8f80c5 /engines/hugo/schedule.h | |
parent | 22c3e7b1de17403e246e2a0f8a1e238de0cc9310 (diff) | |
download | scummvm-rg350-3ba7a21c622f63bfbebe39279a4f40507e74f7f4.tar.gz scummvm-rg350-3ba7a21c622f63bfbebe39279a4f40507e74f7f4.tar.bz2 scummvm-rg350-3ba7a21c622f63bfbebe39279a4f40507e74f7f4.zip |
HUGO: Merge the 2 versions of doAction, cleanup
svn-id: r55318
Diffstat (limited to 'engines/hugo/schedule.h')
-rw-r--r-- | engines/hugo/schedule.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/engines/hugo/schedule.h b/engines/hugo/schedule.h index 436b6e7792..6337a8bb06 100644 --- a/engines/hugo/schedule.h +++ b/engines/hugo/schedule.h @@ -85,9 +85,11 @@ protected: act **_actListArr; virtual const char *getCypher() = 0; - virtual event_t *doAction(event_t *curEvent) = 0; + virtual void delEventType(action_t actTypeDel) = 0; virtual void delQueue(event_t *curEvent) = 0; + virtual void promptAction(act *action) = 0; + event_t *doAction(event_t *curEvent); event_t *getQueue(); uint32 getDosTicks(bool updateFl); @@ -106,8 +108,9 @@ public: virtual void runScheduler(); protected: + virtual void delEventType(action_t actTypeDel); virtual void delQueue(event_t *curEvent); - virtual event_t *doAction(event_t *curEvent); + virtual void promptAction(act *action); }; class Scheduler_v2d : public Scheduler_v1d { @@ -116,9 +119,11 @@ public: virtual ~Scheduler_v2d(); virtual const char *getCypher(); + protected: + void delEventType(action_t actTypeDel); void delQueue(event_t *curEvent); - event_t *doAction(event_t *curEvent); + void promptAction(act *action); }; class Scheduler_v3d : public Scheduler_v2d { |