diff options
| author | Paul Gilbert | 2016-05-28 18:13:09 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-15 19:16:29 -0400 |
| commit | fa04a6fdf0271f74c45da180b3c6f1ac16bd3a98 (patch) | |
| tree | 66d36f3a6034eaef50195701dc7cf85d7bd1fa16 /engines/titanic/support | |
| parent | 15843eb4c23c3d8ac88edd9b482fae09d4414582 (diff) | |
| download | scummvm-rg350-fa04a6fdf0271f74c45da180b3c6f1ac16bd3a98.tar.gz scummvm-rg350-fa04a6fdf0271f74c45da180b3c6f1ac16bd3a98.tar.bz2 scummvm-rg350-fa04a6fdf0271f74c45da180b3c6f1ac16bd3a98.zip | |
TITANIC: Added CTrueTalkManager playSpeech
Diffstat (limited to 'engines/titanic/support')
| -rw-r--r-- | engines/titanic/support/proximity.cpp | 5 | ||||
| -rw-r--r-- | engines/titanic/support/proximity.h | 15 |
2 files changed, 14 insertions, 6 deletions
diff --git a/engines/titanic/support/proximity.cpp b/engines/titanic/support/proximity.cpp index f7c90f7caf..4a832b9217 100644 --- a/engines/titanic/support/proximity.cpp +++ b/engines/titanic/support/proximity.cpp @@ -21,16 +21,17 @@ */ #include "titanic/support/proximity.h" +#include "titanic/true_talk/tt_talker.h" namespace Titanic { CProximity::CProximity() : _field4(0), _field8(100), _fieldC(0), - _field10(-1), _field14(0), _field18(0), _field1C(0x3FF00000), + _speechHandle(-1), _field14(0), _field18(0), _field1C(0x3FF00000), _field20(0), _field24(10), _field28(0), _field2C(0), _field30(0x3F000000), _field34(0), _double1(0.0), _double2(0.0), _double3(0.0), _field44(0), _field48(0), _field4C(0), _field50(0), _field54(0), _field58(0), _field5C(0), - _field60(0), _field64(0), _field68(0) { + _field60(0), _method1(nullptr), _talker(nullptr), _field6C(0) { } } // End of namespace Titanic diff --git a/engines/titanic/support/proximity.h b/engines/titanic/support/proximity.h index 69979eaeaf..935e2e6b1c 100644 --- a/engines/titanic/support/proximity.h +++ b/engines/titanic/support/proximity.h @@ -23,21 +23,27 @@ #ifndef TITANIC_PROXIMITY_H #define TITANIC_PROXIMITY_H +#include "common/scummsys.h" + namespace Titanic { +typedef bool (*CProximityFn)(int val); + +class TTtalker; + class CProximity { public: int _field4; int _field8; int _fieldC; - int _field10; + int _speechHandle; int _field14; int _field18; int _field1C; int _field20; int _field24; int _field28; - int _field2C; + uint32 _field2C; int _field30; int _field34; double _double1; @@ -51,8 +57,9 @@ public: int _field58; int _field5C; int _field60; - int _field64; - int _field68; + CProximityFn _method1; + TTtalker *_talker; + int _field6C; public: CProximity(); }; |