[Gemrb-commits] gemrb: branch master updated. v0.7.2-780-gd2e4fd1

[Jens G. <fi...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  d2e4fd1d32650f6bf8e44bbee3fe2b9260fe9f57 (commit)

Summary of changes:
 gemrb/core/WorldMap.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
      from  0ab4d4a2be45c43533682cf16a7f4b01537f65a8 (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=d2e4fd1d32650f6bf8e44bbee3fe2b9260fe9f57

commit d2e4fd1d32650f6bf8e44bbee3fe2b9260fe9f57
Author: Jens Granseuer <je...@gm...>
Date:   Sat Mar 9 18:52:23 2013 +0100

    resolve paths on the world map in the correct direction
    
    Previously we were rewinding the path in the wrong direction which
    meant we were not using the correct entrance/direction for the
    destination area.

diff --git a/gemrb/core/WorldMap.cpp b/gemrb/core/WorldMap.cpp
index b836b61..552b77a 100644
--- a/gemrb/core/WorldMap.cpp
+++ b/gemrb/core/WorldMap.cpp
@@ -451,7 +451,7 @@ WMPAreaLink *WorldMap::GetEncounterLink(const ieResRef AreaName, bool &encounter
 	if (!walkpath.size()) {
 		return NULL;
 	}
-	std::list<WMPAreaLink*>::iterator p=walkpath.begin();
+	std::list<WMPAreaLink*>::reverse_iterator p=walkpath.rbegin();
 	WMPAreaLink *lastpath;
 	encounter=false;
 	do {
@@ -462,7 +462,7 @@ WMPAreaLink *WorldMap::GetEncounterLink(const ieResRef AreaName, bool &encounter
 		}
 		p++;
 	}
-	while(p!=walkpath.end() );
+	while(p!=walkpath.rend() );
 	return lastpath;
 }
 

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


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