xrGame, xrAICore: fix more warnings

OpenXRay · Sep 19, 2018 · 2b2c30d · 2b2c30d
1 parent 5783492
commit 2b2c30d
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 24 deletions.
diff --git a/...Core/Navigation/ai_object_location_impl.h → ...rAICore/Navigation/ai_object_location.cpp b/...Core/Navigation/ai_object_location_impl.h → ...rAICore/Navigation/ai_object_location.cpp
@@ -6,11 +6,10 @@
 //	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"
 
 IC void CAI_ObjectLocation::init()
 {

diff --git a/src/xrAICore/Navigation/ai_object_location.h b/src/xrAICore/Navigation/ai_object_location.h
@@ -28,7 +28,7 @@ class CAI_ObjectLocation
 
 public:
     IC CAI_ObjectLocation();
-    IC void init();
+    void init();
     IC void reinit();
     IC void game_vertex(CVertex const* game_vertex);
     IC void game_vertex(_GRAPH_ID const& game_vertex_id);

diff --git a/src/xrGame/CustomMonster.cpp b/src/xrGame/CustomMonster.cpp
@@ -23,7 +23,6 @@
 #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"

diff --git a/src/xrGame/GameObject.cpp b/src/xrGame/GameObject.cpp
@@ -17,7 +17,7 @@
 #include "game_cl_base.h"
 #include "object_factory.h"
 #include "Include/xrRender/Kinematics.h"
-#include "xrAICore/Navigation/ai_object_location_impl.h"
+#include "xrAICore/Navigation/ai_object_location.h"
 #include "xrAICore/Navigation/game_graph.h"
 #include "ai_debug.h"
 #include "xrEngine/IGame_Level.h"

diff --git a/src/xrGame/ai/monsters/ai_monster_utils.cpp b/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_impl.h"
+#include "xrAICore/Navigation/ai_object_location.h"
 #include "ai_space.h"
 #include "xrAICore/Navigation/level_graph.h"
 #include "Include/xrRender/Kinematics.h"

diff --git a/src/xrGame/ai/monsters/basemonster/base_monster.cpp b/src/xrGame/ai/monsters/basemonster/base_monster.cpp
@@ -39,7 +39,6 @@
 #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"

diff --git a/src/xrGame/ai/monsters/rats/ai_rat.cpp b/src/xrGame/ai/monsters/rats/ai_rat.cpp
@@ -17,7 +17,6 @@
 #include "Include/xrRender/KinematicsAnimated.h"
 #include "detail_path_manager.h"
 #include "xrAICore/Navigation/ai_object_location.h"
-#include "xrAICore/Navigation/ai_object_location_impl.h"
 #include "movement_manager.h"
 #include "location_manager.h"
 #include "xrServerEntities/ai_sounds.h"

diff --git a/src/xrGame/ai/monsters/rats/ai_rat_templates.cpp b/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_impl.h"
+#include "xrAICore/Navigation/ai_object_location.h"
 #include "xrAICore/Navigation/level_graph.h"
 #include "movement_manager.h"
 #include "location_manager.h"

diff --git a/src/xrGame/ai/stalker/ai_stalker.cpp b/src/xrGame/ai/stalker/ai_stalker.cpp
@@ -38,7 +38,6 @@
 #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"

diff --git a/src/xrGame/game_cl_deathmatch.cpp b/src/xrGame/game_cl_deathmatch.cpp
@@ -949,7 +949,7 @@ void game_cl_Deathmatch::OnRender()
     };
 }
 
-IC bool DM_Compare_Players(game_PlayerState* p1, game_PlayerState* p2)
+bool DM_Compare_Players(game_PlayerState* p1, game_PlayerState* p2)
 {
     if (p1->testFlag(GAME_PLAYER_FLAG_SPECTATOR) && !p2->testFlag(GAME_PLAYER_FLAG_SPECTATOR))
         return false;

diff --git a/src/xrGame/game_cl_deathmatch.h b/src/xrGame/game_cl_deathmatch.h
@@ -39,16 +39,16 @@ class game_cl_Deathmatch : public game_cl_mp
 
     virtual void LoadSndMessages();
 
-    virtual bool Is_Rewarding_Allowed() const { return m_cl_dwWarmUp_Time == 0; };
+    virtual bool Is_Rewarding_Allowed() const { return m_cl_dwWarmUp_Time == 0; }
 
 protected:
     struct PresetItem
     {
         u8 SlotID;
         u8 ItemID;
         s16 BigID;
-        PresetItem(u8 Slot, u8 Item) { set(Slot, Item); };
-        PresetItem(s16 Big) { set(Big); };
+        PresetItem(u8 Slot, u8 Item) { set(Slot, Item); }
+        PresetItem(s16 Big) { set(Big); }
         bool operator==(const s16& ID) { return BigID == ID; }
 
         void set(s16 Big)
@@ -136,8 +136,8 @@ class game_cl_Deathmatch : public game_cl_mp
 
     virtual void OnGameMenuRespond_ChangeSkin(NET_Packet& P);
 
-    virtual CUIDialogWnd* GetBuyWnd() { return (CUIDialogWnd*)pCurBuyMenu; };
-    virtual CUIDialogWnd* GetSkinWnd() { return (CUIDialogWnd*)pCurSkinMenu; };
+    virtual CUIDialogWnd* GetBuyWnd() { return (CUIDialogWnd*)pCurBuyMenu; }
+    virtual CUIDialogWnd* GetSkinWnd() { return (CUIDialogWnd*)pCurSkinMenu; }
     virtual void OnVoteStart(NET_Packet& P);
     virtual void OnVoteStop(NET_Packet& P);
     virtual void OnVoteEnd(NET_Packet& P);
@@ -159,7 +159,7 @@ class game_cl_Deathmatch : public game_cl_mp
 
     virtual void OnSwitchPhase_InProgress();
 
-    virtual u8 GetTeamCount() { return 1; };
+    virtual u8 GetTeamCount() { return 1; }
     virtual void OnPlayerFlagsChanged(game_PlayerState* ps);
     virtual void SendPickUpEvent(u16 ID_who, u16 ID_what);
 
@@ -177,4 +177,4 @@ class game_cl_Deathmatch : public game_cl_mp
     void AdditionalAmmoInserter(aditional_ammo_t::value_type const& sect_name);
 };
 
-IC bool DM_Compare_Players(game_PlayerState* p1, game_PlayerState* p2);
+bool DM_Compare_Players(game_PlayerState* p1, game_PlayerState* p2);
diff --git a/src/xrGame/level_changer.cpp b/src/xrGame/level_changer.cpp
@@ -13,7 +13,6 @@
 #include "xrServer_Objects_ALife.h"
 #include "Level.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 "xrAICore/Navigation/game_level_cross_table.h"

diff --git a/src/xrGame/sight_action.cpp b/src/xrGame/sight_action.cpp
@@ -10,7 +10,7 @@
 #include "sight_action.h"
 #include "ai/stalker/ai_stalker.h"
 #include "sight_manager.h"
-#include "xrAICore/Navigation/ai_object_location_impl.h"
+#include "xrAICore/Navigation/ai_object_location.h"
 #include "stalker_movement_manager_smart_cover.h"
 #include "Inventory.h"
 

diff --git a/src/xrGame/stalker_movement_manager_base.cpp b/src/xrGame/stalker_movement_manager_base.cpp
@@ -153,7 +153,7 @@ IC void stalker_movement_manager_base::setup_head_speed(stalker_movement_params&
         m_head.speed = m_danger_head_speed;
 }
 
-IC void stalker_movement_manager_base::add_velocity(int mask, float linear, float compute_angular, float angular)
+void stalker_movement_manager_base::add_velocity(int mask, float linear, float compute_angular, float angular)
 {
     detail().add_velocity(mask, CDetailPathManager::STravelParams(linear, compute_angular, angular));
 }

diff --git a/src/xrGame/stalker_movement_manager_base.h b/src/xrGame/stalker_movement_manager_base.h
@@ -97,7 +97,7 @@ class stalker_movement_manager_base : public CMovementManager
 
 private:
     IC void setup_head_speed(stalker_movement_params& movement_params);
-    IC void add_velocity(int mask, float linear, float compute_angular, float angular);
+    void add_velocity(int mask, float linear, float compute_angular, float angular);
     IC void add_velocity(int mask, float linear, float compute_angular);
     IC void setup_body_orientation();
     void init_velocity_masks();

diff --git a/src/xrGame/visual_memory_manager.cpp b/src/xrGame/visual_memory_manager.cpp
@@ -157,7 +157,7 @@ void CVisualMemoryManager::reload(LPCSTR section)
     }
 }
 
-IC const CVisionParameters& CVisualMemoryManager::current_state() const
+const CVisionParameters& CVisualMemoryManager::current_state() const
 {
     if (m_stalker)
     {

diff --git a/src/xrGame/visual_memory_manager.h b/src/xrGame/visual_memory_manager.h
@@ -136,7 +136,7 @@ class CVisualMemoryManager
     IC const VISIBLES& objects() const;
     IC const RAW_VISIBLES& raw_objects() const;
     IC const NOT_YET_VISIBLES& not_yet_visible_objects() const;
-    IC const CVisionParameters& current_state() const;
+    const CVisionParameters& current_state() const;
     IC squad_mask_type mask() const;
 
 public: