* EDIT: Remove GOAP from CMapActionPlanner

ixray-team · Sep 23, 2024 · 67ad52b · 67ad52b
1 parent cb3c689
commit 67ad52b
Show file tree

Hide file tree

Showing 4 changed files with 120 additions and 298 deletions.
diff --git a/src/xrGame/ui/UIMapWnd.cpp b/src/xrGame/ui/UIMapWnd.cpp
@@ -183,8 +183,7 @@ void CUIMapWnd::Init(LPCSTR xml_name, LPCSTR start_from)
 #endif
 
 	Register				(m_GlobalMap);
-	m_ActionPlanner			= new CMapActionPlanner();
-	m_ActionPlanner->setup	(this);
+	m_ActionPlanner			= new FRbmkMapActionPlanner(this);
 	m_view_actor			= true;
 
 	m_UIPropertiesBox = new CUIPropertiesBox();
@@ -623,7 +622,7 @@ void CUIMapWnd::Update()
 	if(m_GlobalMap)
 		m_GlobalMap->WorkingArea().set(ActiveMapRect());
 	inherited::Update			();
-	m_ActionPlanner->update		();
+	m_ActionPlanner->Update		();
 	UpdateNav					();
 }
 
@@ -641,9 +640,7 @@ void CUIMapWnd::ViewGlobalMap()
 
 void CUIMapWnd::ResetActionPlanner()
 {
-	m_ActionPlanner->m_storage.set_property(1,false);
-	m_ActionPlanner->m_storage.set_property(2,false);
-	m_ActionPlanner->m_storage.set_property(3,false);
+	m_ActionPlanner->Reset();
 }
 
 void CUIMapWnd::ViewZoomIn()

diff --git a/src/xrGame/ui/UIMapWnd.h b/src/xrGame/ui/UIMapWnd.h
@@ -9,7 +9,7 @@ class CUIGlobalMap;
 class CUIFrameWindow;
 class CUIFixedScrollBar;
 class CUIFrameLineWnd;
-class CMapActionPlanner;
+class FRbmkMapActionPlanner;
 class CUITabControl;
 class CUIStatic;
 class CUI3tButton;
@@ -45,7 +45,7 @@ class CUIMapWnd: public CUIWindow, public CUIWndCallback
 	CUIFixedScrollBar*				m_UIMainScrollV;
 	CUIFixedScrollBar*				m_UIMainScrollH;
 	CUIWindow*					m_UILevelFrame;
-	CMapActionPlanner*			m_ActionPlanner;
+	FRbmkMapActionPlanner*		m_ActionPlanner;
 
 	CUIMapLocationHint*			m_map_location_hint;
 	CUIPdaSpot*					m_UserSpotWnd;