diff options
| author | Paul Gilbert | 2016-06-30 13:40:55 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-15 19:26:05 -0400 |
| commit | d436ce5dae8ab9d4c7dbe4c6d069f7202309f297 (patch) | |
| tree | ac8244c1d5b96ff2abe36bf5bd27cb0437c66b92 /engines | |
| parent | 8ea5d533294193a4d220316152cec59580bbf10c (diff) | |
| download | scummvm-rg350-d436ce5dae8ab9d4c7dbe4c6d069f7202309f297.tar.gz scummvm-rg350-d436ce5dae8ab9d4c7dbe4c6d069f7202309f297.tar.bz2 scummvm-rg350-d436ce5dae8ab9d4c7dbe4c6d069f7202309f297.zip | |
TITANIC: Beginning of work on star control hierarchy
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/titanic/star_control/star_control_sub12.h | 1 | ||||
| -rw-r--r-- | engines/titanic/star_control/star_control_sub6.cpp | 21 | ||||
| -rw-r--r-- | engines/titanic/star_control/star_control_sub6.h | 2 |
3 files changed, 19 insertions, 5 deletions
diff --git a/engines/titanic/star_control/star_control_sub12.h b/engines/titanic/star_control/star_control_sub12.h index 3637e13bd1..bce668f863 100644 --- a/engines/titanic/star_control/star_control_sub12.h +++ b/engines/titanic/star_control/star_control_sub12.h @@ -41,7 +41,6 @@ private: int _field2C; CStarControlSub13 _sub13; int _field108; - int _field21C; public: CStarControlSub12(void *val1, void *val2); virtual ~CStarControlSub12() {} diff --git a/engines/titanic/star_control/star_control_sub6.cpp b/engines/titanic/star_control/star_control_sub6.cpp index 48285a7dbe..79937b7cab 100644 --- a/engines/titanic/star_control/star_control_sub6.cpp +++ b/engines/titanic/star_control/star_control_sub6.cpp @@ -24,10 +24,23 @@ namespace Titanic { -CStarControlSub6::CStarControlSub6() : - _field0(0x3F800000), _field4(0), _field8(0), _fieldC(0), - _field10(0x3F800000), _field14(0), _field18(0), _field1C(0), - _field20(0x3F800000), _field24(0), _field28(0), _field2C(0) { +CStarControlSub6::CStarControlSub6() { + clear(); +} + +void CStarControlSub6::clear() { + _field0 = 0x3F800000; + _field4 = 0; + _field8 = 0; + _fieldC = 0), + _field10 = 0x3F800000; + _field14 = 0; + _field18 = 0; + _field1C = 0), + _field20 = 0x3F800000; + _field24 = 0; + _field28 = 0; + _field2C = 0; } } // End of namespace Titanic diff --git a/engines/titanic/star_control/star_control_sub6.h b/engines/titanic/star_control/star_control_sub6.h index d57b35cf7c..3531c76d1b 100644 --- a/engines/titanic/star_control/star_control_sub6.h +++ b/engines/titanic/star_control/star_control_sub6.h @@ -41,6 +41,8 @@ private: int _field2C; public: CStarControlSub6(); + + void clear(); }; } // End of namespace Titanic |