xrGame,xrAICore: fix windows linkage. Game not playable yet!!!(wrong

size of xr_token)

Author: eagleivg

src/xrAICore/Navigation/ai_object_location.h

@@ -8,13 +8,17 @@
 
 #pragma once
 
-#include "xrAICore/Navigation/game_graph.h"
-#include "xrAICore/Navigation/level_graph.h"
+#include "xrAICore/Navigation/game_graph_space.h"
+
+namespace LevelGraph
+{
+class CVertex;
+};
 
 class CAI_ObjectLocation
 {
 public:
-    using _GRAPH_ID = GameGraph::_GRAPH_ID ;
+    using _GRAPH_ID = GameGraph::_GRAPH_ID;
     using CVertex = GameGraph::CVertex;
     using CLevelVertex = LevelGraph::CVertex;
 
@@ -24,15 +28,15 @@ class CAI_ObjectLocation
 
 public:
     IC CAI_ObjectLocation();
-    void init();
+    IC void init();
     IC void reinit();
-    void game_vertex(CVertex const* game_vertex);
-    void game_vertex(_GRAPH_ID const& game_vertex_id);
-    const CVertex* game_vertex() const;
+    IC void game_vertex(CVertex const* game_vertex);
+    IC void game_vertex(_GRAPH_ID const& game_vertex_id);
+    IC const CVertex* game_vertex() const;
     IC const _GRAPH_ID game_vertex_id() const;
-    void level_vertex(CLevelVertex const* level_vertex);
-    void level_vertex(u32 const& level_vertex_id);
-    const LevelGraph::CVertex* level_vertex() const;
+    IC void level_vertex(CLevelVertex const* level_vertex);
+    IC void level_vertex(u32 const& level_vertex_id);
+    IC const CLevelVertex* level_vertex() const;
     IC const u32 level_vertex_id() const;
 };
 

src/xrAICore/Navigation/ai_object_location.cpp renamed to src/xrAICore/Navigation/ai_object_location_impl.h

@@ -6,13 +6,13 @@
 //	Description : AI object location implementation
 ////////////////////////////////////////////////////////////////////////////
 
+#pragma once
+
 #include "xrAICore/Navigation/ai_object_location.h"
 #include "xrAICore/Navigation/game_graph.h"
 #include "xrAICore/Navigation/level_graph.h"
-#include "xrGame/ai_space.h"
-
 
-void CAI_ObjectLocation::init()
+IC void CAI_ObjectLocation::init()
 {
     if (ai().get_level_graph())
         ai().level_graph().set_invalid_vertex(m_level_vertex_id);
@@ -25,37 +25,37 @@ void CAI_ObjectLocation::init()
         m_game_vertex_id = GameGraph::_GRAPH_ID(-1);
 }
 
-void CAI_ObjectLocation::game_vertex(CVertex const* game_vertex)
+IC void CAI_ObjectLocation::game_vertex(CVertex const* game_vertex)
 {
     VERIFY(ai().game_graph().valid_vertex_id(ai().game_graph().vertex_id(game_vertex)));
     m_game_vertex_id = ai().game_graph().vertex_id(game_vertex);
 }
 
-void CAI_ObjectLocation::game_vertex(_GRAPH_ID const& game_vertex_id)
+IC void CAI_ObjectLocation::game_vertex(_GRAPH_ID const& game_vertex_id)
 {
     VERIFY(ai().game_graph().valid_vertex_id(game_vertex_id));
     m_game_vertex_id = game_vertex_id;
 }
 
-const CGameGraph::CVertex* CAI_ObjectLocation::game_vertex() const
+IC const CGameGraph::CVertex* CAI_ObjectLocation::game_vertex() const
 {
     VERIFY(ai().game_graph().valid_vertex_id(m_game_vertex_id));
     return (ai().game_graph().vertex(m_game_vertex_id));
 }
 
-void CAI_ObjectLocation::level_vertex(CLevelVertex const* level_vertex)
+IC void CAI_ObjectLocation::level_vertex(CLevelVertex const* level_vertex)
 {
     VERIFY(ai().level_graph().valid_vertex_id(ai().level_graph().vertex_id(level_vertex)));
     m_level_vertex_id = ai().level_graph().vertex_id(level_vertex);
 }
 
-void CAI_ObjectLocation::level_vertex(u32 const& level_vertex_id)
+IC void CAI_ObjectLocation::level_vertex(u32 const& level_vertex_id)
 {
     VERIFY(ai().level_graph().valid_vertex_id(level_vertex_id));
     m_level_vertex_id = level_vertex_id;
 }
 
-const LevelGraph::CVertex* CAI_ObjectLocation::level_vertex() const
+IC const CLevelGraph::CVertex* CAI_ObjectLocation::level_vertex() const
 {
     VERIFY(ai().level_graph().valid_vertex_id(m_level_vertex_id));
     return (ai().level_graph().vertex(m_level_vertex_id));

src/xrGame/CustomMonster.cpp

@@ -23,6 +23,7 @@
 #include "item_manager.h"
 #include "danger_manager.h"
 #include "xrAICore/Navigation/ai_object_location.h"
+#include "xrAICore/Navigation/ai_object_location_impl.h"
 #include "xrAICore/Navigation/level_graph.h"
 #include "xrAICore/Navigation/game_graph.h"
 #include "movement_manager.h"

src/xrGame/GameObject.cpp

@@ -18,6 +18,7 @@
 #include "object_factory.h"
 #include "Include/xrRender/Kinematics.h"
 #include "xrAICore/Navigation/ai_object_location.h"
+#include "xrAICore/Navigation/ai_object_location_impl.h"
 #include "xrAICore/Navigation/game_graph.h"
 #include "ai_debug.h"
 #include "xrEngine/IGame_Level.h"

src/xrGame/ai/monsters/ai_monster_utils.cpp

@@ -1,7 +1,7 @@
 #include "StdAfx.h"
 #include "ai_monster_utils.h"
 #include "Entity.h"
-#include "xrAICore/Navigation/ai_object_location.h"
+#include "xrAICore/Navigation/ai_object_location_impl.h"
 #include "ai_space.h"
 #include "xrAICore/Navigation/level_graph.h"
 #include "Include/xrRender/Kinematics.h"

src/xrGame/ai/monsters/basemonster/base_monster.cpp

@@ -39,6 +39,7 @@
 #include "ai/monsters/ai_monster_squad.h"
 #include "Actor.h"
 #include "xrAICore/Navigation/ai_object_location.h"
+#include "xrAICore/Navigation/ai_object_location_impl.h"
 #include "ai_space.h"
 #include "xrScriptEngine/script_engine.hpp"
 #include "ai/monsters/anti_aim_ability.h"

src/xrGame/ai/monsters/rats/ai_rat_templates.cpp

@@ -12,7 +12,7 @@
 #include "xrAICore/Navigation/game_graph.h"
 #include "magic_box3.h"
 #include "Include/xrRender/RenderVisual.h"
-#include "xrAICore/Navigation/ai_object_location.h"
+#include "xrAICore/Navigation/ai_object_location_impl.h"
 #include "xrAICore/Navigation/level_graph.h"
 #include "movement_manager.h"
 #include "location_manager.h"

src/xrGame/ai/stalker/ai_stalker.cpp

@@ -38,6 +38,7 @@
 #include "memory_manager.h"
 #include "sight_manager.h"
 #include "xrAICore/Navigation/ai_object_location.h"
+#include "xrAICore/Navigation/ai_object_location_impl.h"
 #include "stalker_movement_manager_smart_cover.h"
 #include "EntityCondition.h"
 #include "xrScriptEngine/script_engine.hpp"