From 3ba7a21c622f63bfbebe39279a4f40507e74f7f4 Mon Sep 17 00:00:00 2001
From: Arnaud Boutonné
Date: Wed, 19 Jan 2011 00:49:49 +0000
Subject: HUGO: Merge the 2 versions of doAction, cleanup

svn-id: r55318
---
 engines/hugo/schedule.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'engines/hugo/schedule.h')

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 {
-- 
cgit v1.2.3