Mercurial > fife-parpg

diff engine/core/pathfinder/routepather/routepather.cpp @ 310:8afb9b443f66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged the pathfinding branch to trunk
author wenlin_fife@33b003aa-7bff-0310-803a-e67f0ece8222
date Fri, 14 Aug 2009 00:00:58 +0000
parents 1465536aec94
children
line wrap: on
line diff
--- a/engine/core/pathfinder/routepather/routepather.cpp	Wed Aug 12 22:36:29 2009 +0000
+++ b/engine/core/pathfinder/routepather/routepather.cpp	Fri Aug 14 00:00:58 2009 +0000
@@ -129,14 +129,14 @@
 			if(m_sessions.empty()) {
 				break;
 			}
-			Search* priority_session = m_sessions.getPriorityElement().first;
+			RoutePatherSearch* priority_session = m_sessions.getPriorityElement().first;
 			if(!sessionIdValid(priority_session->getSessionId())) {
 				delete priority_session;
 				m_sessions.popElement();
 				continue;
 			}
 			priority_session->updateSearch();
-			if(priority_session->getSearchStatus() == Search::search_status_complete) {
+			if(priority_session->getSearchStatus() == RoutePatherSearch::search_status_complete) {
 				const int session_id = priority_session->getSessionId();
 				Path newPath = priority_session->calcPath();
 				newPath.erase(newPath.begin());
@@ -144,7 +144,7 @@
 				invalidateSessionId(session_id);
 				delete priority_session;
 				m_sessions.popElement();
-			} else if(priority_session->getSearchStatus() == Search::search_status_failed) {
+			} else if(priority_session->getSearchStatus() == RoutePatherSearch::search_status_failed) {
 				const int session_id = priority_session->getSessionId();
 				invalidateSessionId(session_id);
 				delete priority_session;