[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.61,1.62

[Andrew Kurushin]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8221

Modified Files:
	actor.cpp 
Log Message:
- fixing compilation

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- actor.cpp	29 Dec 2004 21:49:24 -0000	1.61
+++ actor.cpp	29 Dec 2004 22:00:47 -0000	1.62
@@ -942,7 +942,7 @@
 	bool extraEndNode;
 
 	actor = getActor(actorId);
-
+	
 	if (actor == _protagonist) {
 		_vm->_scene->setDoorState(2, 0xff);
 		_vm->_scene->setDoorState(3, 0);
@@ -950,7 +950,8 @@
 		_vm->_scene->setDoorState(2, 0);
 		_vm->_scene->setDoorState(3, 0xff);
 	}
-
+	if (actorId == 2002)
+		debug("eah");
 	if (_vm->_scene->getMode() == SCENE_MODE_ISO) {
 		//todo: it
 	} else {
@@ -1417,7 +1418,7 @@
 	removePathPoints();
 
 	_pathNodeIndex++;
-	last = min(_pathNodeIndex, PATH_NODE_MAX);
+	last = MIN(_pathNodeIndex, PATH_NODE_MAX);
 	for (i = 0, node = _pathNodeList; i < last; i++, node++) {
 		actor->addWalkPath(node->x, node->y);
 	}
@@ -1428,13 +1429,12 @@
 	Point point1, point2, delta;
 	int direction;
 	int i;
-	WORD 	nodeindex = 0;
 	Point *point;
 	PathNode *nodeList;
 
 	_pathNodeIndex = 0;
 	point= &_pathList[_pathListIndex];	
-	direction = 0,
+	direction = 0;
 
 	_pathNodeList->x = point->x;
 	_pathNodeList->y = point->y;