From 9c317c95c3746ffcda8ae36b692a54ad49ad59dd Mon Sep 17 00:00:00 2001 From: Gregory Montoir Date: Tue, 23 Nov 2004 21:51:30 +0000 Subject: sync queen engine with latest OSystem changes svn-id: r15871 --- queen/logic.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'queen/logic.h') diff --git a/queen/logic.h b/queen/logic.h index ea764aa293..590d1031ac 100644 --- a/queen/logic.h +++ b/queen/logic.h @@ -155,8 +155,8 @@ public: void inventorySetup(); uint16 findInventoryItem(int invSlot) const; void inventoryRefresh(); - int16 previousInventoryItem(int16 start) const; - int16 nextInventoryItem(int16 start) const; + int16 previousInventoryItem(int16 first) const; + int16 nextInventoryItem(int16 first) const; void removeDuplicateItems(); uint16 numItemsInventory() const; void inventoryInsertItem(uint16 itemNum, bool refresh = true); @@ -196,6 +196,8 @@ public: void startCredits(const char *filename); void stopCredits(); + void start(); + enum { JOE_RESPONSE_MAX = 40, DEFAULT_TALK_SPEED = 7 * 3, @@ -205,8 +207,6 @@ public: protected: - void initialise(); - void asmMakeJoeUseDress(); void asmMakeJoeUseNormalClothes(); void asmMakeJoeUseUnderwear(); -- cgit v1.2.3