1 files changed, 27 insertions, 16 deletions
diff --git a/src/T2DLL/T2RouteNavigator.h b/src/T2DLL/T2RouteNavigator.h
index eebe34d..1ba8749 100644
--- a/src/T2DLL/T2RouteNavigator.h
+++ b/src/T2DLL/T2RouteNavigator.h
@@ -1,25 +1,36 @@
 #pragma once
 #include "common.h"
 
-class T2RouteNavigator {
+enum {
+	kRouteTypeNeg1 = -1,
+	kRouteType0 = 0,
+	kRouteType1 = 1,
+	kRouteType2 = 2,
+	kRouteType3 = 3,
+	kMaxRouteType = 4
+};
+
+class AFX_EXT_CLASS T2RouteNavigator {
 public:
-	T2RouteNavigator(T2FloorInfo*);
+	T2RouteNavigator(T2FloorInfo* inFloorInfo);
 	virtual ~T2RouteNavigator();
-	void FloorAdded(T2Tenant*, int);
-	void FloorRemoved(T2Tenant*, int);
-	void MoverAdded(T2Mover*, int);
-	void MoverRemoved(T2Mover*, int);
-	void MoverModified(T2Mover*, int);
+	void FloorAdded(T2Tenant* inTenant, BOOL inFlag);
+	void FloorRemoved(T2Tenant* inTenant, BOOL inFlag);
+	void MoverAdded(T2Mover* inMover, BOOL inFlag);
+	void MoverRemoved(T2Mover* inMover, BOOL inFlag);
+	void MoverModified(T2Mover* inMover, BOOL inFlag);
 	void Update();
-	int CheckRoute(POINT, POINT, unsigned int, int) const;
-	int IsConnectRouteFromLobby(POINT) const;
-	int GetNextRoute(POINT, POINT&, int) const;
-	T2Tenant* SelectNearTenant(POINT, unsigned int) const;
+	BOOL CheckRoute(POINT inFromPt, POINT inToPt, unsigned int inSearchScore, int inRouteType = kRouteType0) const;
+	BOOL IsConnectRouteFromLobby(POINT inPt) const;
+	BOOL GetNextRoute(POINT inFromPt, POINT& ioToPt, int inRouteType) const;
+	T2Tenant* SelectNearTenant(POINT inPt, unsigned int inSearchScore) const;
+
+	T2FloorPtrList* GetFloorPtrList() const { return mFloorPtrList; }
+
 protected:
-	int GetNextRouteUsingEStair(POINT, POINT&) const;
+	BOOL GetNextRouteUsingEStair(POINT inFromPt, POINT&) const;
 
-public:
-	T2RouteNavigator(const T2RouteNavigator&) {}
-	T2RouteNavigator& operator=(const T2RouteNavigator&) {}
-	T2FloorPtrList* GetFloorPtrList() const {}
+	T2FloorPtrList *mFloorPtrList;
+	T2FloorInfo *mFloorInfo;
+	T2RoutingTable *mRoutingTables[kMaxRouteType];
 };