[Gemrb-commits] gemrb: branch master updated. v0.7.1-403-g0c2829f

[Jaka K. <lyn...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  0c2829f868eea6362b26965445c7d10761f32f00 (commit)

Summary of changes:
 gemrb/core/GameScript/GSUtils.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
      from  8ea611776db49033871881a04b7fcd7f4ed4f7cc (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=0c2829f868eea6362b26965445c7d10761f32f00

commit 0c2829f868eea6362b26965445c7d10761f32f00
Author: Jaka Kranjc <lyn...@us...>
Date:   Tue Nov 20 17:55:36 2012 +0100

    MBA: only remove/readd the npcs if the area actually changed
    
    also hides ctrl-j+npclevel resulting in npc copies

diff --git a/gemrb/core/GameScript/GSUtils.cpp b/gemrb/core/GameScript/GSUtils.cpp
index bdeecb4..4962742 100644
--- a/gemrb/core/GameScript/GSUtils.cpp
+++ b/gemrb/core/GameScript/GSUtils.cpp
@@ -1167,10 +1167,10 @@ void MoveBetweenAreasCore(Actor* actor, const char *area, const Point &position,
 {
 	Log(MESSAGE, "GameScript", "MoveBetweenAreas: %s to %s [%d.%d] face: %d",
 		actor->GetName(0), area,position.x,position.y, face);
+	Map* map1 = actor->GetCurrentArea();
 	Map* map2;
 	Game* game = core->GetGame();
-	if (area[0]) { //do we need to switch area?
-		Map* map1 = actor->GetCurrentArea();
+	if (area[0] && stricmp(area, map1->GetScriptName())) { //do we need to switch area?
 		//we have to change the pathfinder
 		//to the target area if adjust==true
 		map2 = game->GetMap(area, false);

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


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