[Gemrb-commits] gemrb: branch master updated. v0.6.2-1632-g3d799d1

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  3d799d1d35b2bb0ef6fc48647d4b6ca51f1ad163 (commit)

Summary of changes:
 gemrb/core/Map.cpp                  |    6 +++---
 gemrb/core/Scriptable/InfoPoint.cpp |    9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)
      from  60931a686f0169f4ea8924db24c6f37d0fc2fc4e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=3d799d1d35b2bb0ef6fc48647d4b6ca51f1ad163

commit 3d799d1d35b2bb0ef6fc48647d4b6ca51f1ad163
Author: Avenger <ave...@so...>
Date:   Sat Sep 3 16:21:02 2011 +0200

    familiars will be handled as PC for searchmap and travel regions (blocking/traveling like a party member)

diff --git a/gemrb/core/Map.cpp b/gemrb/core/Map.cpp
index 9483f48..664c49e 100644
--- a/gemrb/core/Map.cpp
+++ b/gemrb/core/Map.cpp
@@ -896,7 +896,7 @@ bool Map::DoStepForActor(Actor *actor, int speed, ieDword time) {
 		if (!actor->Immobile()) {
 			no_more_steps = actor->DoStep( speed, time );
 			if (actor->BlocksSearchMap()) {
-				BlockSearchMap( actor->Pos, actor->size, actor->InParty?PATH_MAP_PC:PATH_MAP_NPC);
+				BlockSearchMap( actor->Pos, actor->size, actor->IsPartyMember()?PATH_MAP_PC:PATH_MAP_NPC);
 			}
 		}
 	}
@@ -914,7 +914,7 @@ void Map::ClearSearchMapFor( Movable *actor ) {
 	int i=0;
 	while(nearActors[i]!=NULL) {
 		if(nearActors[i]!=actor && nearActors[i]->BlocksSearchMap())
-			BlockSearchMap( nearActors[i]->Pos, nearActors[i]->size, nearActors[i]->InParty?PATH_MAP_PC:PATH_MAP_NPC);
+			BlockSearchMap( nearActors[i]->Pos, nearActors[i]->size, nearActors[i]->IsPartyMember()?PATH_MAP_PC:PATH_MAP_NPC);
 		++i;
 	}
 	free(nearActors);
@@ -2122,7 +2122,7 @@ bool Map::CanFree()
 {
 	size_t i=actors.size();
 	while (i--) {
-		if (actors[i]->InParty) {
+		if (actors[i]->IsPartyMember()) {
 			return false;
 		}
 
diff --git a/gemrb/core/Scriptable/InfoPoint.cpp b/gemrb/core/Scriptable/InfoPoint.cpp
index 7c56f0b..bbb4825 100644
--- a/gemrb/core/Scriptable/InfoPoint.cpp
+++ b/gemrb/core/Scriptable/InfoPoint.cpp
@@ -72,15 +72,16 @@ void InfoPoint::SetEnter(const char *resref)
 int InfoPoint::CheckTravel(Actor *actor)
 {
 	if (Flags&TRAP_DEACTIVATED) return CT_CANTMOVE;
-	if (!actor->InParty && (Flags&TRAVEL_NONPC) ) return CT_CANTMOVE;
-	if (actor->InParty && (Flags&TRAVEL_PARTY) ) {
+	bool pm = actor->IsPartyMember();
+	if (!pm && (Flags&TRAVEL_NONPC) ) return CT_CANTMOVE;
+	if (pm && (Flags&TRAVEL_PARTY) ) {
 		if (core->HasFeature(GF_TEAM_MOVEMENT) || core->GetGame()->EveryoneNearPoint(actor->GetCurrentArea(), actor->Pos, ENP_CANMOVE) ) {
 			return CT_WHOLE;
 		}
 		return CT_GO_CLOSER;
 	}
-	if(actor->IsSelected() ) {
-		if(core->GetGame()->EveryoneNearPoint(actor->GetCurrentArea(), actor->Pos, ENP_CANMOVE|ENP_ONLYSELECT) ) {
+	if (actor->IsSelected() ) {
+		if (core->GetGame()->EveryoneNearPoint(actor->GetCurrentArea(), actor->Pos, ENP_CANMOVE|ENP_ONLYSELECT) ) {
 			return CT_MOVE_SELECTED;
 		}
 		return CT_SELECTED;

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator