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

peres001 at users.sourceforge.net peres001 at users.sourceforge.net
Sun Mar 18 18:17:22 CET 2007


Revision: 26215
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26215&view=rev
Author:   peres001
Date:     2007-03-18 10:17:21 -0700 (Sun, 18 Mar 2007)

Log Message:
-----------
converted DoorData and Zone to Common::Point

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/animation.cpp
    scummvm/trunk/engines/parallaction/location.cpp
    scummvm/trunk/engines/parallaction/parallaction.cpp
    scummvm/trunk/engines/parallaction/parallaction.h
    scummvm/trunk/engines/parallaction/saveload.cpp
    scummvm/trunk/engines/parallaction/walk.cpp
    scummvm/trunk/engines/parallaction/zone.cpp
    scummvm/trunk/engines/parallaction/zone.h

Modified: scummvm/trunk/engines/parallaction/animation.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/animation.cpp	2007-03-18 17:12:48 UTC (rev 26214)
+++ scummvm/trunk/engines/parallaction/animation.cpp	2007-03-18 17:17:21 UTC (rev 26215)
@@ -138,8 +138,8 @@
 			vD0->_z = atoi(_tokens[3]);
 		}
 		if (!scumm_stricmp(_tokens[0], "moveto")) {
-			vD0->_zone._moveTo._x = atoi(_tokens[1]);
-			vD0->_zone._moveTo._y = atoi(_tokens[2]);
+			vD0->_zone._moveTo.x = atoi(_tokens[1]);
+			vD0->_zone._moveTo.y = atoi(_tokens[2]);
 		}
 
 		fillBuffers(script, true);

Modified: scummvm/trunk/engines/parallaction/location.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/location.cpp	2007-03-18 17:12:48 UTC (rev 26214)
+++ scummvm/trunk/engines/parallaction/location.cpp	2007-03-18 17:17:21 UTC (rev 26215)
@@ -388,14 +388,14 @@
 	_vm->_char._ani._zone._oldTop = -1000;
 
 	_vm->_char._ani.field_50 = 0;
