[Gemrb-commits] gemrb/gemrb/plugins/Core Map.cpp,1.153,1.154

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

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

Modified Files:
	Map.cpp 
Log Message:
clearing path of deactivated actors, reactivating visible actors


Index: Map.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Map.cpp,v
retrieving revision 1.153
retrieving revision 1.154
diff -C2 -d -r1.153 -r1.154
*** Map.cpp	9 Apr 2005 19:13:42 -0000	1.153
--- Map.cpp	9 Apr 2005 21:58:02 -0000	1.154
***************
*** 562,567 ****
  				if (!actor->GetNextAction())
  					continue;
! 				//turning actor inactive
  				actor->Active&=~SCR_ACTIVE;
  				continue;
  			}
--- 562,569 ----
  				if (!actor->GetNextAction())
  					continue;
! 				//turning actor inactive, clearing path
  				actor->Active&=~SCR_ACTIVE;
+ 				actor->SetStance(IE_ANI_READY);
+ 				actor->ClearPath();
  				continue;
  			}
***************
*** 855,864 ****
  		if (actor->Active&SCR_ACTIVE) {
  			if (actor->GetStance() == IE_ANI_TWITCH) {
! 				priority=1;
  			} else {
! 				priority=0;
  			}
  		} else {
! 			priority=2;
  		}
  
--- 857,872 ----
  		if (actor->Active&SCR_ACTIVE) {
  			if (actor->GetStance() == IE_ANI_TWITCH) {
! 				priority = 1;
  			} else {
! 				priority = 0;
  			}
  		} else {
! 			if (IsVisible(actor->Pos, true) && (actor->GetStance() !=IE_ANI_TWITCH) ) {
! 				priority = 0;
! 				actor->Active|=SCR_ACTIVE;
! 				//here you can flag for autopause if actor->Modified[IE_EA] is enemy, coz we just revealed it!
! 			} else {
! 				priority = 2;
! 			}
  		}