Skip to content

Commit 2409db7

Browse files
tamlin-mikeXottab-DUTY
tamlin-mike
authored and
Xottab-DUTY
committed
More PCH work for xrGame.
1 parent c64e28c commit 2409db7

5 files changed

Lines changed: 113 additions & 14 deletions

File tree

‎src/xrGame/StdAfx.h‎

Lines changed: 93 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,100 @@
4747
#define THROW3 VERIFY3
4848
#endif
4949

50+
#pragma region
5051
#include "xrEngine/gamefont.h"
5152
#include "xrEngine/xr_object.h"
5253
#include "xrEngine/IGame_Level.h"
53-
#include "xrPhysics/xrphysics.h"
54+
#include "xrPhysics/xrPhysics.h"
55+
#include "xrPhysics/PhysicsShell.h"
5456
#include "xrServerEntities/smart_cast.h"
57+
#include "Common/LevelStructure.hpp"
58+
#include "Common/object_broker.h"
59+
#include "Actor.h"
60+
#include "alife_smart_terrain_task.h"
61+
#include "alife_abstract_registry.h"
62+
#include "alife_graph_registry.h"
63+
#include "alife_storage_manager.h"
64+
#include "attachable_item.h"
65+
#include "abstract_location_selector.h"
66+
#include "action_planner.h"
67+
#include "Explosive.h"
68+
#include "HudItem.h"
69+
#include "Inventory.h"
70+
#include "Level.h"
71+
#include "memory_manager.h"
72+
#include "object_handler.h"
73+
#include "object_handler_planner.h"
74+
#include "object_manager.h"
75+
#include "obsolete_queue.h"
76+
#include "obstacles_query.h"
77+
#include "patrol_path_manager.h"
78+
#include "PdaMsg.h"
79+
#include "PhysicsShellHolder.h"
80+
#include "PHCollisionDamageReceiver.h"
81+
#include "PHCommander.h"
82+
#include "PHDebug.h"
83+
#include "PHDestroyable.h"
84+
#include "PHDestroyableNotificate.h"
85+
#include "PHSkeleton.h"
86+
#include "space_restrictor.h"
87+
#include "stalker_animation_manager.h"
88+
#include "stalker_movement_params.h"
89+
#include "state_arguments_functions.h"
90+
#include "static_obstacles_avoider.h"
91+
#include "steering_behaviour.h"
92+
#include "string_table.h"
93+
#include "smart_cover_detail.h"
94+
#include "sound_player.h"
95+
#include "team_hierarchy_holder.h"
96+
#include "Tracer.h"
97+
#include "visual_memory_manager.h"
98+
#include "Weapon.h"
99+
#include "WeaponCustomPistol.h"
100+
//#include "WeaponMagazined.h"
101+
#include "xr_time.h"
102+
#include "ai/monsters/basemonster/base_monster.h"
103+
#include "UICursor.h"
104+
#include "UIGameCTA.h"
105+
#include "ui_defs.h"
106+
#include "UIGameCustom.h"
107+
#include "UIStaticItem.h"
108+
#include "ui/Restrictions.h"
109+
#include "ui/UI_IB_Static.h"
110+
#include "ui/UI3tButton.h"
111+
#include "ui/UIButton.h"
112+
#include "ui/UIBuyWndBase.h"
113+
#include "ui/UIBuyWndShared.h"
114+
#include "ui/UICellItem.h"
115+
#include "ui/UICustomEdit.h"
116+
#include "ui/UIDialogWnd.h"
117+
#include "ui/UIEditBox.h"
118+
#include "ui/UIFrameLineWnd.h"
119+
#include "ui/UIFrameWindow.h"
120+
#include "ui/UIGameLog.h"
121+
#include "ui/UIHelper.h"
122+
#include "ui/UIHint.h"
123+
#include "ui/UIInteractiveBackground.h"
124+
#include "ui/UIInventoryUtilities.h"
125+
#include "ui/UIListBox.h"
126+
#include "ui/UIMainIngameWnd.h"
127+
#include "ui/UIProgressBar.h"
128+
#include "ui/UIOptionsItem.h"
129+
#include "ui/UIScrollView.h"
130+
//#include "ui/UIStatic.h"
131+
#include "ui/UISubLine.h"
132+
#include "ui/UIXmlInit.h"
133+
#include "Include/xrRender/Kinematics.h"
134+
#include "xrAICore/Navigation/graph_abstract.h"
135+
#include "xrAICore/Navigation/ai_object_location.h"
136+
#include "xrCore/_vector3d_ext.h"
137+
#include "xrEngine/CameraBase.h"
138+
#include "xrEngine/CustomHUD.h"
139+
#include "xrEngine/Effector.h"
140+
#include "xrEngine/EffectorPP.h"
141+
#include "xrEngine/GameMtlLib.h"
142+
#include "xrEngine/LightAnimLibrary.h"
143+
#include "xrPhysics/PHObject.h"
144+
#include "xrPhysics/PHUpdateObject.h"
145+
#include "xrServerEntities/alife_monster_brain.h"
146+
#pragma endregion Bloat galore!

