From 6d3a7e4f6b90b4e24119af735b976031a6c9c7e7 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Mon, 28 Apr 2008 09:42:29 +0000
Subject: Moved some static members into Parallaction class.

svn-id: r31755
---
 engines/parallaction/parallaction.cpp    |  3 ---
 engines/parallaction/parallaction.h      | 10 ++++++----
 engines/parallaction/parallaction_ns.cpp |  3 +++
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'engines/parallaction')

diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 1b69b163f4..a7993412b3 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -49,15 +49,12 @@ uint16	_mouseButtons = 0;
 
 char		_saveData1[30] = { '\0' };
 uint16		_language = 0;
-char		_slideText[2][MAX_TOKEN_LEN];
 uint32		_engineFlags = 0;
 
 uint16		_score = 1;
 char		_password[8];
 
 uint32		_commandFlags = 0;
-uint16		_introSarcData3 = 200;
-uint16		_introSarcData2 = 1;
 
 // private stuff
 
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 3673f047fb..7ef5bfc3ad 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -145,15 +145,13 @@ struct PARALLACTIONGameDescription;
 
 
 
+
 extern uint16		_mouseButtons;
 extern char			_password[8];
 extern uint16		_score;
 extern uint16		_language;
 extern uint32		_engineFlags;
 #define MAX_FORWARDS	50
-extern char			_slideText[][MAX_TOKEN_LEN];
-extern uint16		_introSarcData3;		 // sarcophagus stuff to be saved
-extern uint16		_introSarcData2;		 // sarcophagus stuff to be saved
 extern char			_saveData1[];
 extern uint32		_commandFlags;
 extern const char	*_dinoName;
@@ -626,9 +624,13 @@ private:
 	*/
 
 	ZonePtr _moveSarcZone0;
-	int16 _introSarcData1;
 	ZonePtr _moveSarcZone1;
 	uint16 num_foglie;
+	char _slideText[][MAX_TOKEN_LEN];
+	int16 _introSarcData1;
+	uint16	_introSarcData2;		 // sarcophagus stuff to be saved
+	uint16	_introSarcData3;		 // sarcophagus stuff to be saved
+
 	ZonePtr _moveSarcZones[5];
 	ZonePtr _moveSarcExaZones[5];
 	AnimationPtr _rightHandAnim;
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index b354be4f49..d77152d5d2 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -138,6 +138,9 @@ int Parallaction_ns::init() {
 	initParsers();
 
 	_introSarcData1 = 0;
+	_introSarcData2 = 1;
+	_introSarcData3 = 200;
+
 	num_foglie = 0;
 
 	_animations.push_front(_char._ani);
-- 
cgit v1.2.3