diff options
author | Paul Gilbert | 2017-01-15 09:29:04 -0500 |
---|---|---|
committer | Paul Gilbert | 2017-01-15 09:29:04 -0500 |
commit | 9d6af45877da86a55d9398f8233213f4d48191fe (patch) | |
tree | 73eb5e474c095abc3b0710ff66e723b6d04b6a57 /engines/titanic/star_control | |
parent | 8a061ee82dea18a351a8905f8f4d2322d4bb8828 (diff) | |
download | scummvm-rg350-9d6af45877da86a55d9398f8233213f4d48191fe.tar.gz scummvm-rg350-9d6af45877da86a55d9398f8233213f4d48191fe.tar.bz2 scummvm-rg350-9d6af45877da86a55d9398f8233213f4d48191fe.zip |
TITANIC: Removal of un-used fields to reduce Buildbot warnings
Note there's a lot of preliminary code in the star_control/ folder
for code that still needs to be fully disassembled & implemented.
So for now I've made liberal use of #if 0 blocks to disable fields
that will likely be needed again in the future
Diffstat (limited to 'engines/titanic/star_control')
-rw-r--r-- | engines/titanic/star_control/star_control.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/star_control/star_control.h | 2 | ||||
-rw-r--r-- | engines/titanic/star_control/star_control_sub21.cpp | 5 | ||||
-rw-r--r-- | engines/titanic/star_control/star_control_sub21.h | 2 | ||||
-rw-r--r-- | engines/titanic/star_control/star_control_sub22.cpp | 5 | ||||
-rw-r--r-- | engines/titanic/star_control/star_control_sub22.h | 2 | ||||
-rw-r--r-- | engines/titanic/star_control/star_control_sub5.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/star_control/star_control_sub5.h | 4 | ||||
-rw-r--r-- | engines/titanic/star_control/star_control_sub8.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/star_control/star_control_sub8.h | 2 | ||||
-rw-r--r-- | engines/titanic/star_control/star_view.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/star_control/star_view.h | 4 |
12 files changed, 29 insertions, 9 deletions
diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp index 01318db774..dcb004231a 100644 --- a/engines/titanic/star_control/star_control.cpp +++ b/engines/titanic/star_control/star_control.cpp @@ -36,7 +36,7 @@ BEGIN_MESSAGE_MAP(CStarControl, CGameObject) ON_MESSAGE(FrameMsg) END_MESSAGE_MAP() -CStarControl::CStarControl() : _fieldBC(0), _field80B0(0), +CStarControl::CStarControl() : _fieldBC(0), _starRect(20, 10, 620, 350) { CStarControlSub6::init(); CStarControlSub12::init(); diff --git a/engines/titanic/star_control/star_control.h b/engines/titanic/star_control/star_control.h index c0561ce908..bf964b7cfa 100644 --- a/engines/titanic/star_control/star_control.h +++ b/engines/titanic/star_control/star_control.h @@ -40,7 +40,9 @@ private: CStarField _starField; CStarView _view; Rect _starRect; +#if 0 int _field80B0; +#endif private: /** * Called for ever new game frame diff --git a/engines/titanic/star_control/star_control_sub21.cpp b/engines/titanic/star_control/star_control_sub21.cpp index 1730244184..41d24d55c0 100644 --- a/engines/titanic/star_control/star_control_sub21.cpp +++ b/engines/titanic/star_control/star_control_sub21.cpp @@ -26,7 +26,10 @@ namespace Titanic { CStarControlSub21::CStarControlSub21(const CStar20Data *src) : - CStarControlSub20(src), _sub24() { + CStarControlSub20(src) { +#if 0 + _sub24() +#endif } } // End of namespace Titanic diff --git a/engines/titanic/star_control/star_control_sub21.h b/engines/titanic/star_control/star_control_sub21.h index 5febda0ebb..3f47a1a3e1 100644 --- a/engines/titanic/star_control/star_control_sub21.h +++ b/engines/titanic/star_control/star_control_sub21.h @@ -30,7 +30,9 @@ namespace Titanic { class CStarControlSub21 : public CStarControlSub20 { private: +#if 0 CStarControlSub24 _sub24; +#endif public: CStarControlSub21(const CStar20Data *src); }; diff --git a/engines/titanic/star_control/star_control_sub22.cpp b/engines/titanic/star_control/star_control_sub22.cpp index b06731b6d2..05a1cec87d 100644 --- a/engines/titanic/star_control/star_control_sub22.cpp +++ b/engines/titanic/star_control/star_control_sub22.cpp @@ -26,7 +26,10 @@ namespace Titanic { CStarControlSub22::CStarControlSub22(const CStar20Data *src) : - CStarControlSub20(src), _sub27() { + CStarControlSub20(src) { +#if 0 + _sub27() +#endif } } // End of namespace Titanic diff --git a/engines/titanic/star_control/star_control_sub22.h b/engines/titanic/star_control/star_control_sub22.h index 88a114f8c3..4d353aa074 100644 --- a/engines/titanic/star_control/star_control_sub22.h +++ b/engines/titanic/star_control/star_control_sub22.h @@ -30,7 +30,9 @@ namespace Titanic { class CStarControlSub22 : public CStarControlSub20 { private: +#if 0 CStarControlSub27 _sub27; +#endif public: CStarControlSub22(const CStar20Data *src); }; diff --git a/engines/titanic/star_control/star_control_sub5.cpp b/engines/titanic/star_control/star_control_sub5.cpp index e2899220c8..0503806e65 100644 --- a/engines/titanic/star_control/star_control_sub5.cpp +++ b/engines/titanic/star_control/star_control_sub5.cpp @@ -25,7 +25,7 @@ namespace Titanic { CStarControlSub5::CStarControlSub5() : - _field4(1), _field78AC(0), _field78B0(0) { + _field4(1) { } bool CStarControlSub5::setup() { diff --git a/engines/titanic/star_control/star_control_sub5.h b/engines/titanic/star_control/star_control_sub5.h index ce92ef1135..d90408e090 100644 --- a/engines/titanic/star_control/star_control_sub5.h +++ b/engines/titanic/star_control/star_control_sub5.h @@ -37,11 +37,13 @@ class CStarControlSub5 { }; private: int _field4; - SubEntry _array[5]; CStarControlSub6 _sub1, _sub2; +#if 0 + SubEntry _array[5]; int _field7914; int _field78AC; int _field78B0; +#endif public: CStarControlSub5(); virtual ~CStarControlSub5() {} diff --git a/engines/titanic/star_control/star_control_sub8.cpp b/engines/titanic/star_control/star_control_sub8.cpp index cdb249b663..78fdfa7f84 100644 --- a/engines/titanic/star_control/star_control_sub8.cpp +++ b/engines/titanic/star_control/star_control_sub8.cpp @@ -24,8 +24,10 @@ namespace Titanic { -CStarControlSub8::CStarControlSub8() : - _field0(0), _field4(0), _field8(-1), _fieldC(-1) { +CStarControlSub8::CStarControlSub8() : _field8(-1) { +#if 0 + _field0(0), _field4(0), _field8(-1), _fieldC(-1) +#endif } } // End of namespace Titanic diff --git a/engines/titanic/star_control/star_control_sub8.h b/engines/titanic/star_control/star_control_sub8.h index 6d8d1f0c7d..71aa8fb472 100644 --- a/engines/titanic/star_control/star_control_sub8.h +++ b/engines/titanic/star_control/star_control_sub8.h @@ -35,10 +35,12 @@ class CStarControlSub8 { int _fieldC; }; private: +#if 0 int _field0; int _field4; int _fieldC; StructEntry _array[3]; +#endif public: int _field8; public: diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp index 437c0f0e52..c82f89335d 100644 --- a/engines/titanic/star_control/star_view.cpp +++ b/engines/titanic/star_control/star_view.cpp @@ -30,7 +30,7 @@ namespace Titanic { CStarView::CStarView() : _sub12(nullptr, nullptr), _sub13((void *)nullptr), _owner(nullptr), _starField(nullptr), _videoSurface(nullptr), _field118(0), - _videoSurface2(nullptr), _field210(0), _homePhotoMask(nullptr), + _videoSurface2(nullptr), _homePhotoMask(nullptr), _field218(0), _field21C(0) { CStar20Data data = { 0, 0, 0x47C35000, 0, 0x41A00000, 0x3F800000, 0x3F800000, 0x3F800000 }; diff --git a/engines/titanic/star_control/star_view.h b/engines/titanic/star_control/star_view.h index bcba5ac436..7ebbcb218b 100644 --- a/engines/titanic/star_control/star_view.h +++ b/engines/titanic/star_control/star_view.h @@ -45,10 +45,12 @@ private: CStarControlSub13 _sub13; CSurfaceFader _fader; CVideoSurface *_videoSurface2; - int _field210; CGameObject *_homePhotoMask; int _field218; int _field21C; +#if 0 + int _field210; +#endif private: void fn1(); public: |