‎src/xrGame/object_handler_planner.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#pragma once
1010

1111
#include "action_planner.h"
12+
#include "ai/stalker/ai_stalker.h"
1213

1314
class CAI_Stalker;
1415
class CInventoryItem;

‎src/xrGame/xrGame.vcxproj.filters‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2287,6 +2287,9 @@
22872287
<Filter Include="Core\Server\QR2 callbacks">
22882288
<UniqueIdentifier>{0e29aa42-d79c-425a-994b-c18169f076de}</UniqueIdentifier>
22892289
</Filter>
2290+
<Filter Include="PCH">
2291+
<UniqueIdentifier>{c2cce2fe-498b-4192-baf4-c5a1bf9717f0}</UniqueIdentifier>
2292+
</Filter>
22902293
</ItemGroup>
22912294
<ItemGroup>
22922295
<ClInclude Include="mt_config.h">
@@ -4653,12 +4656,6 @@
46534656
<ClInclude Include="ai_space_inline.h">
46544657
<Filter>AI\ASpace</Filter>
46554658
</ClInclude>
4656-
<ClInclude Include="..\xrServerEntities\pch_script.h">
4657-
<Filter>Core</Filter>
4658-
</ClInclude>
4659-
<ClInclude Include="StdAfx.h">
4660-
<Filter>Core</Filter>
4661-
</ClInclude>
46624659
<ClInclude Include="CameraFirstEye.h">
46634660
<Filter>Core\Client\Cameras</Filter>
46644661
</ClInclude>
@@ -6651,6 +6648,12 @@
66516648
<ClInclude Include="..\Externals\GameSpy\src\GameSpy\md5.h">
66526649
<Filter>Core\Client\Level\ClientDigestComputer</Filter>
66536650
</ClInclude>
6651+
<ClInclude Include="..\xrServerEntities\pch_script.h">
6652+
<Filter>PCH</Filter>
6653+
</ClInclude>
6654+
<ClInclude Include="StdAfx.h">
6655+
<Filter>PCH</Filter>
6656+
</ClInclude>
66546657
</ItemGroup>
66556658
<ItemGroup>
66566659
<ClCompile Include="damage_manager.cpp">
@@ -8015,12 +8018,6 @@
80158018
<ClCompile Include="ai_space.cpp">
80168019
<Filter>AI\ASpace</Filter>
80178020
</ClCompile>
8018-
<ClCompile Include="..\xrServerEntities\pch_script.cpp">
8019-
<Filter>Core</Filter>
8020-
</ClCompile>
8021-
<ClCompile Include="StdAfx.cpp">
8022-
<Filter>Core</Filter>
8023-
</ClCompile>
80248021
<ClCompile Include="CameraFirstEye.cpp">
80258022
<Filter>Core\Client\Cameras</Filter>
80268023
</ClCompile>
@@ -10160,6 +10157,12 @@
1016010157
<ClCompile Include="..\Externals\GameSpy\src\GameSpy\md5c.c">
1016110158
<Filter>Core\Client\Level\ClientDigestComputer</Filter>
1016210159
</ClCompile>
10160+
<ClCompile Include="..\xrServerEntities\pch_script.cpp">
10161+
<Filter>PCH</Filter>
10162+
</ClCompile>
10163+
<ClCompile Include="StdAfx.cpp">
10164+
<Filter>PCH</Filter>
10165+
</ClCompile>
1016310166
</ItemGroup>
1016410167
<ItemGroup>
1016510168
<CustomBuild Include="ai\monsters\chimera\chimera_attack_state.h">

‎src/xrPhysics/DamageSource.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#pragma once
22

3+
#include "xrCore/xrDebug_macros.h" // ONLY for pragma todo!
4+
#pragma todo("__declspec(novtable) for IDamageSource ?")
35
class IDamageSource
46
{
57
public:
68
virtual ~IDamageSource(){};
79
virtual void SetInitiator(u16 id) = 0;
810
virtual u16 Initiator() = 0;
9-
virtual IDamageSource* cast_IDamageSource() = 0; //{return this ;}
11+
virtual IDamageSource* cast_IDamageSource() = 0; //{ return this; }
1012
};

‎src/xrPhysics/iphysics_scripted.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#pragma once
55

6+
#include "xrServerEntities/smart_cast.h" // get_script_wrapper() needs it
67
class iphysics_scripted;
78
class iphysics_game_scripted
89
{

0 commit comments

Comments
 (0)