diff options
author | Paul Gilbert | 2016-04-29 19:29:28 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-10 16:37:24 -0400 |
commit | 6ec129d188a2b5b86dba6540b38a959bbf8b2491 (patch) | |
tree | 312a0ffb0e0c91afeec2465c62789bfb9a1c09a9 /engines/titanic/pet_control/pet_control.h | |
parent | 5d087a8fcd709550ec14fc6b01acf045f8d6614b (diff) | |
download | scummvm-rg350-6ec129d188a2b5b86dba6540b38a959bbf8b2491.tar.gz scummvm-rg350-6ec129d188a2b5b86dba6540b38a959bbf8b2491.tar.bz2 scummvm-rg350-6ec129d188a2b5b86dba6540b38a959bbf8b2491.zip |
TITANIC: Added PET Conversations enter, PET Timers, and Text Cursor show
Diffstat (limited to 'engines/titanic/pet_control/pet_control.h')
-rw-r--r-- | engines/titanic/pet_control/pet_control.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h index 7e720b7b10..5fbd8a0107 100644 --- a/engines/titanic/pet_control/pet_control.h +++ b/engines/titanic/pet_control/pet_control.h @@ -43,6 +43,11 @@ enum SummonResult { SUMMON_CANT = 0, SUMMON_PRESENT = 1, SUMMON_CAN = 2 }; class CPetControl : public CGameObject { DECLARE_MESSAGE_MAP + struct PetEventInfo { + int _id; + void *_target; + PetEventInfo() : _id(0), _target(nullptr) {} + }; private: int _fieldC0; int _locked; @@ -61,7 +66,7 @@ private: CString _string2; CRoomItem *_hiddenRoom; Rect _drawBounds; - void *_timers[2]; + PetEventInfo _timers[2]; private: /** * Returns true if the control is in a valid state @@ -94,6 +99,8 @@ private: * Checks whether a designated NPC in present in the current view */ bool isNPCInView(const CString &name) const; + + void setTimer44(int id, int val); protected: bool MouseButtonDownMsg(CMouseButtonDownMsg *msg); bool MouseDragStartMsg(CMouseDragStartMsg *msg); @@ -267,6 +274,16 @@ public: * Summon an NPC to the player */ void summonNPC(const CString &name, int val); + + /** + * Start a timer + */ + void startPetTimer(uint timerIndex, uint firstDuration, uint duration, void *target); + + /** + * Stop a timer + */ + void stopPetTimer(uint timerIndex); }; } // End of namespace Titanic |