[Scummvm-cvs-logs] SF.net SVN: scummvm: [26161] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 26161
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26161&view=rev
Author:   peres001
Date:     2007-03-17 01:06:45 -0700 (Sat, 17 Mar 2007)

Log Message:
-----------
minor cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/defs.h
    scummvm/trunk/engines/parallaction/parallaction.cpp
    scummvm/trunk/engines/parallaction/parallaction.h

Modified: scummvm/trunk/engines/parallaction/defs.h
===================================================================
--- scummvm/trunk/engines/parallaction/defs.h	2007-03-17 07:56:45 UTC (rev 26160)
+++ scummvm/trunk/engines/parallaction/defs.h	2007-03-17 08:06:45 UTC (rev 26161)
@@ -73,9 +73,16 @@
 struct Cnv {
 	uint16	_width; 	//
 	uint16	_height;	//
-	byte**	_array; 	// frames data
 	byte**	field_8;	// unused
 	uint16	_count; 	// # of frames
+	byte**	_array; 	// frames data
+
+public:
+	byte* getFramePtr(uint16 index) {
+		if (index >= _count)
+			error("frame %i does not exist", index);
+		return _array[index];
+	}
 };
 
 struct Animation;

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2007-03-17 07:56:45 UTC (rev 26160)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2007-03-17 08:06:45 UTC (rev 26161)
@@ -58,8 +58,6 @@
 char	   *_objectsNames[100];
 Zone	   *_activeZone = NULL;
 
-
-
 uint16		_score = 1;
 
 uint32		_localFlags[120] = { 0 };

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2007-03-17 07:56:45 UTC (rev 26160)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2007-03-17 08:06:45 UTC (rev 26161)
@@ -118,20 +118,9 @@
 
 extern char *_globalTable[];
 extern char _saveData1[];
-//extern Point _firstPosition;		 // starting position after load game??
-//extern uint16 _firstFrame;	 // starting frame after load game??
 extern byte _mouseHidden;
 extern uint32 _commandFlags;
 
-
-
-//extern char _locationName[];
-//extern Node _walkNodes;
-//extern Command *_aCommands;
-//extern Command *_commands;
-//extern char *_comment;
-//extern char *_endComment;
-
 extern char *_objectsNames[];
 extern const char *_zoneTypeNames[];
 extern const char *_zoneFlagNames[];
@@ -173,12 +162,8 @@
 
 void freeZones(Node *list);
 
-void freeLocation();
-
 void runDialogue(SpeakData*);
 
-void changeCharacter(const char *name);
-
 WalkNode *buildWalkPath(uint16 x, uint16 y);
 
 Job *addJob(JobFn fn, void *parm, uint16 tag);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.