diff options
Diffstat (limited to 'engines/titanic/core/game_object.h')
| -rw-r--r-- | engines/titanic/core/game_object.h | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index b50278cf21..ae35e2ba5b 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -165,8 +165,15 @@ protected: */ void enableMouse(); - void mouseLockE4(); - void mouseUnlockE4(); + /** + * Disables user control of the mouse + */ + void mouseDisableControl(); + + /** + * Re-enables user control of the mouse + */ + void mouseEnableControl(); /** * Sets the mouse to a new position @@ -445,7 +452,7 @@ protected: /** * Set's the player's passenger class */ - void setPassengerClass(int newClass); + void setPassengerClass(PassengerClass newClass); /** * Overrides whether the object's movie has audio timing @@ -705,12 +712,12 @@ public: /** * Return the player's passenger class */ - int getPassengerClass() const; + PassengerClass getPassengerClass() const; /** * Return the player's previous passenger class */ - int getPriorClass() const; + PassengerClass getPriorClass() const; /** * Sets the mail identifier for an object @@ -877,7 +884,7 @@ public: /** * Gives the player a new assigned room in the specified passenger class */ - void petReassignRoom(int passClassNum); + void petReassignRoom(PassengerClass passClassNum); /** * Sets a new area in the PET @@ -925,19 +932,20 @@ public: /*--- CTrueTalkManager Methods ---*/ /** - * Stop a conversation with the NPC + * Start a conversation with the NPC */ - void endTalking(CTrueTalkNPC *npc, bool viewFlag, CViewItem *view = nullptr); + void startTalking(CTrueTalkNPC *npc, uint id, CViewItem *view = nullptr); /** * Start a conversation with the NPC */ - void startTalking(CTrueTalkNPC *npc, uint id, CViewItem *view = nullptr); + void startTalking(const CString &name, uint id, CViewItem *view = nullptr); /** * Start a conversation with the NPC */ - void startTalking(const CString &name, uint id, CViewItem *view = nullptr); + void setTalking(CTrueTalkNPC *npc, bool viewFlag, CViewItem *view = nullptr); + /** * Sets a dial region for a given NPC |