aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic
diff options
context:
space:
mode:
authorPaul Gilbert2017-03-26 21:40:55 -0400
committerPaul Gilbert2017-03-26 21:40:55 -0400
commita925264fb03a8ccbde9390fd9a18be23232851dd (patch)
treead1a233b3083954a0ff2efb06d3497b688e17e4d /engines/titanic
parent765ec887a0068676294de75644a815727fa58082 (diff)
downloadscummvm-rg350-a925264fb03a8ccbde9390fd9a18be23232851dd.tar.gz
scummvm-rg350-a925264fb03a8ccbde9390fd9a18be23232851dd.tar.bz2
scummvm-rg350-a925264fb03a8ccbde9390fd9a18be23232851dd.zip
TITANIC: Remove redundant static from CStarControlSub6
It was only ever used as a temporary matrix in the constructor. Given that, it was cleaner to simply declare it as a local variable.
Diffstat (limited to 'engines/titanic')
-rw-r--r--engines/titanic/star_control/star_control.cpp2
-rw-r--r--engines/titanic/star_control/star_control_sub6.cpp11
-rw-r--r--engines/titanic/star_control/star_control_sub6.h5
3 files changed, 0 insertions, 18 deletions
diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp
index 6e27223f72..dbe8b01aa0 100644
--- a/engines/titanic/star_control/star_control.cpp
+++ b/engines/titanic/star_control/star_control.cpp
@@ -43,13 +43,11 @@ END_MESSAGE_MAP()
CStarControl::CStarControl() : _enabled(false),
_starRect(20, 10, 620, 350) {
- CStarControlSub6::init();
CStarControlSub12::init();
DMatrix::init();
}
CStarControl::~CStarControl() {
- CStarControlSub6::deinit();
CStarControlSub12::deinit();
DMatrix::deinit();
}
diff --git a/engines/titanic/star_control/star_control_sub6.cpp b/engines/titanic/star_control/star_control_sub6.cpp
index 0ced3df9fe..9d22f4610d 100644
--- a/engines/titanic/star_control/star_control_sub6.cpp
+++ b/engines/titanic/star_control/star_control_sub6.cpp
@@ -24,8 +24,6 @@
namespace Titanic {
-CStarControlSub6 *CStarControlSub6::_static;
-
CStarControlSub6::CStarControlSub6() {
clear();
}
@@ -80,15 +78,6 @@ CStarControlSub6::CStarControlSub6(const CStarControlSub6 *s1, const CStarContro
+ s2->_vector._z;
}
-void CStarControlSub6::init() {
- _static = nullptr;
-}
-
-void CStarControlSub6::deinit() {
- delete _static;
- _static = nullptr;
-}
-
void CStarControlSub6::identity() {
FMatrix::identity();
_vector.clear();
diff --git a/engines/titanic/star_control/star_control_sub6.h b/engines/titanic/star_control/star_control_sub6.h
index 91def29973..f0f14b6ccc 100644
--- a/engines/titanic/star_control/star_control_sub6.h
+++ b/engines/titanic/star_control/star_control_sub6.h
@@ -28,11 +28,6 @@
namespace Titanic {
class CStarControlSub6 : public FMatrix {
-private:
- static CStarControlSub6 *_static;
-public:
- static void init();
- static void deinit();
public:
FVector _vector;
public: