[Gemrb-commits] gemrb/gemrb/plugins/Core ActorBlock.cpp,1.85,1.86 Map.cpp,1.156,1.157

[Laszlo T. <ave...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10459/Core

Modified Files:
	ActorBlock.cpp Map.cpp 
Log Message:
fixed RunAway action
Implemented FadeColor in SDLVideo


Index: Map.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Map.cpp,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -d -r1.156 -r1.157
*** Map.cpp	11 Apr 2005 21:41:13 -0000	1.156
--- Map.cpp	12 Apr 2005 18:42:38 -0000	1.157
***************
*** 516,520 ****
  		p.x = anim->x;
  		p.y = anim->y;
! 		if (!IsVisible( p, anim->Flags & A_ANI_NOT_IN_FOG) ) continue;
  		Color tint = {0,0,0,0};
  		if (!(anim->Flags&A_ANI_NO_SHADOW)) {
--- 516,521 ----
  		p.x = anim->x;
  		p.y = anim->y;
! 		if (!IsVisible( p, !(anim->Flags & A_ANI_NOT_IN_FOG)) )
! 			continue;
  		Color tint = {0,0,0,0};
  		if (!(anim->Flags&A_ANI_NO_SHADOW)) {
***************
*** 657,661 ****
  		p.x = anim->x;
  		p.y = anim->y;
! 		if (!IsVisible( p, anim->Flags & A_ANI_NOT_IN_FOG) ) continue;
  		Color tint = {0,0,0,0};
  		if (!(anim->Flags&A_ANI_NO_SHADOW)) {
--- 658,663 ----
  		p.x = anim->x;
  		p.y = anim->y;
! 		if (!IsVisible( p, !(anim->Flags & A_ANI_NOT_IN_FOG)) )
! 			continue;
  		Color tint = {0,0,0,0};
  		if (!(anim->Flags&A_ANI_NO_SHADOW)) {
***************
*** 1187,1191 ****
  		}
  
! 		unsigned int Cost = MapSet[y * Width + x] + 1;
  		if (Cost > PathLen) {
  			//printf("Path not found!\n");
--- 1189,1193 ----
  		}
  
! 		unsigned int Cost = MapSet[y * Width + x] + NormalCost;
  		if (Cost > PathLen) {
  			//printf("Path not found!\n");
***************
*** 1197,1201 ****
  		SetupNode( x - 1, y + 1, Cost );
  
! 		Cost ++;
  		SetupNode( x, y - 1, Cost );
  		SetupNode( x + 1, y, Cost );
--- 1199,1203 ----
  		SetupNode( x - 1, y + 1, Cost );
  
! 		Cost += AdditionalCost;
  		SetupNode( x, y - 1, Cost );
  		SetupNode( x + 1, y, Cost );
***************
*** 1219,1226 ****
  	unsigned int pos2 = start.y * Width + start.x;
  	while (( pos = p.y * Width + p.x ) != pos2) {
! 		StartNode->Next = new PathNode;
! 		StartNode->Next->Parent = StartNode;
! 		StartNode = StartNode->Next;
! 		StartNode->Next = NULL;
  		unsigned int level = MapSet[pos];
  		unsigned int diff = 0;
--- 1221,1227 ----
  	unsigned int pos2 = start.y * Width + start.x;
  	while (( pos = p.y * Width + p.x ) != pos2) {
! 		Return = new PathNode;
! 		StartNode->Parent = Return;
! 		Return->Next = StartNode;
  		unsigned int level = MapSet[pos];
  		unsigned int diff = 0;
***************
*** 1236,1246 ****
  		if (!diff)
  			return Return;
! 		StartNode->x = n.x;
! 		StartNode->y = n.y;
  
  		if (Backing) {
! 			StartNode->orient = GetOrient( p, n );
  		} else {
! 			StartNode->orient = GetOrient( n, p );
  		}
  		p = n;
--- 1237,1247 ----
  		if (!diff)
  			return Return;
! 		Return->x = n.x;
! 		Return->y = n.y;
  
  		if (Backing) {
! 			Return->orient = GetOrient( p, n );
  		} else {
! 			Return->orient = GetOrient( n, p );
  		}
  		p = n;

Index: ActorBlock.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/ActorBlock.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** ActorBlock.cpp	11 Apr 2005 21:41:11 -0000	1.85
--- ActorBlock.cpp	12 Apr 2005 18:42:38 -0000	1.86
***************
*** 445,448 ****
--- 445,449 ----
  		return;
  	}
+ 	Destination = Des;
  	PathNode *endNode=path;
  	while(endNode->Next) {