More PCH work for xrGame.

OpenXRay · Aug 5, 2017 · 2409db7 · 2409db7
1 parent c64e28c
commit 2409db7
Show file tree

Hide file tree

Showing 5 changed files with 113 additions and 14 deletions.
diff --git a/src/xrGame/StdAfx.h b/src/xrGame/StdAfx.h
@@ -47,8 +47,100 @@
 #define THROW3 VERIFY3
 #endif
 
+#pragma region
 #include "xrEngine/gamefont.h"
 #include "xrEngine/xr_object.h"
 #include "xrEngine/IGame_Level.h"
-#include "xrPhysics/xrphysics.h"
+#include "xrPhysics/xrPhysics.h"
+#include "xrPhysics/PhysicsShell.h"
 #include "xrServerEntities/smart_cast.h"
+#include "Common/LevelStructure.hpp"
+#include "Common/object_broker.h"
+#include "Actor.h"
+#include "alife_smart_terrain_task.h"
+#include "alife_abstract_registry.h"
+#include "alife_graph_registry.h"
+#include "alife_storage_manager.h"
+#include "attachable_item.h"
+#include "abstract_location_selector.h"
+#include "action_planner.h"
+#include "Explosive.h"
+#include "HudItem.h"
+#include "Inventory.h"
+#include "Level.h"
+#include "memory_manager.h"
+#include "object_handler.h"
+#include "object_handler_planner.h"
+#include "object_manager.h"
+#include "obsolete_queue.h"
+#include "obstacles_query.h"
+#include "patrol_path_manager.h"
+#include "PdaMsg.h"
+#include "PhysicsShellHolder.h"
+#include "PHCollisionDamageReceiver.h"
+#include "PHCommander.h"
+#include "PHDebug.h"
+#include "PHDestroyable.h"
+#include "PHDestroyableNotificate.h"
+#include "PHSkeleton.h"
+#include "space_restrictor.h"
+#include "stalker_animation_manager.h"
+#include "stalker_movement_params.h"
+#include "state_arguments_functions.h"
+#include "static_obstacles_avoider.h"
+#include "steering_behaviour.h"
+#include "string_table.h"
+#include "smart_cover_detail.h"
+#include "sound_player.h"
+#include "team_hierarchy_holder.h"
+#include "Tracer.h"
+#include "visual_memory_manager.h"
+#include "Weapon.h"
+#include "WeaponCustomPistol.h"
+//#include "WeaponMagazined.h"
+#include "xr_time.h"
+#include "ai/monsters/basemonster/base_monster.h"
+#include "UICursor.h"
+#include "UIGameCTA.h"
+#include "ui_defs.h"
+#include "UIGameCustom.h"
+#include "UIStaticItem.h"
+#include "ui/Restrictions.h"
+#include "ui/UI_IB_Static.h"
+#include "ui/UI3tButton.h"
+#include "ui/UIButton.h"
+#include "ui/UIBuyWndBase.h"
+#include "ui/UIBuyWndShared.h"
+#include "ui/UICellItem.h"
+#include "ui/UICustomEdit.h"
+#include "ui/UIDialogWnd.h"
+#include "ui/UIEditBox.h"
+#include "ui/UIFrameLineWnd.h"
+#include "ui/UIFrameWindow.h"
+#include "ui/UIGameLog.h"
+#include "ui/UIHelper.h"
+#include "ui/UIHint.h"
+#include "ui/UIInteractiveBackground.h"
+#include "ui/UIInventoryUtilities.h"
+#include "ui/UIListBox.h"
+#include "ui/UIMainIngameWnd.h"
+#include "ui/UIProgressBar.h"
+#include "ui/UIOptionsItem.h"
+#include "ui/UIScrollView.h"
+//#include "ui/UIStatic.h"
+#include "ui/UISubLine.h"
+#include "ui/UIXmlInit.h"
+#include "Include/xrRender/Kinematics.h"
+#include "xrAICore/Navigation/graph_abstract.h"
+#include "xrAICore/Navigation/ai_object_location.h"
+#include "xrCore/_vector3d_ext.h"
+#include "xrEngine/CameraBase.h"
+#include "xrEngine/CustomHUD.h"
+#include "xrEngine/Effector.h"
+#include "xrEngine/EffectorPP.h"
+#include "xrEngine/GameMtlLib.h"
+#include "xrEngine/LightAnimLibrary.h"
+#include "xrPhysics/PHObject.h"
+#include "xrPhysics/PHUpdateObject.h"
+#include "xrServerEntities/alife_monster_brain.h"
+#pragma endregion Bloat galore!
diff --git a/src/xrGame/object_handler_planner.h b/src/xrGame/object_handler_planner.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include "action_planner.h"
+#include "ai/stalker/ai_stalker.h"
 
 class CAI_Stalker;
 class CInventoryItem;

