WINTERMUTE: Privatize/Protect variables that don't need to be public.

6 files changed, 15 insertions, 12 deletions

diff --git a/engines/wintermute/base/scriptables/script.h b/engines/wintermute/base/scriptables/script.h
index 3bb4bc48a7..ba73e1015f 100644
--- a/engines/wintermute/base/scriptables/script.h
+++ b/engines/wintermute/base/scriptables/script.h
@@ -55,9 +55,10 @@ public:
 	bool copyParameters(ScStack *stack);

 

 	void afterLoad();

-

+private:

 	ScValue *_operand;

 	ScValue *_reg1;

+public:

 	bool _freezable;

 	bool resume();

 	bool pause();

@@ -145,6 +146,13 @@ public:
 	ScScript(BaseGame *inGame, ScEngine *Engine);

 	virtual ~ScScript();

 	char *_filename;

+	bool _thread;

+	bool _methodThread;

+	char *_threadEvent;

+	BaseScriptHolder *_owner;

+	ScScript::TExternalFunction *getExternal(char *name);

+	bool externalCall(ScStack *stack, ScStack *thisStack, ScScript::TExternalFunction *function);

+private:

 	char **_symbols;

 	uint32 _numSymbols;

 	TFunctionPos *_functions;

@@ -155,13 +163,7 @@ public:
 	uint32 _numFunctions;

 	uint32 _numMethods;

 	uint32 _numEvents;

-	bool _thread;

-	bool _methodThread;

-	char *_threadEvent;

-	BaseScriptHolder *_owner;

-	ScScript::TExternalFunction *getExternal(char *name);

-	bool externalCall(ScStack *stack, ScStack *thisStack, ScScript::TExternalFunction *function);

-private:

+

 	bool initScript();

 	bool initTables();

 

diff --git a/engines/wintermute/base/scriptables/script_ext_array.h b/engines/wintermute/base/scriptables/script_ext_array.h
index 3f8d703f85..8eb86c4e69 100644
--- a/engines/wintermute/base/scriptables/script_ext_array.h
+++ b/engines/wintermute/base/scriptables/script_ext_array.h
@@ -45,6 +45,7 @@ public:
 	bool scSetProperty(const char *name, ScValue *value);

 	bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);

 	const char *scToString();

+private:

 	int _length;

 	ScValue *_values;

 };

diff --git a/engines/wintermute/base/scriptables/script_ext_date.h b/engines/wintermute/base/scriptables/script_ext_date.h
index b2df4abe94..69fe1f1ae5 100644
--- a/engines/wintermute/base/scriptables/script_ext_date.h
+++ b/engines/wintermute/base/scriptables/script_ext_date.h
@@ -44,9 +44,9 @@ public:
 	bool scSetProperty(const char *name, ScValue *value);

 	bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name);

 	const char *scToString();

+private:

 	char *_string;

 	TimeDate _tm;

-private:

 	Common::String _strRep;

 };

 

diff --git a/engines/wintermute/base/scriptables/script_ext_mem_buffer.h b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h
index c325181e3f..b5428b4bd9 100644
--- a/engines/wintermute/base/scriptables/script_ext_mem_buffer.h
+++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h
@@ -46,8 +46,9 @@ public:
 	SXMemBuffer(BaseGame *inGame, void *buffer);

 	virtual ~SXMemBuffer();

 	virtual void *scToMemBuffer();

-	int _size;

 private:

+	int _size;

+

 	bool resize(int newSize);

 	void *_buffer;

 	void cleanup();

diff --git a/engines/wintermute/base/scriptables/script_ext_object.h b/engines/wintermute/base/scriptables/script_ext_object.h
index d744c58042..f7d3a7bc0f 100644
--- a/engines/wintermute/base/scriptables/script_ext_object.h
+++ b/engines/wintermute/base/scriptables/script_ext_object.h
@@ -39,7 +39,6 @@ public:
 	DECLARE_PERSISTENT(SXObject, BaseObject)

 	SXObject(BaseGame *inGame, ScStack *Stack);

 	virtual ~SXObject();

-

 };

 

 } // end of namespace WinterMute

diff --git a/engines/wintermute/base/scriptables/script_value.h b/engines/wintermute/base/scriptables/script_value.h
index 7a684d2334..069c36bd47 100644
--- a/engines/wintermute/base/scriptables/script_value.h
+++ b/engines/wintermute/base/scriptables/script_value.h
@@ -88,7 +88,7 @@ public:
 	ScValue *getProp(const char *name);

 	BaseScriptable *_valNative;

 	ScValue *_valRef;

-protected:

+private:

 	bool _valBool;

 	int _valInt;

 	double _valFloat;