diff options
author | Paul Gilbert | 2016-07-23 19:15:26 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-23 19:15:26 -0400 |
commit | 2efee2ae8c1c4e285fe81bce66a594d9b949548a (patch) | |
tree | d781d99d1027eaadea2de4190f6118220d8eb81f /engines/titanic/pet_control | |
parent | d690ca322c04ee2044b7502369c5cc104a0c7b76 (diff) | |
download | scummvm-rg350-2efee2ae8c1c4e285fe81bce66a594d9b949548a.tar.gz scummvm-rg350-2efee2ae8c1c4e285fe81bce66a594d9b949548a.tar.bz2 scummvm-rg350-2efee2ae8c1c4e285fe81bce66a594d9b949548a.zip |
TITANIC: Further timers cleanup
Diffstat (limited to 'engines/titanic/pet_control')
-rw-r--r-- | engines/titanic/pet_control/pet_control.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_control.h | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp index 0695cdea79..83081456d1 100644 --- a/engines/titanic/pet_control/pet_control.cpp +++ b/engines/titanic/pet_control/pet_control.cpp @@ -621,7 +621,7 @@ void CPetControl::startPetTimer(uint timerIndex, uint firstDuration, uint durati stopPetTimer(timerIndex); _timers[timerIndex]._id = addTimer(timerIndex, firstDuration, duration); _timers[timerIndex]._target = target; - setTimer44(_timers[timerIndex]._id, 0); + setTimerPersisent(_timers[timerIndex]._id, false); } void CPetControl::stopPetTimer(uint timerIndex) { @@ -631,8 +631,8 @@ void CPetControl::stopPetTimer(uint timerIndex) { } } -void CPetControl::setTimer44(int id, int val) { - getGameManager()->setTimer44(id, val); +void CPetControl::setTimerPersisent(int id, bool flag) { + getGameManager()->setTimerPersisent(id, flag); } CGameObject *CPetControl::findBot(const CString &name, CTreeItem *root) { diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h index e56d8f8f90..39df91cf91 100644 --- a/engines/titanic/pet_control/pet_control.h +++ b/engines/titanic/pet_control/pet_control.h @@ -103,7 +103,10 @@ private: */ CGameObject *findBot(const CString &name, CTreeItem *root); - void setTimer44(int id, int val); + /** + * Flags whether the timer will be persisent across save & loads + */ + void setTimerPersisent(int id, bool flag); protected: bool MouseButtonDownMsg(CMouseButtonDownMsg *msg); bool MouseDragStartMsg(CMouseDragStartMsg *msg); |