diff options
| author | Paul Gilbert | 2016-06-01 21:59:46 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-15 19:18:54 -0400 |
| commit | e2d3a0a32f62c6865397ca23984e15fbf6af5a3a (patch) | |
| tree | 922e2e46549e8d75a1b9e4652e58f1721e13155d /engines/titanic/pet_control | |
| parent | 4ab3b4d2097077ab16bc6c33fac7a332ee74e1a2 (diff) | |
| download | scummvm-rg350-e2d3a0a32f62c6865397ca23984e15fbf6af5a3a.tar.gz scummvm-rg350-e2d3a0a32f62c6865397ca23984e15fbf6af5a3a.tar.bz2 scummvm-rg350-e2d3a0a32f62c6865397ca23984e15fbf6af5a3a.zip | |
TITANIC: Adding setDial method
Diffstat (limited to 'engines/titanic/pet_control')
| -rw-r--r-- | engines/titanic/pet_control/pet_control.cpp | 5 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_control.h | 5 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_conversations.h | 10 |
3 files changed, 15 insertions, 5 deletions
diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp index 92ec3d6b03..85bac6a63e 100644 --- a/engines/titanic/pet_control/pet_control.cpp +++ b/engines/titanic/pet_control/pet_control.cpp @@ -524,4 +524,9 @@ int CPetControl::roomFn2(int val) { return _rooms.fn2(val); } +void CPetControl::resetDials(int flag) { + if (flag == 1) + _conversations.resetDials(_activeNPCName); +} + } // End of namespace Titanic diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h index 1eedc0382f..cf1589ca62 100644 --- a/engines/titanic/pet_control/pet_control.h +++ b/engines/titanic/pet_control/pet_control.h @@ -299,6 +299,11 @@ public: */ void addRoom(int roomNum); int roomFn2(int val); + + /** + * Resets the dial display to reflect new values + */ + void resetDials(int flag = 1); }; } // End of namespace Titanic diff --git a/engines/titanic/pet_control/pet_conversations.h b/engines/titanic/pet_control/pet_conversations.h index b88ddfacd5..cefdf1b8f1 100644 --- a/engines/titanic/pet_control/pet_conversations.h +++ b/engines/titanic/pet_control/pet_conversations.h @@ -148,11 +148,6 @@ private: * Called when the dial for an NPC is being changed */ void npcDialChange(uint dialNum, int oldLevel, int newLevel); - - /** - * Reset the dials with those for a given NPC - */ - void resetDials(const CString &name); public: CPetConversations(); virtual ~CPetConversations() {} @@ -241,6 +236,11 @@ public: * Hide the text cursor */ virtual void hideCursor(); + + /** + * Reset the dials with those for a given NPC + */ + void resetDials(const CString &name); }; } // End of namespace Titanic |