diff --git a/src/xrGame/xrGame.vcxproj.filters b/src/xrGame/xrGame.vcxproj.filters
@@ -2287,6 +2287,9 @@
     <Filter Include="Core\Server\QR2 callbacks">
       <UniqueIdentifier>{0e29aa42-d79c-425a-994b-c18169f076de}</UniqueIdentifier>
     </Filter>
+    <Filter Include="PCH">
+      <UniqueIdentifier>{c2cce2fe-498b-4192-baf4-c5a1bf9717f0}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="mt_config.h">
@@ -4653,12 +4656,6 @@
     <ClInclude Include="ai_space_inline.h">
       <Filter>AI\ASpace</Filter>
     </ClInclude>
-    <ClInclude Include="..\xrServerEntities\pch_script.h">
-      <Filter>Core</Filter>
-    </ClInclude>
-    <ClInclude Include="StdAfx.h">
-      <Filter>Core</Filter>
-    </ClInclude>
     <ClInclude Include="CameraFirstEye.h">
       <Filter>Core\Client\Cameras</Filter>
     </ClInclude>
@@ -6651,6 +6648,12 @@
     <ClInclude Include="..\Externals\GameSpy\src\GameSpy\md5.h">
       <Filter>Core\Client\Level\ClientDigestComputer</Filter>
     </ClInclude>
+    <ClInclude Include="..\xrServerEntities\pch_script.h">
+      <Filter>PCH</Filter>
+    </ClInclude>
+    <ClInclude Include="StdAfx.h">
+      <Filter>PCH</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="damage_manager.cpp">
@@ -8015,12 +8018,6 @@
     <ClCompile Include="ai_space.cpp">
       <Filter>AI\ASpace</Filter>
     </ClCompile>
-    <ClCompile Include="..\xrServerEntities\pch_script.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
-    <ClCompile Include="StdAfx.cpp">
-      <Filter>Core</Filter>
-    </ClCompile>
     <ClCompile Include="CameraFirstEye.cpp">
       <Filter>Core\Client\Cameras</Filter>
     </ClCompile>
@@ -10160,6 +10157,12 @@
     <ClCompile Include="..\Externals\GameSpy\src\GameSpy\md5c.c">
       <Filter>Core\Client\Level\ClientDigestComputer</Filter>
     </ClCompile>
+    <ClCompile Include="..\xrServerEntities\pch_script.cpp">
+      <Filter>PCH</Filter>
+    </ClCompile>
+    <ClCompile Include="StdAfx.cpp">
+      <Filter>PCH</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="ai\monsters\chimera\chimera_attack_state.h">

diff --git a/src/xrPhysics/DamageSource.h b/src/xrPhysics/DamageSource.h
@@ -1,10 +1,12 @@
 #pragma once
 
+#include "xrCore/xrDebug_macros.h" // ONLY for pragma todo!
+#pragma todo("__declspec(novtable) for IDamageSource ?")
 class IDamageSource
 {
 public:
     virtual ~IDamageSource(){};
     virtual void SetInitiator(u16 id) = 0;
     virtual u16 Initiator() = 0;
-    virtual IDamageSource* cast_IDamageSource() = 0; //{return this	;}
+    virtual IDamageSource* cast_IDamageSource() = 0; //{ return this; }
 };
diff --git a/src/xrPhysics/iphysics_scripted.h b/src/xrPhysics/iphysics_scripted.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include "xrServerEntities/smart_cast.h" // get_script_wrapper() needs it
 class iphysics_scripted;
 class iphysics_game_scripted
 {