[Scummvm-cvs-logs] SF.net SVN: scummvm: [31755] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Mon Apr 28 11:42:30 CEST 2008
Revision: 31755
http://scummvm.svn.sourceforge.net/scummvm/?rev=31755&view=rev
Author: peres001
Date: 2008-04-28 02:42:29 -0700 (Mon, 28 Apr 2008)
Log Message:
-----------
Moved some static members into Parallaction class.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/parallaction.cpp
scummvm/trunk/engines/parallaction/parallaction.h
scummvm/trunk/engines/parallaction/parallaction_ns.cpp
Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp 2008-04-27 14:33:03 UTC (rev 31754)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp 2008-04-28 09:42:29 UTC (rev 31755)
@@ -49,15 +49,12 @@
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
Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h 2008-04-27 14:33:03 UTC (rev 31754)
+++ scummvm/trunk/engines/parallaction/parallaction.h 2008-04-28 09:42:29 UTC (rev 31755)
@@ -145,15 +145,13 @@
+
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 @@
*/
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;
Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp 2008-04-27 14:33:03 UTC (rev 31754)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp 2008-04-28 09:42:29 UTC (rev 31755)
@@ -138,6 +138,9 @@
initParsers();
_introSarcData1 = 0;
+ _introSarcData2 = 1;
+ _introSarcData3 = 200;
+
num_foglie = 0;
_animations.push_front(_char._ani);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list