-	if (_location._startPosition._x != -1000) {
-		_vm->_char._ani._zone._left = _location._startPosition._x;
-		_vm->_char._ani._zone._top = _location._startPosition._y;
+	if (_location._startPosition.x != -1000) {
+		_vm->_char._ani._zone._left = _location._startPosition.x;
+		_vm->_char._ani._zone._top = _location._startPosition.y;
 		_vm->_char._ani._frame = _location._startFrame;
-		_location._startPosition._y = -1000;
-		_location._startPosition._x = -1000;
+		_location._startPosition.y = -1000;
+		_location._startPosition.x = -1000;
 
-		debugC(2, kDebugLocation, "changeLocation: initial position set to x: %i, y: %i, f: %i", _location._startPosition._x, _location._startPosition._y, _location._startFrame);
+		debugC(2, kDebugLocation, "changeLocation: initial position set to x: %i, y: %i, f: %i", _location._startPosition.x, _location._startPosition.y, _location._startFrame);
 	}
 
 	byte palette[PALETTE_SIZE];

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2007-03-18 17:12:48 UTC (rev 26214)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2007-03-18 17:17:21 UTC (rev 26215)
@@ -201,8 +201,8 @@
 	memset(_locationNames, 0, 120*32);
 	_numLocations = 0;
 
-	_location._startPosition._x = -1000;
-	_location._startPosition._x = -1000;
+	_location._startPosition.x = -1000;
+	_location._startPosition.y = -1000;
 	_location._startFrame = 0;
 	_location._walkNodes._prev = NULL;
 	_location._walkNodes._next = NULL;
@@ -260,12 +260,12 @@
 	strcpy(_saveData1, _location._name);
 	parseLocation(_location._name);
 
-	if (_location._startPosition._x != -1000) {
-		_vm->_char._ani._zone._left = _location._startPosition._x;
-		_vm->_char._ani._zone._top = _location._startPosition._y;
+	if (_location._startPosition.x != -1000) {
+		_vm->_char._ani._zone._left = _location._startPosition.x;
+		_vm->_char._ani._zone._top = _location._startPosition.y;
 		_vm->_char._ani._frame = _location._startFrame;
-		_location._startPosition._y = -1000;
-		_location._startPosition._x = -1000;
+		_location._startPosition.y = -1000;
+		_location._startPosition.x = -1000;
 	}
 
 	return;
@@ -614,9 +614,8 @@
 				// else it will move to the mouse position
 				_input._event = kEvWalk;
 				_actionAfterWalk = true;
-				if (z->_moveTo._y != 0) {
-					_input._mousePos.x = z->_moveTo._x;
-					_input._mousePos.y = z->_moveTo._y;
+				if (z->_moveTo.y != 0) {
+					_input._mousePos = z->_moveTo;
 				}
 			}
 

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2007-03-18 17:12:48 UTC (rev 26214)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2007-03-18 17:17:21 UTC (rev 26215)
@@ -222,7 +222,7 @@
 
 struct Location {
 
-	Point		_startPosition;
+	Common::Point	_startPosition;
 	uint16		_startFrame;
 	Node		_walkNodes;
 	char		_name[100];

Modified: scummvm/trunk/engines/parallaction/saveload.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/saveload.cpp	2007-03-18 17:12:48 UTC (rev 26214)
+++ scummvm/trunk/engines/parallaction/saveload.cpp	2007-03-18 17:17:21 UTC (rev 26215)
@@ -68,10 +68,10 @@
 	strcat(_vm->_location._name, ".");
 
 	f->readLine(s, 15);
-	_location._startPosition._x = atoi(s);
+	_location._startPosition.x = atoi(s);
 
 	f->readLine(s, 15);
-	_location._startPosition._y = atoi(s);
+	_location._startPosition.y = atoi(s);
 
 	f->readLine(s, 15);
 	_score = atoi(s);

Modified: scummvm/trunk/engines/parallaction/walk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/walk.cpp	2007-03-18 17:12:48 UTC (rev 26214)
+++ scummvm/trunk/engines/parallaction/walk.cpp	2007-03-18 17:17:21 UTC (rev 26215)
@@ -419,8 +419,8 @@
 	if (z != NULL) {
 
 		if ((z->_flags & kFlagsClosed) == 0) {
-			_vm->_location._startPosition._x = z->u.door->_startPos._x;
-			_vm->_location._startPosition._y = z->u.door->_startPos._y;
+			_vm->_location._startPosition.x = z->u.door->_startPos.x;
+			_vm->_location._startPosition.y = z->u.door->_startPos.y;
 			_vm->_location._startFrame = z->u.door->_startFrame;
 			strcpy( _vm->_location._name, z->u.door->_location );
 

Modified: scummvm/trunk/engines/parallaction/zone.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/zone.cpp	2007-03-18 17:12:48 UTC (rev 26214)
+++ scummvm/trunk/engines/parallaction/zone.cpp	2007-03-18 17:17:21 UTC (rev 26215)
@@ -83,8 +83,8 @@
 			z->_bottom = atoi(_tokens[4]);
 		}
 		if (!scumm_stricmp(_tokens[0], "moveto")) {
-			z->_moveTo._x = atoi(_tokens[1]);
-			z->_moveTo._y = atoi(_tokens[2]);
+			z->_moveTo.x = atoi(_tokens[1]);
+			z->_moveTo.y = atoi(_tokens[2]);
 		}
 		if (!scumm_stricmp(_tokens[0], "type")) {
 			if (_tokens[2][0] != '\0') {
@@ -299,8 +299,8 @@
 			}
 
 			if (!scumm_stricmp(_tokens[0],	"startpos")) {
-				u->door->_startPos._x = atoi(_tokens[1]);
-				u->door->_startPos._y = atoi(_tokens[2]);
+				u->door->_startPos.x = atoi(_tokens[1]);
+				u->door->_startPos.y = atoi(_tokens[2]);
 				u->door->_startFrame = atoi(_tokens[3]);
 			}
 			break;

Modified: scummvm/trunk/engines/parallaction/zone.h
===================================================================
--- scummvm/trunk/engines/parallaction/zone.h	2007-03-18 17:12:48 UTC (rev 26214)
+++ scummvm/trunk/engines/parallaction/zone.h	2007-03-18 17:17:21 UTC (rev 26215)
@@ -97,7 +97,7 @@
 	char*	_location;
 	Cnv 	_cnv;
 	byte*	_background;
-	Point	_startPos;
+	Common::Point	_startPos;
 	uint16	_startFrame;
 };
 struct HearData {	// size = 20
@@ -139,7 +139,7 @@
 	uint16			field_2E;		// unused
 	TypeData	u;
 	Command 		*_commands;
-	Point			_moveTo;
+	Common::Point	_moveTo;
 
 	void getRect(Common::Rect& r) const {
 		r.left = _left;


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