[Scummvm-git-logs] scummvm master -> a925264fb03a8ccbde9390fd9a18be23232851dd

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a925264fb0 TITANIC: Remove redundant static from CStarControlSub6


Commit: a925264fb03a8ccbde9390fd9a18be23232851dd
    https://github.com/scummvm/scummvm/commit/a925264fb03a8ccbde9390fd9a18be23232851dd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-03-26T21:40:55-04:00

Commit Message:
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.

Changed paths:
    engines/titanic/star_control/star_control.cpp
    engines/titanic/star_control/star_control_sub6.cpp
    engines/titanic/star_control/star_control_sub6.h


diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp
index 6e27223..dbe8b01 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 0ced3df..9d22f46 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 91def29..f0f14b6 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: