diff options
| author | Gregory Montoir | 2004-11-23 21:51:30 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2004-11-23 21:51:30 +0000 |
| commit | 9c317c95c3746ffcda8ae36b692a54ad49ad59dd (patch) | |
| tree | 5789f2fcee1ff6ead8f9b81ee884635ffed595aa /queen/logic.h | |
| parent | 7877ccf628d4033a4941762b867b819770a61fa6 (diff) | |
| download | scummvm-rg350-9c317c95c3746ffcda8ae36b692a54ad49ad59dd.tar.gz scummvm-rg350-9c317c95c3746ffcda8ae36b692a54ad49ad59dd.tar.bz2 scummvm-rg350-9c317c95c3746ffcda8ae36b692a54ad49ad59dd.zip | |
sync queen engine with latest OSystem changes
svn-id: r15871
Diffstat (limited to 'queen/logic.h')
| -rw-r--r-- | queen/logic.h | 8 |
1 files changed, 4 insertions, 4 deletions
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(); |