diff options
| author | Paul Gilbert | 2016-08-27 22:51:33 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-27 22:51:33 -0400 |
| commit | 8f29f067a41548da7625ebfec43e7ca8f22dfe4a (patch) | |
| tree | 3cfb83b0285a59738c27a0167ab32abe704efc59 /engines/titanic/npcs | |
| parent | 67be58f56204d6662a56f902b0a0f017c176b643 (diff) | |
| download | scummvm-rg350-8f29f067a41548da7625ebfec43e7ca8f22dfe4a.tar.gz scummvm-rg350-8f29f067a41548da7625ebfec43e7ca8f22dfe4a.tar.bz2 scummvm-rg350-8f29f067a41548da7625ebfec43e7ca8f22dfe4a.zip | |
TITANIC: Implemented more game classes
Diffstat (limited to 'engines/titanic/npcs')
| -rw-r--r-- | engines/titanic/npcs/mobile.h | 2 | ||||
| -rw-r--r-- | engines/titanic/npcs/true_talk_npc.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/npcs/mobile.h b/engines/titanic/npcs/mobile.h index 68e74a5afe..2ad939afa6 100644 --- a/engines/titanic/npcs/mobile.h +++ b/engines/titanic/npcs/mobile.h @@ -29,7 +29,7 @@ namespace Titanic { class CMobile : public CCharacter { DECLARE_MESSAGE_MAP; -private: +protected: Point _pos1; int _fieldDC; public: diff --git a/engines/titanic/npcs/true_talk_npc.h b/engines/titanic/npcs/true_talk_npc.h index 2eea9bdf3d..5254eaf9b7 100644 --- a/engines/titanic/npcs/true_talk_npc.h +++ b/engines/titanic/npcs/true_talk_npc.h @@ -65,11 +65,6 @@ protected: int _field104; protected: void processInput(CTextInputMsg *msg, CViewItem *view); - - /** - * Perform an action - */ - void performAction(bool startTalking, CViewItem *view = nullptr); public: int _field100; public: @@ -95,6 +90,11 @@ public: * Start the talker in the given view */ void startTalker(CViewItem *view); + + /** + * Perform an action + */ + void performAction(bool startTalking, CViewItem *view = nullptr); }; } // End of namespace Titanic |