From dc77647ea4a2becac4eff3190970cb35671b0131 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 25 May 2008 19:17:03 +0000 Subject: (svn r13251) -Codechange: rename _patches to _settings as that is more logic. -Codechange: move all Settings into substructs of _settings in a way that they are logically grouped. --- src/yapf/yapf_base.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/yapf/yapf_base.hpp') diff --git a/src/yapf/yapf_base.hpp b/src/yapf/yapf_base.hpp index f83ecbb20..7ccd4ebf5 100644 --- a/src/yapf/yapf_base.hpp +++ b/src/yapf/yapf_base.hpp @@ -6,6 +6,7 @@ #define YAPF_BASE_HPP #include "../debug.h" +#include "../settings_type.h" extern int _total_pf_time_us; @@ -52,7 +53,7 @@ public: protected: Node* m_pBestDestNode; ///< pointer to the destination node found at last round Node* m_pBestIntermediateNode; ///< here should be node closest to the destination if path not found - const YapfSettings *m_settings; ///< current settings (_patches.yapf) + const YAPFSettings *m_settings; ///< current settings (_settings.yapf) int m_max_search_nodes; ///< maximum number of nodes we are allowed to visit before we give up const Vehicle* m_veh; ///< vehicle that we are trying to drive @@ -73,7 +74,7 @@ public: FORCEINLINE CYapfBaseT() : m_pBestDestNode(NULL) , m_pBestIntermediateNode(NULL) - , m_settings(&_patches.yapf) + , m_settings(&_settings.pf.yapf) , m_max_search_nodes(PfGetSettings().max_search_nodes) , m_veh(NULL) , m_stats_cost_calcs(0) @@ -91,7 +92,7 @@ protected: public: /// return current settings (can be custom - player based - but later) - FORCEINLINE const YapfSettings& PfGetSettings() const + FORCEINLINE const YAPFSettings& PfGetSettings() const { return *m_settings; } -- cgit v1.2.3-54-g00ecf