xrAICore: Fix hash_fixed_vertex_manager::to_u32 in Linux

Hopefully this time it doesn't break Windows.
OpenXRay · Nov 8, 2018 · 1786320 · 1786320
1 parent c93673c
commit 1786320
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/xrAICore/Navigation/graph_engine.h b/src/xrAICore/Navigation/graph_engine.h
@@ -13,12 +13,12 @@
 #include "xrAICore/Navigation/vertex_manager_fixed.h"
 #include "xrAICore/Navigation/vertex_allocator_fixed.h"
 #include "xrAICore/Navigation/data_storage_bucket_list.h"
+#include "xrAICore/Navigation/PathManagers/path_manager.h"
+#include "xrAICore/Navigation/graph_engine_space.h"
 #ifndef AI_COMPILER
 #include "xrAICore/Navigation/vertex_manager_hash_fixed.h"
 #include "xrAICore/Navigation/data_storage_binary_heap.h"
 #endif
-#include "xrAICore/Navigation/PathManagers/path_manager.h"
-#include "xrAICore/Navigation/graph_engine_space.h"
 #include "xrEngine/profiler.h"
 #include "xrAICore/Components/problem_solver.h"
 #include "xrAICore/Components/operator_condition.h"

diff --git a/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h b/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h
@@ -8,6 +8,12 @@
 
 #pragma once
 
+namespace hash_fixed_vertex_manager
+{
+extern u32 to_u32(const GraphEngineSpace::CWorldState& other);
+extern u32 to_u32(const shared_str& other);
+}
+
 #define TEMPLATE_SPECIALIZATION                                             \
     template <typename TPathId, typename TIndex, u32 HashSize, u32 FixSize> \
     template <typename TPathBuilder, typename TVertexAllocator, typename TCompoundVertex>
@@ -67,11 +73,7 @@ inline bool CHashFixedVertexManager::is_opened(const Vertex& vertex) const { ret
 TEMPLATE_SPECIALIZATION
 inline u32 CHashFixedVertexManager::hash_index(const Index& vertex_id) const
 {
-#ifdef LINUX // FIXME!!
-    return 0;
-#else
     return hash_fixed_vertex_manager::to_u32(vertex_id) % HashSize;
-#endif
 }
 
 TEMPLATE_SPECIALIZATION