Mercurial > fife-parpg

diff engine/core/pathfinder/routepather/routepather.cpp @ 292:6362c6812580

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
combine routepathersearch and search class to clean up the code.
author wenlin_fife@33b003aa-7bff-0310-803a-e67f0ece8222
date Fri, 26 Jun 2009 18:04:57 +0000
parents f970f7dab2dd
children 1465536aec94
line wrap: on
line diff
--- a/engine/core/pathfinder/routepather/routepather.cpp	Wed Jun 24 14:12:50 2009 +0000
+++ b/engine/core/pathfinder/routepather/routepather.cpp	Fri Jun 26 18:04:57 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;