diff --git a/src/3rd party/cximage/CxImage/ximacfg.h b/src/3rd party/cximage/CxImage/ximacfg.h index 3be18189db..200262d77c 100644 --- a/src/3rd party/cximage/CxImage/ximacfg.h +++ b/src/3rd party/cximage/CxImage/ximacfg.h @@ -11,7 +11,7 @@ extern "C" void* cxrealloc(void* ptr, size_t size); #include "../../../xrCore/xrCore.h" #ifdef DEBUG -#include "../../../xrCore/ftimer.h" +#include "../../../xrCore/FTimer.h" #endif //#ifdef DEBUG # define CXIMAGE_API diff --git a/src/3rd party/ode/include/ode/collision.h b/src/3rd party/ode/include/ode/collision.h index 8c14f80bb6..53bf868ea3 100644 --- a/src/3rd party/ode/include/ode/collision.h +++ b/src/3rd party/ode/include/ode/collision.h @@ -23,9 +23,9 @@ #ifndef _ODE_COLLISION_H_ #define _ODE_COLLISION_H_ -#include "../../include/ode/common.h" -#include "../../include/ode/collision_space.h" -#include "../../include/ode/contact.h" +#include "common.h" +#include "collision_space.h" +#include "contact.h" #ifdef __cplusplus extern "C" { diff --git a/src/3rd party/ode/include/ode/collision_space.h b/src/3rd party/ode/include/ode/collision_space.h index a0faf4fc89..f57e0825ee 100644 --- a/src/3rd party/ode/include/ode/collision_space.h +++ b/src/3rd party/ode/include/ode/collision_space.h @@ -23,7 +23,7 @@ #ifndef _ODE_COLLISION_SPACE_H_ #define _ODE_COLLISION_SPACE_H_ -#include "../../include/ode/common.h" +#include "common.h" #ifdef __cplusplus extern "C" { diff --git a/src/3rd party/ode/include/ode/odecpp_collision.h b/src/3rd party/ode/include/ode/odecpp_collision.h index e1704d53c9..8f5122c88c 100644 --- a/src/3rd party/ode/include/ode/odecpp_collision.h +++ b/src/3rd party/ode/include/ode/odecpp_collision.h @@ -27,7 +27,7 @@ #define _ODE_ODECPP_COLLISION_H_ #ifdef __cplusplus -#include "../../include/ode/error.h" +#include "error.h" class dGeom { diff --git a/src/Editors/ActorEditor/UIMainForm.cpp b/src/Editors/ActorEditor/UIMainForm.cpp index fec326a032..c150d4b0c0 100644 --- a/src/Editors/ActorEditor/UIMainForm.cpp +++ b/src/Editors/ActorEditor/UIMainForm.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "../XrECore/Editor/EditorChooseEvents.h" +#include "../xrECore/Editor/EditorChooseEvents.h" UIMainForm* MainForm = nullptr; UIMainForm::UIMainForm() { diff --git a/src/Editors/ActorEditor/UI_ActorTools.cpp b/src/Editors/ActorEditor/UI_ActorTools.cpp index 5d8f3ec3ed..99a99b731c 100644 --- a/src/Editors/ActorEditor/UI_ActorTools.cpp +++ b/src/Editors/ActorEditor/UI_ActorTools.cpp @@ -4,8 +4,8 @@ #pragma hdrstop #define dSINGLE #include "../../Include/xrRender/animation_blend.h" -#include "..\..\XrPhysics\Physics.h" -#include "..\XrECore\Editor\EditMesh.h" +#include "../../xrPhysics/Physics.h" +#include "../xrECore/Editor/EditMesh.h" #include "../../Layers/xrRender/KinematicAnimatedDefs.h" #include "../../Layers/xrRender/SkeletonAnimated.h" @@ -54,7 +54,7 @@ CActorTools::~CActorTools() } #include "../../xrEngine/IGame_Persistent.h" -#include "..\xrECore\editor\d3dutils.h" +#include "../xrECore/Editor/D3DUtils.h" const u32 color_bone_sel_color = 0xFFFFFFFF; const u32 color_bone_norm_color = 0xFFFFFF00; diff --git a/src/Editors/ActorEditor/UI_ActorToolsMotions.cpp b/src/Editors/ActorEditor/UI_ActorToolsMotions.cpp index 2c45e0fbb9..d29db25bd5 100644 --- a/src/Editors/ActorEditor/UI_ActorToolsMotions.cpp +++ b/src/Editors/ActorEditor/UI_ActorToolsMotions.cpp @@ -4,14 +4,14 @@ #pragma hdrstop #include "UI_ActorTools.h" -#include "../xrECore/Editor/UI_Main.h" +#include "../xrECore/Editor/ui_main.h" #include "../xrECore/Editor/EditObject.h" #include "../../xrEngine/motion.h" #include "../../xrEngine/bone.h" #include "../../Layers/xrRender/SkeletonAnimated.h" -#include "../../xrEngine/fmesh.h" -#include "../xrEProps/folderlib.h" -#include "../../xrphysics/physicsshell.h" +#include "../../xrEngine/Fmesh.h" +#include "../xrEProps/FolderLib.h" +#include "../../xrPhysics/PhysicsShell.h" //--------------------------------------------------------------------------- MotionID EngineModel::FindMotionID(LPCSTR name, u16 slot) { diff --git a/src/Editors/ActorEditor/UI_ActorToolsProps.cpp b/src/Editors/ActorEditor/UI_ActorToolsProps.cpp index e4038d8a43..0a2122ffe8 100644 --- a/src/Editors/ActorEditor/UI_ActorToolsProps.cpp +++ b/src/Editors/ActorEditor/UI_ActorToolsProps.cpp @@ -1,8 +1,8 @@ //--------------------------------------------------------------------------- #include "stdafx.h" #pragma hdrstop -#include "..\..\Layers\xrRender\KinematicAnimatedDefs.h" -#include "..\..\Layers\xrRender\SkeletonAnimated.h" +#include "../../Layers/xrRender/KinematicAnimatedDefs.h" +#include "../../Layers/xrRender/SkeletonAnimated.h" //------------------------------------------------------------------------------ void CActorTools::OnObjectItemsFocused(xr_vector& items) diff --git a/src/Editors/ActorEditor/imgui_impl_dx9.h b/src/Editors/ActorEditor/imgui_impl_dx9.h index 9c7778e8e6..58b2813fbc 100644 --- a/src/Editors/ActorEditor/imgui_impl_dx9.h +++ b/src/Editors/ActorEditor/imgui_impl_dx9.h @@ -10,7 +10,7 @@ // https://github.com/ocornut/imgui #pragma once -#include "..\XrEUI\stdafx.h" // IMGUI_IMPL_API +#include "../xrEUI/stdafx.h" struct IDirect3DDevice9; diff --git a/src/Editors/ActorEditor/stdafx.h b/src/Editors/ActorEditor/stdafx.h index 6ef85b2924..c2c6504595 100644 --- a/src/Editors/ActorEditor/stdafx.h +++ b/src/Editors/ActorEditor/stdafx.h @@ -1,13 +1,13 @@ #pragma once -#include "..\XrECore\stdafx.h" -#include "..\XrECore\Editor\device.h" -#include "..\XrECore\Editor\UI_MainCommand.h" -#include "..\XrECore\Editor\UI_ToolsCustom.h" -#include "..\XrECore\Editor\ui_main.h" -#include "..\XrECore\Editor\EditorPreferences.h" -#include "..\XrECore\Editor\render.h" -#include "..\XrECore\Editor\UIRenderForm.h" -#include "..\XrECore\Editor\ELog.h" +#include "../xrECore/stdafx.h" +#include "../xrECore/Editor/device.h" +#include "../xrECore/Editor/UI_MainCommand.h" +#include "../xrECore/Editor/UI_ToolsCustom.h" +#include "../xrECore/Editor/ui_main.h" +#include "../xrECore/Editor/EditorPreferences.h" +#include "../xrECore/Editor/render.h" +#include "../xrECore/Editor/UIRenderForm.h" +#include "../xrECore/Editor/ELog.h" #include "UITopBarForm.h" #include "UIMainMenuForm.h" #include "UILeftBarForm.h" diff --git a/src/Editors/LevelEditor/AI/game_spawn_constructor.h b/src/Editors/LevelEditor/AI/game_spawn_constructor.h index 3e01541d0c..43ef38c579 100644 --- a/src/Editors/LevelEditor/AI/game_spawn_constructor.h +++ b/src/Editors/LevelEditor/AI/game_spawn_constructor.h @@ -9,12 +9,12 @@ #pragma once #include "alife_space.h" -#include "xrthread.h" +#include "xrThread.h" #include "graph_abstract.h" #include "../../xrServerEntities/xrServer_Object_Base.h" #include "spawn_constructor_space.h" #include "server_entity_wrapper.h" -#include "../../XrECore/Engine/guid_generator.h" +#include "../../xrECore/Engine/guid_generator.h" class CSE_Abstract; class CLevelSpawnConstructor; class CSE_ALifeCreatureAbstract; diff --git a/src/Editors/LevelEditor/Editor/Scene/scene.cpp b/src/Editors/LevelEditor/Editor/Scene/scene.cpp index 48d7e63fe3..90b239bd85 100644 --- a/src/Editors/LevelEditor/Editor/Scene/scene.cpp +++ b/src/Editors/LevelEditor/Editor/Scene/scene.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "lephysics.h" +#include "LEPhysics.h" #include "../xrEngine/xr_input.h" EScene* Scene; diff --git a/src/Editors/LevelEditor/Editor/Tools/StaticObject/ESceneObjectToolsExportBreakable.cpp b/src/Editors/LevelEditor/Editor/Tools/StaticObject/ESceneObjectToolsExportBreakable.cpp index ab8855376a..c31943103b 100644 --- a/src/Editors/LevelEditor/Editor/Tools/StaticObject/ESceneObjectToolsExportBreakable.cpp +++ b/src/Editors/LevelEditor/Editor/Tools/StaticObject/ESceneObjectToolsExportBreakable.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\..\Utils\GeometryPartExtractor.h" +#include "../../Utils/GeometryPartExtractor.h" #include "../xrServerEntities/xrServer_Object_Base.h" #include "../xrServerEntities/xrServer_Objects_Abstract.h" #include "../xrServerEntities/xrServer_Objects.h" diff --git a/src/Editors/LevelEditor/Editor/UI_LevelMain.cpp b/src/Editors/LevelEditor/Editor/UI_LevelMain.cpp index 24726219a7..1c01a141ec 100644 --- a/src/Editors/LevelEditor/Editor/UI_LevelMain.cpp +++ b/src/Editors/LevelEditor/Editor/UI_LevelMain.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "Utils\Cursor3D.h" +#include "Utils/Cursor3D.h" #include "..\xrengine\GameFont.h" #include "UI\UIEditLibrary.h" #include "Editor/Utils/ContentView.h" diff --git a/src/Editors/LevelEditor/Editor/Utils/Gizmo/IM_Manipulator.cpp b/src/Editors/LevelEditor/Editor/Utils/Gizmo/IM_Manipulator.cpp index d21f7159a5..1673f37b47 100644 --- a/src/Editors/LevelEditor/Editor/Utils/Gizmo/IM_Manipulator.cpp +++ b/src/Editors/LevelEditor/Editor/Utils/Gizmo/IM_Manipulator.cpp @@ -6,7 +6,7 @@ #include "IM_Manipulator.h" #include "../xrEUI/imgui.h" #include "../xrEUI/ImGuizmo.h" -#include "../../scene/scene.h" +#include "../../Scene/scene.h" #include "../../UI_LevelTools.h" #include "../../Entry/CustomObject.h" diff --git a/src/Editors/LevelEditor/stdafx.h b/src/Editors/LevelEditor/stdafx.h index d0cd962d6a..4b72f461e1 100644 --- a/src/Editors/LevelEditor/stdafx.h +++ b/src/Editors/LevelEditor/stdafx.h @@ -1,32 +1,32 @@ #pragma once -#include "../XrECore/stdafx.h" +#include "../xrECore/stdafx.h" #include "../../xrScripts/stdafx.h" #include "../xrEngine/xrLevel.h" -#include "../XrECore/Editor/device.h" -#include "../XrECore/Editor/UI_MainCommand.h" -#include "../XrECore/Editor/UI_ToolsCustom.h" -#include "../XrECore/Editor/ui_main.h" -#include "../XrECore/Editor/GeometryCollector.h" -#include "../XrECore/Editor/EditorPreferences.h" -#include "../XrECore/Editor/render.h" -#include "../XrECore/Editor/UIRenderForm.h" -#include "../XrECore/Editor/ELog.h" -#include "../XrECore/Editor/tlsprite.h" -#include "../XrECore/Editor/EditObject.h" -#include "../XrECore/Editor/EditMesh.h" -#include "../XrECore/Editor/D3DUtils.h" -#include "../XrEcore/Editor/PhysicsShellHolderEditorBase.h" +#include "../xrECore/Editor/device.h" +#include "../xrECore/Editor/UI_MainCommand.h" +#include "../xrECore/Editor/UI_ToolsCustom.h" +#include "../xrECore/Editor/ui_main.h" +#include "../xrECore/Editor/GeometryCollector.h" +#include "../xrECore/Editor/EditorPreferences.h" +#include "../xrECore/Editor/render.h" +#include "../xrECore/Editor/UIRenderForm.h" +#include "../xrECore/Editor/ELog.h" +#include "../xrECore/Editor/TLSPRITE.h" +#include "../xrECore/Editor/EditObject.h" +#include "../xrECore/Editor/EditMesh.h" +#include "../xrECore/Editor/D3DUtils.h" +#include "../xrECore/Editor/PhysicsShellHolderEditorBase.h" #include "../../utils/ETools/ETools.h" -#include "../XrECore/Engine/Texture.h" -#include "../XrECore/Editor/Library.h" -#include "../XrECore/Editor/ImageManager.h" -#include "../XrECore/Editor/pick_defs.h" -#include "../XrECore/Editor/SoundManager.h" -#include "../XrECore/Editor/EDetailModel.h" -#include "../XrECore/Engine/guid_generator.h" -#include "../XrECore/Editor/ExportSkeleton.h" +#include "../xrECore/Engine/Texture.h" +#include "../xrECore/Editor/Library.h" +#include "../xrECore/Editor/ImageManager.h" +#include "../xrECore/Editor/pick_defs.h" +#include "../xrECore/Editor/SoundManager.h" +#include "../xrECore/Editor/EDetailModel.h" +#include "../xrECore/Engine/guid_generator.h" +#include "../xrECore/Editor/ExportSkeleton.h" #include "../FreeMagic/MgcAppr3DPlaneFit.h" #include "../FreeMagic/MgcEigen.h" #include "../FreeMagic/MgcLinearSystem.h" @@ -40,7 +40,7 @@ #include "../../xrEngine/envelope.h" #include "../../xrEngine/xrHemisphere.h" #include "../../xrServerEntities/LevelGameDef.h" -#include "..\..\Layers\xrRender\SkeletonAnimated.h" +#include "../../Layers/xrRender/SkeletonAnimated.h" #include "../../xrEngine/ObjectAnimator.h" #include "../../xrEngine/xr_efflensflare.h" #include "../xrECore/Editor/du_box.h" @@ -53,13 +53,13 @@ #include "../../xrEngine/CameraManager.h" #include "../../xrEngine/IGame_Level.h" #include "../../xrEngine/x_ray.h" -#include "..\..\XrCDB\xrCDB.h" -#include "..\..\XrCDB\ISpatial.h" -#include "..\..\Include\xrRender\ParticleCustom.h" -#include "..\..\Layers\xrRender\DetailManager.h" -#include "..\..\Layers\xrRender\ParticleEffect.h" -#include "..\..\Layers\xrRender\ParticleEffectDef.h" -#include "..\..\Layers\xrRender\ParticleGroup.h" +#include "../../xrCDB/xrCDB.h" +#include "../../xrCDB/ISpatial.h" +#include "../../Include/xrRender/ParticleCustom.h" +#include "../../Layers/xrRender/DetailManager.h" +#include "../../Layers/xrRender/ParticleEffect.h" +#include "../../Layers/xrRender/ParticleEffectDef.h" +#include "../../Layers/xrRender/ParticleGroup.h" #include "../../xrEngine/EngineAPI.h" #include "../../xrEngine/cl_intersect.h" diff --git a/src/Editors/ParticleEditor/PSLibraryEditor.cpp b/src/Editors/ParticleEditor/PSLibraryEditor.cpp index d76bf0f5f3..4b426e8201 100644 --- a/src/Editors/ParticleEditor/PSLibraryEditor.cpp +++ b/src/Editors/ParticleEditor/PSLibraryEditor.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #pragma hdrstop -#include "..\..\Layers\xrRender\PSLibrary.h" -#include "..\..\Layers\xrRender\ParticleEffect.h" -#include "..\..\Layers\xrRender\ParticleGroup.h" +#include "../../Layers/xrRender/PSLibrary.h" +#include "../../Layers/xrRender/ParticleEffect.h" +#include "../../Layers/xrRender/ParticleGroup.h" //------------------------------------------------------------------------------ diff --git a/src/Editors/ParticleEditor/ParticleEffectActionsImpl.cpp b/src/Editors/ParticleEditor/ParticleEffectActionsImpl.cpp index 7728a94259..2b9fb37e23 100644 --- a/src/Editors/ParticleEditor/ParticleEffectActionsImpl.cpp +++ b/src/Editors/ParticleEditor/ParticleEffectActionsImpl.cpp @@ -2,9 +2,9 @@ #include "stdafx.h" #pragma hdrstop -#include "../XrECore/Editor/ParticleEffectActions.h" -#include "../xrEProps/folderlib.h" -#include "../../Editors/Public/PropertiesListHelper.h" +#include "../xrECore/Editor/ParticleEffectActions.h" +#include "../xrEProps/FolderLib.h" +#include "../Public/PropertiesListHelper.h" #include "../../xrParticles/particle_actions_collection.h" #include "../../xrParticles/noise.h" diff --git a/src/Editors/ParticleEditor/ParticleEffectEditor.cpp b/src/Editors/ParticleEditor/ParticleEffectEditor.cpp index d4541200c5..1a7aa204d2 100644 --- a/src/Editors/ParticleEditor/ParticleEffectEditor.cpp +++ b/src/Editors/ParticleEditor/ParticleEffectEditor.cpp @@ -4,10 +4,10 @@ #ifdef _PARTICLE_EDITOR -#include "..\..\Layers\xrRender\ParticleEffect.h" -#include "..\xrEcore\Editor\ParticleEffectActions.h" +#include "../../Layers/xrRender/ParticleEffect.h" +#include "../xrECore/Editor/ParticleEffectActions.h" #include "../Public/PropertiesListHelper.h" -#include "ui_particletools.h" +#include "UI_ParticleTools.h" #include "../xrEProps/FolderLib.h" BOOL PS::CPEDef::Equal(const CPEDef* pe) diff --git a/src/Editors/ParticleEditor/ParticleGroupEditor.cpp b/src/Editors/ParticleEditor/ParticleGroupEditor.cpp index 660980c830..aac67421d8 100644 --- a/src/Editors/ParticleEditor/ParticleGroupEditor.cpp +++ b/src/Editors/ParticleEditor/ParticleGroupEditor.cpp @@ -2,9 +2,9 @@ #include "stdafx.h" #pragma hdrstop -#include "..\..\Layers\xrRender\ParticleGroup.h" +#include "../../Layers/xrRender/ParticleGroup.h" #include "../Public/PropertiesListHelper.h" -#include "ui_particletools.h" +#include "UI_ParticleTools.h" BOOL PS::CPGDef::SEffect::Equal(const SEffect& src) { diff --git a/src/Editors/ParticleEditor/UIMainForm.cpp b/src/Editors/ParticleEditor/UIMainForm.cpp index 3301c9e2a2..5a9a929873 100644 --- a/src/Editors/ParticleEditor/UIMainForm.cpp +++ b/src/Editors/ParticleEditor/UIMainForm.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "../XrECore/Editor/EditorChooseEvents.h" +#include "../xrECore/Editor/EditorChooseEvents.h" UIMainForm* MainForm = nullptr; UIMainForm::UIMainForm() { diff --git a/src/Editors/ParticleEditor/UI_ParticleTools.cpp b/src/Editors/ParticleEditor/UI_ParticleTools.cpp index 6e003f54ba..7cbfe4812e 100644 --- a/src/Editors/ParticleEditor/UI_ParticleTools.cpp +++ b/src/Editors/ParticleEditor/UI_ParticleTools.cpp @@ -872,7 +872,7 @@ PS::CPGDef* CParticleTool::AppendPG(PS::CPGDef* src, const char* path) return S; } -#include "../XrECore/Editor/EditMesh.h" +#include "../xrECore/Editor/EditMesh.h" bool CParticleTool::RayPick(const Fvector& start, const Fvector& dir, float& dist, Fvector* pt, Fvector* n) { diff --git a/src/Editors/ParticleEditor/UI_ParticleTools.h b/src/Editors/ParticleEditor/UI_ParticleTools.h index 7dbdb2785c..44e1b7b364 100644 --- a/src/Editors/ParticleEditor/UI_ParticleTools.h +++ b/src/Editors/ParticleEditor/UI_ParticleTools.h @@ -3,9 +3,9 @@ #define UI_ParticleToolsH //. ?#include "ParticleSystem.h" -#include "..\..\Layers\xrRender\ParticleEffect.h" -#include "..\..\Layers\xrRender\ParticleGroup.h" -#include "..\..\xrEngine\pure.h" +#include "../../Layers/xrRender/ParticleEffect.h" +#include "../../Layers/xrRender/ParticleGroup.h" +#include "../../xrEngine/pure.h" // refs class CEditableObject; diff --git a/src/Editors/ParticleEditor/stdafx.h b/src/Editors/ParticleEditor/stdafx.h index 6476afc005..64921f8270 100644 --- a/src/Editors/ParticleEditor/stdafx.h +++ b/src/Editors/ParticleEditor/stdafx.h @@ -1,14 +1,14 @@ #pragma once -#include "..\xrECore\stdafx.h" -#include "..\xrECore\Editor\device.h" -#include "..\xrECore\Editor\UI_MainCommand.h" -#include "..\xrECore\Editor\UI_ToolsCustom.h" -#include "..\xrECore\Editor\ui_main.h" -#include "..\xrECore\Editor\EditorPreferences.h" -#include "..\xrECore\Editor\render.h" -#include "..\xrECore\Editor\UIRenderForm.h" -#include "..\xrECore\Editor\ELog.h" -#include "..\xrECore\Editor\Library.h" +#include "../xrECore/stdafx.h" +#include "../xrECore/Editor/device.h" +#include "../xrECore/Editor/UI_MainCommand.h" +#include "../xrECore/Editor/UI_ToolsCustom.h" +#include "../xrECore/Editor/ui_main.h" +#include "../xrECore/Editor/EditorPreferences.h" +#include "../xrECore/Editor/render.h" +#include "../xrECore/Editor/UIRenderForm.h" +#include "../xrECore/Editor/ELog.h" +#include "../xrECore/Editor/Library.h" #include "../xrECore/Editor/D3DUtils.h" diff --git a/src/Editors/Public/NVMeshMenderTwo.cpp b/src/Editors/Public/NVMeshMenderTwo.cpp index 62faffd567..16a38a79a3 100644 --- a/src/Editors/Public/NVMeshMenderTwo.cpp +++ b/src/Editors/Public/NVMeshMenderTwo.cpp @@ -28,7 +28,7 @@ BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ #include "stdafx.h" -#include "nvMeshMender.h" +#include "NVMeshMender.h" #include "assert.h" namespace diff --git a/src/Editors/Public/PropertiesListTypes.h b/src/Editors/Public/PropertiesListTypes.h index 2bc9a13626..6992fce07d 100644 --- a/src/Editors/Public/PropertiesListTypes.h +++ b/src/Editors/Public/PropertiesListTypes.h @@ -1,705 +1,705 @@ -#pragma once - -#include "..\..\xrServerEntities\gametype_chooser.h" -#include "WaveForm.H" - - -#pragma pack( push,1 ) - -//--------------------------------------------------------------------------- -enum EPropType{ - PROP_UNDEF = -1, - PROP_CAPTION = 0x1000, - PROP_SHORTCUT, - PROP_BUTTON, - PROP_CHOOSE, - PROP_NUMERIC, // {u8,u16,u32,s8,s16,s32,f32} - PROP_BOOLEAN, - PROP_FLAG, - PROP_VECTOR, - PROP_TOKEN, - PROP_RTOKEN, - PROP_RLIST, - PROP_COLOR, - PROP_FCOLOR, - PROP_VCOLOR, - PROP_RTEXT, - PROP_STEXT, - PROP_WAVE, - PROP_CANVAS, - PROP_TIME, - - PROP_CTEXT, - PROP_CLIST, - PROP_SH_TOKEN, - PROP_TEXTURE2, - PROP_GAMETYPE, -}; - -// refs -struct xr_token; -class PropValue; -class PropItem; -using PropItemVec = xr_vector; -using PropItemIt = PropItemVec::iterator; - - -//------------------------------------------------------------------------------ -#ifdef _EDITOR -#ifndef ImTextureID -#include "..\xrEUI\stdafx.h" -#endif -#include "../xrEProps/ChooseTypes.H" -#else -#include "../xrEProps/ChooseTypesHelper.H" -class UIPropertiesForm; -class ChooseItemVec; -#endif -//------------------------------------------------------------------------------ -typedef fastdelegate::FastDelegate TOnDrawTextEvent; -typedef fastdelegate::FastDelegate TOnClick; -//------------------------------------------------------------------------------ - -class PropValue -{ - friend class CPropHelper; - friend class PropItem; -protected: - PropItem* m_Owner; -public: - size_t tag; -public: - // base events - typedef fastdelegate::FastDelegate TOnChange; - TOnChange OnChangeEvent; -public: - PropValue ():tag(0),m_Owner(0),OnChangeEvent(0){;} - virtual ~PropValue (){} - virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText)=0; - virtual void ResetValue ()=0; - virtual bool Equal (PropValue* prop)=0; - IC PropItem* Owner (){return m_Owner;} -}; -//------------------------------------------------------------------------------ - -template -IC void set_value(T& val, const T& _val) -{ - val = _val; -}; - -template -class CustomValue: public PropValue -{ -public: - using TYPE = T; -public: - TYPE init_value; - TYPE* value; -public: - typedef fastdelegate::FastDelegate TOnBeforeEditEvent; - typedef fastdelegate::FastDelegate TOnAfterEditEvent; - TOnBeforeEditEvent OnBeforeEditEvent; - TOnAfterEditEvent OnAfterEditEvent; -public: - CustomValue (T* val) - { - OnBeforeEditEvent = 0; - OnAfterEditEvent = 0; - set_value (value,val); - set_value (init_value,*val); - }; - virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText){return "";} - virtual bool Equal (PropValue* val) - { - CustomValue* prop = (CustomValue*)val; - return (*value==*prop->value); - } - virtual const T& GetValue (){return *value; } - virtual void ResetValue (){set_value(*value,init_value);} - bool ApplyValue (const T& val) - { - if (!(*value==val)){ - set_value (*value,val); - return true; - } - return false; - } -}; - -class PropItem -{ - friend class CPropHelper; - friend class UIPropertiesForm; - shared_str key; - EPropType type; - void* item; -public: - using PropValueVec = xr_vector; - using PropValueIt = PropValueVec::iterator; - -private: - PropValueVec values; - UIPropertiesForm* m_Owner; -// events -public: - typedef fastdelegate::FastDelegate TOnPropItemFocused; - TOnDrawTextEvent OnDrawTextEvent; - TOnPropItemFocused OnItemFocused; - TOnClick OnClickEvent; -public: - u32 prop_color; - u32 val_color; - Irect draw_rect; -public: - enum{ - flDisabled = (1<<0), - flShowCB = (1<<1), - flCBChecked = (1<<2), - flMixed = (1<<3), - flDrawThumbnail = (1<<4), - flSorted = (1<<5), - flIgnoreMixed = (1<<6), - }; - Flags32 m_Flags; -public: - PropItem (EPropType _type):type(_type),prop_color(0),val_color(0),item(0),key(0),OnClickEvent(0),OnDrawTextEvent(0),OnItemFocused(0){m_Flags.zero();} - virtual ~PropItem () - { - for (PropValueIt it=values.begin(); values.end() != it; ++it) - xr_delete (*it); - }; - IC UIPropertiesForm* Owner (){return m_Owner;} - void SetName (const shared_str& name) - { - key=name; - } - IC void ResetValues () - { - for (PropValueIt it=values.begin(); values.end() != it; ++it) - (*it)->ResetValue(); - CheckMixed (); - } - IC void AppendValue (PropValue* value) - { - if (!values.empty()&&!value->Equal(values.front())) - m_Flags.set (flMixed,TRUE); - values.push_back(value); - } - IC xr_string GetDrawText () - { - VERIFY(!values.empty()); +#pragma once + +#include "../../xrServerEntities/gametype_chooser.h" +#include "WaveForm.h" + + +#pragma pack( push,1 ) + +//--------------------------------------------------------------------------- +enum EPropType{ + PROP_UNDEF = -1, + PROP_CAPTION = 0x1000, + PROP_SHORTCUT, + PROP_BUTTON, + PROP_CHOOSE, + PROP_NUMERIC, // {u8,u16,u32,s8,s16,s32,f32} + PROP_BOOLEAN, + PROP_FLAG, + PROP_VECTOR, + PROP_TOKEN, + PROP_RTOKEN, + PROP_RLIST, + PROP_COLOR, + PROP_FCOLOR, + PROP_VCOLOR, + PROP_RTEXT, + PROP_STEXT, + PROP_WAVE, + PROP_CANVAS, + PROP_TIME, + + PROP_CTEXT, + PROP_CLIST, + PROP_SH_TOKEN, + PROP_TEXTURE2, + PROP_GAMETYPE, +}; + +// refs +struct xr_token; +class PropValue; +class PropItem; +using PropItemVec = xr_vector; +using PropItemIt = PropItemVec::iterator; + + +//------------------------------------------------------------------------------ +#ifdef _EDITOR +#ifndef ImTextureID +#include "../xrEUI/stdafx.h" +#endif +#include "../xrEProps/ChooseTypes.H" +#else +#include "../xrEProps/ChooseTypesHelper.H" +class UIPropertiesForm; +class ChooseItemVec; +#endif +//------------------------------------------------------------------------------ +typedef fastdelegate::FastDelegate TOnDrawTextEvent; +typedef fastdelegate::FastDelegate TOnClick; +//------------------------------------------------------------------------------ + +class PropValue +{ + friend class CPropHelper; + friend class PropItem; +protected: + PropItem* m_Owner; +public: + size_t tag; +public: + // base events + typedef fastdelegate::FastDelegate TOnChange; + TOnChange OnChangeEvent; +public: + PropValue ():tag(0),m_Owner(0),OnChangeEvent(0){;} + virtual ~PropValue (){} + virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText)=0; + virtual void ResetValue ()=0; + virtual bool Equal (PropValue* prop)=0; + IC PropItem* Owner (){return m_Owner;} +}; +//------------------------------------------------------------------------------ + +template +IC void set_value(T& val, const T& _val) +{ + val = _val; +}; + +template +class CustomValue: public PropValue +{ +public: + using TYPE = T; +public: + TYPE init_value; + TYPE* value; +public: + typedef fastdelegate::FastDelegate TOnBeforeEditEvent; + typedef fastdelegate::FastDelegate TOnAfterEditEvent; + TOnBeforeEditEvent OnBeforeEditEvent; + TOnAfterEditEvent OnAfterEditEvent; +public: + CustomValue (T* val) + { + OnBeforeEditEvent = 0; + OnAfterEditEvent = 0; + set_value (value,val); + set_value (init_value,*val); + }; + virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText){return "";} + virtual bool Equal (PropValue* val) + { + CustomValue* prop = (CustomValue*)val; + return (*value==*prop->value); + } + virtual const T& GetValue (){return *value; } + virtual void ResetValue (){set_value(*value,init_value);} + bool ApplyValue (const T& val) + { + if (!(*value==val)){ + set_value (*value,val); + return true; + } + return false; + } +}; + +class PropItem +{ + friend class CPropHelper; + friend class UIPropertiesForm; + shared_str key; + EPropType type; + void* item; +public: + using PropValueVec = xr_vector; + using PropValueIt = PropValueVec::iterator; + +private: + PropValueVec values; + UIPropertiesForm* m_Owner; +// events +public: + typedef fastdelegate::FastDelegate TOnPropItemFocused; + TOnDrawTextEvent OnDrawTextEvent; + TOnPropItemFocused OnItemFocused; + TOnClick OnClickEvent; +public: + u32 prop_color; + u32 val_color; + Irect draw_rect; +public: + enum{ + flDisabled = (1<<0), + flShowCB = (1<<1), + flCBChecked = (1<<2), + flMixed = (1<<3), + flDrawThumbnail = (1<<4), + flSorted = (1<<5), + flIgnoreMixed = (1<<6), + }; + Flags32 m_Flags; +public: + PropItem (EPropType _type):type(_type),prop_color(0),val_color(0),item(0),key(0),OnClickEvent(0),OnDrawTextEvent(0),OnItemFocused(0){m_Flags.zero();} + virtual ~PropItem () + { + for (PropValueIt it=values.begin(); values.end() != it; ++it) + xr_delete (*it); + }; + IC UIPropertiesForm* Owner (){return m_Owner;} + void SetName (const shared_str& name) + { + key=name; + } + IC void ResetValues () + { + for (PropValueIt it=values.begin(); values.end() != it; ++it) + (*it)->ResetValue(); + CheckMixed (); + } + IC void AppendValue (PropValue* value) + { + if (!values.empty()&&!value->Equal(values.front())) + m_Flags.set (flMixed,TRUE); + values.push_back(value); + } + IC xr_string GetDrawText () + { + VERIFY(!values.empty()); if (values.empty()) { return ""; - } - return (m_Flags.is(flMixed) && !m_Flags.is(flIgnoreMixed) )? xr_string("(mixed)") : values.front()->GetDrawText(OnDrawTextEvent); - } - IC void CheckMixed () - { - m_Flags.set (flMixed,FALSE); - if (values.size()>1){ - PropValueIt F = values.begin(); - PropValueIt it = F; ++it; - for (; values.end() != it; ++it){ - if (!(*it)->Equal(*F)){ - m_Flags.set(flMixed,TRUE); - break; - } - } - } - } - - template - IC void BeforeEdit (T2& val) - { - T1* CV = smart_cast(values.front()); VERIFY(CV); - if (!CV->OnBeforeEditEvent.empty()) CV->OnBeforeEditEvent(CV,val); - } - template - IC bool AfterEdit (T2& val) - { - T1* CV = smart_cast(values.front()); VERIFY(CV); - if (!CV->OnAfterEditEvent.empty()) return CV->OnAfterEditEvent(CV,val); - return true; - } - template - IC bool ApplyValue (const T2& val) - { - bool bChanged = false; - m_Flags.set (flMixed,FALSE); - for (PropValueIt it=values.begin(); values.end() != it; ++it){ - T1* CV = smart_cast(*it); VERIFY(CV); - if (CV->ApplyValue(val)){ - bChanged = true; - if (!CV->OnChangeEvent.empty()) CV->OnChangeEvent(*it); - } - if (!CV->Equal(values.front())) - { - m_Flags.set(flMixed, TRUE); - m_Flags.set(flIgnoreMixed, FALSE); - } - } - return bChanged; - } - IC PropValueVec& Values (){return values;} - IC PropValue* GetFrontValue (){return (values.empty()) ? nullptr : values.front(); }; - IC EPropType Type (){return type;} -#ifdef __BORLANDC__ - IC TElTreeItem* Item (){return (TElTreeItem*)item;} -#endif - IC LPCSTR Key (){return key.c_str();} - IC void Enable (BOOL val){m_Flags.set(flDisabled,!val);} - IC BOOL Enabled (){return !m_Flags.is(flDisabled);} - IC void OnChange () - { - for (PropValueIt it=values.begin(); values.end() != it; ++it) - if (!(*it)->OnChangeEvent.empty()) - (*it)->OnChangeEvent(*it); - } -/* - template - IC void OnBeforeEdit () - { - for (PropValueIt it=values.begin(); values.end() != it; ++it){ - T1* CV = smart_cast(*it); VERIFY(CV); - if (CV->OnChangeEvent) CV->OnChangeEvent(*it); - } - } -*/ -}; - -//------------------------------------------------------------------------------ -// values -//------------------------------------------------------------------------------ -class CaptionValue: public PropValue{ - shared_str value; -public: - CaptionValue (const shared_str& val){value=val;} - virtual xr_string GetDrawText (TOnDrawTextEvent) {return value.c_str()?value.c_str():"";} - virtual void ResetValue (){;} - virtual bool Equal (PropValue* val) {return (value==((CaptionValue*)val)->value);} - bool ApplyValue (const shared_str& val){value=val; return false;} -}; - -class CanvasValue: public PropValue{ - shared_str value; -public: - typedef fastdelegate::FastDelegate TOnTestEqual; - typedef fastdelegate::FastDelegate TOnDrawCanvasEvent; -public: - int height; - TOnTestEqual OnTestEqual; - TOnDrawCanvasEvent OnDrawCanvasEvent; -public: - CanvasValue (const shared_str& val, int h):OnDrawCanvasEvent(0),OnTestEqual(0),height(h){value=val;} - virtual xr_string GetDrawText (TOnDrawTextEvent){return value.c_str()?value.c_str():"";} - virtual void ResetValue (){;} - virtual bool Equal (PropValue* val) - { - if (!OnTestEqual.empty()){bool res=true; OnTestEqual(this,(CanvasValue*)val,res); return res;} - return false; - } -}; - -class ButtonValue: public PropValue{ -public: - RStringVec value; - int btn_num; - typedef fastdelegate::FastDelegate TOnBtnClick; - TOnBtnClick OnBtnClickEvent; - enum{ - flFirstOnly = (1<<0) - }; - Flags32 m_Flags; -public: - ButtonValue (const shared_str& val, u32 flags) - { - m_Flags.assign (flags); - OnBtnClickEvent = 0; - btn_num = -1; - xr_string v; - int cnt =_GetItemCount(val.c_str()); - for (int k=0; k{ -public: - typedef fastdelegate::FastDelegate TOnValidateResult; - TOnValidateResult OnValidateResultEvent; -public: - ShortcutValue (TYPE* val):CustomValue(val){} - virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText); - bool ApplyValue (const xr_shortcut& val) - { - if (!(*value==val)){ - bool allow = true; - if (!OnValidateResultEvent.empty()) - OnValidateResultEvent(this,val,allow); - if (allow){ - set_value (*value,val); - return true; - } - } - return false; - } -}; -class RTextValue: public CustomValue{ -public: - RTextValue (TYPE* val):CustomValue(val){}; - virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText) - { - xr_string txt = GetValue().c_str()?GetValue().c_str():""; - if (!OnDrawText.empty())OnDrawText(this, txt); - return txt; - } -}; -class STextValue: public CustomValue{ -public: - STextValue (TYPE* val):CustomValue(val){}; - virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText) - { - xr_string txt = GetValue(); - if (!OnDrawText.empty())OnDrawText(this, txt); - return txt; - } -}; - -class CTextValue: public PropValue{ - xr_string init_value; -public: - LPSTR value; -public: - typedef fastdelegate::FastDelegate TOnBeforeEditEvent; - typedef fastdelegate::FastDelegate TOnAfterEditEvent; - TOnBeforeEditEvent OnBeforeEditEvent; - TOnAfterEditEvent OnAfterEditEvent; -public: - int lim; -public: - CTextValue (LPSTR val, int _lim):value(val),init_value(val),lim(_lim) - { - OnBeforeEditEvent = 0; - OnAfterEditEvent = 0; - }; - virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText) - { - xr_string txt = GetValue(); - if (!OnDrawText.empty())OnDrawText(this, txt); - return txt; - } - virtual bool Equal (PropValue* val) - { - return (0==xr_strcmp(value,((CTextValue*)val)->value)); - } - bool ApplyValue (LPCSTR val) - { - if (0!=xr_strcmp(value,val)){ - xr_strcpy (value,xr_strlen(val)+1,val); - return true; - } - return false; - } - LPSTR GetValue (){return value;} - virtual void ResetValue (){xr_strcpy(value,init_value.size()+1,init_value.c_str());} -}; -//------------------------------------------------------------------------------ - -class ChooseValue: public RTextValue{ -public: - int subitem; - u32 m_ChooseID; - u32 m_ChooseFlags; - shared_str m_StartPath; - ChooseItemVec* m_Items; - typedef fastdelegate::FastDelegate TOnChooseValueFill; - TOnChooseValueFill OnChooseFillEvent; - //TOnDrawThumbnail OnDrawThumbnailEvent; - void* m_FillParam; -// utils - void AppendChooseItem (LPCSTR name, LPCSTR hint) - { -#ifdef _EDITOR - VERIFY(m_Items); - m_Items->push_back(SChooseItem(name,hint)); -#endif -} -public: - ChooseValue (shared_str* val, u32 cid, LPCSTR path, void* param, u32 sub_item_count, u32 choose_flags):RTextValue(val),m_ChooseID(cid),m_StartPath(path),subitem(sub_item_count),m_Items(0),m_FillParam(param),OnChooseFillEvent(0),/*OnDrawThumbnailEvent(0),*/m_ChooseFlags(choose_flags){} -}; - -typedef CustomValue BOOLValue; -//------------------------------------------------------------------------------ - -IC bool operator == (const WaveForm& A, const WaveForm& B){return !!A.Similar(B);} -class WaveValue: public CustomValue{ -public: - WaveValue (TYPE* val):CustomValue(val){}; - virtual xr_string GetDrawText (TOnDrawTextEvent){return "[Wave]";} -}; - -IC bool operator == (const GameTypeChooser& A, const GameTypeChooser& B){return A.m_GameType.flags==B.m_GameType.flags;} -class GameTypeValue: public CustomValue{ -public: - GameTypeValue (TYPE* val):CustomValue(val){}; - virtual xr_string GetDrawText (TOnDrawTextEvent); -}; - -//------------------------------------------------------------------------------ - -IC bool operator == (const Fcolor& A, const Fcolor& B) -{ return !!A.similar_rgba(B); } -typedef CustomValue ColorValue; -//------------------------------------------------------------------------------ - -template -class NumericValue: public CustomValue -{ -public: - T lim_mn; - T lim_mx; - T inc; - int dec; -public: - NumericValue (T* val):CustomValue(val) - { - this->value = val; - this->init_value = *this->value; - dec = 0; - }; - NumericValue (T* val, T mn, T mx, T increm, int decim):CustomValue(val),lim_mn(mn),lim_mx(mx),inc(increm),dec(decim) - { - clamp (*val,lim_mn,lim_mx); - this->value = val; - this->init_value = *this->value; - }; - bool ApplyValue (const T& _val) - { - T val = _val; - clamp (val,lim_mn,lim_mx); - return CustomValue::ApplyValue(val); - } - virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText) - { - xr_string draw_val; - if (!OnDrawText.empty()) OnDrawText(this, draw_val); - else draw_sprintf (draw_val,*this->value,dec); - return draw_val; - } -}; - -//------------------------------------------------------------------------------ -template -IC xr_string draw_sprintf(xr_string& s, const T& V, int tag) -{ string256 tmp; xr_sprintf(tmp,sizeof(tmp),"%d",V); s=tmp; return s;} -//------------------------------------------------------------------------------ -IC xr_string draw_sprintf(xr_string& s, const float& V, int dec) -{ - string32 fmt; xr_sprintf(fmt, sizeof(fmt), "%%.%df",dec); - string256 tmp; xr_sprintf(tmp, sizeof(tmp), fmt,V); - s = tmp; - return s; -} -//------------------------------------------------------------------------------ -IC bool operator == (const Fvector& A, const Fvector& B) -{ return !!A.similar(B); } -IC void clamp(Fvector& V, const Fvector& mn, const Fvector& mx) -{ - clamp(V.x,mn.x,mx.x); - clamp(V.y,mn.y,mx.y); - clamp(V.z,mn.z,mx.z); -} -IC xr_string draw_sprintf(xr_string& s, const Fvector& V, int dec) -{ - string128 fmt; xr_sprintf(fmt,sizeof(fmt),"{%%.%df, %%.%df, %%.%df}",dec,dec,dec); - string256 tmp; xr_sprintf(tmp,sizeof(tmp),fmt,V.x,V.y,V.z); - s = tmp; - return s; -} -//------------------------------------------------------------------------------ -typedef NumericValue U8Value; -typedef NumericValue U16Value; -typedef NumericValue U32Value; -typedef NumericValue S8Value; -typedef NumericValue S16Value; -typedef NumericValue S32Value; -typedef NumericValue FloatValue; -class VectorValue: public NumericValue{ -public: - VectorValue (Fvector* val, float mn, float mx, float increment, int decimal):NumericValue(val) - { - lim_mn.set (mn,mn,mn); - lim_mx.set (mx,mx,mx); - inc.set (increment,increment,increment); - dec = decimal; - }; -}; -//------------------------------------------------------------------------------ - -class FlagValueCustom -{ -public: - shared_str caption[2]; - enum{ - flInvertedDraw = (1<<0), - }; - Flags32 m_Flags; -public: - FlagValueCustom (u32 mask, LPCSTR c0, LPCSTR c1) - { - caption[0] = c0; - caption[1] = c1; - m_Flags.assign(mask); - } - virtual bool HaveCaption (){return caption[0].size()&&caption[1].size();} - virtual bool GetValueEx ()=0; -}; - -template -class FlagValue: public CustomValue, public FlagValueCustom -{ -public: - typedef T TYPE; - typedef typename T::TYPE FLAG_TYPE; -public: - FLAG_TYPE mask; -public: - FlagValue (T* val, FLAG_TYPE _mask, LPCSTR c0, LPCSTR c1, u32 flags):CustomValue(val),FlagValueCustom(flags,c0,c1),mask(_mask){} - virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText) - { - xr_string draw_val; - if (!OnDrawText.empty()) OnDrawText(this, draw_val); - else return HaveCaption()?caption[GetValueEx()?1:0].c_str():""; - return draw_val; - } - virtual bool Equal (PropValue* val){return !!this->value->equal(*((FlagValue*)val)->value,mask);} - virtual const T& GetValue () {return *this->value; } - virtual void ResetValue () { this->value->set(mask, this->init_value.is(mask));} - virtual bool GetValueEx () {return !!this->value->is(mask);} - bool ApplyValue (const T& val) - { - if (!val.equal(*this->value,mask)){ - this->value->set (mask,val.is(mask)); - return true; - } - return false; - } -}; -//------------------------------------------------------------------------------ -typedef FlagValue Flag8Value; -typedef FlagValue Flag16Value; -typedef FlagValue Flag32Value; -//------------------------------------------------------------------------------ -class TokenValueCustom -{ -public: - xr_token* token; - TokenValueCustom(xr_token* _token):token(_token){;} -}; -template -class TokenValue: public CustomValue, public TokenValueCustom -{ -public: - TokenValue (T* val, xr_token* _token):TokenValueCustom(_token),CustomValue(val){}; - virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText) - { - xr_string draw_val; - if (!OnDrawText.empty()) OnDrawText(this, draw_val); - else for(int i=0; token[i].name; i++) if (token[i].id==(int)this->GetValue()) return token[i].name; - return draw_val; - } -}; -//------------------------------------------------------------------------------ -typedef TokenValue Token8Value; -typedef TokenValue Token16Value; -typedef TokenValue Token32Value; -//------------------------------------------------------------------------------ - -class RTokenValueCustom{ -public: - xr_rtoken* token; - u32 token_count; - RTokenValueCustom(xr_rtoken* _token, u32 _t_cnt):token(_token),token_count(_t_cnt){;} -}; -template -class RTokenValue: public CustomValue, public RTokenValueCustom -{ -public: - RTokenValue (T* val, xr_rtoken* _token, u32 _t_cnt):CustomValue(val),RTokenValueCustom(_token,_t_cnt){}; - virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText) - { - xr_string draw_val; - if (!OnDrawText.empty()) OnDrawText(this, draw_val); - else for(u32 k=0; kGetValue()) return *token[k].name; - return draw_val; - } -}; -//------------------------------------------------------------------------------ -typedef RTokenValue RToken8Value; -typedef RTokenValueRToken16Value; -typedef RTokenValueRToken32Value; -//------------------------------------------------------------------------------ - -class TokenValueSH: public CustomValue{ -public: - struct Item { - u32 ID; - string64 str; - }; - u32 cnt; - const Item* items; -public: - TokenValueSH (u32* val, const Item* _items, u32 _cnt):CustomValue(val),cnt(_cnt),items(_items){}; - virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText) - { - u32 draw_val = GetValue(); - for(u32 i=0; iitems){ - m_Owner->m_Flags.set(PropItem::flDisabled,TRUE); - return false; - } - return RTextValue::Equal(val); - } -}; -class CListValue: public CTextValue{ -public: - xr_string* items; - u32 item_count; -public: - CListValue (LPSTR val, u32 sz, xr_string* _items, u32 cnt):CTextValue(val,sz),items(_items),item_count(cnt){}; - virtual bool Equal (PropValue* val) - { - if (items!=((CListValue*)val)->items){ - m_Owner->m_Flags.set(PropItem::flDisabled,TRUE); - return false; - } - return CTextValue::Equal(val); - } -}; -//------------------------------------------------------------------------------ + } + return (m_Flags.is(flMixed) && !m_Flags.is(flIgnoreMixed) )? xr_string("(mixed)") : values.front()->GetDrawText(OnDrawTextEvent); + } + IC void CheckMixed () + { + m_Flags.set (flMixed,FALSE); + if (values.size()>1){ + PropValueIt F = values.begin(); + PropValueIt it = F; ++it; + for (; values.end() != it; ++it){ + if (!(*it)->Equal(*F)){ + m_Flags.set(flMixed,TRUE); + break; + } + } + } + } + + template + IC void BeforeEdit (T2& val) + { + T1* CV = smart_cast(values.front()); VERIFY(CV); + if (!CV->OnBeforeEditEvent.empty()) CV->OnBeforeEditEvent(CV,val); + } + template + IC bool AfterEdit (T2& val) + { + T1* CV = smart_cast(values.front()); VERIFY(CV); + if (!CV->OnAfterEditEvent.empty()) return CV->OnAfterEditEvent(CV,val); + return true; + } + template + IC bool ApplyValue (const T2& val) + { + bool bChanged = false; + m_Flags.set (flMixed,FALSE); + for (PropValueIt it=values.begin(); values.end() != it; ++it){ + T1* CV = smart_cast(*it); VERIFY(CV); + if (CV->ApplyValue(val)){ + bChanged = true; + if (!CV->OnChangeEvent.empty()) CV->OnChangeEvent(*it); + } + if (!CV->Equal(values.front())) + { + m_Flags.set(flMixed, TRUE); + m_Flags.set(flIgnoreMixed, FALSE); + } + } + return bChanged; + } + IC PropValueVec& Values (){return values;} + IC PropValue* GetFrontValue (){return (values.empty()) ? nullptr : values.front(); }; + IC EPropType Type (){return type;} +#ifdef __BORLANDC__ + IC TElTreeItem* Item (){return (TElTreeItem*)item;} +#endif + IC LPCSTR Key (){return key.c_str();} + IC void Enable (BOOL val){m_Flags.set(flDisabled,!val);} + IC BOOL Enabled (){return !m_Flags.is(flDisabled);} + IC void OnChange () + { + for (PropValueIt it=values.begin(); values.end() != it; ++it) + if (!(*it)->OnChangeEvent.empty()) + (*it)->OnChangeEvent(*it); + } +/* + template + IC void OnBeforeEdit () + { + for (PropValueIt it=values.begin(); values.end() != it; ++it){ + T1* CV = smart_cast(*it); VERIFY(CV); + if (CV->OnChangeEvent) CV->OnChangeEvent(*it); + } + } +*/ +}; + +//------------------------------------------------------------------------------ +// values +//------------------------------------------------------------------------------ +class CaptionValue: public PropValue{ + shared_str value; +public: + CaptionValue (const shared_str& val){value=val;} + virtual xr_string GetDrawText (TOnDrawTextEvent) {return value.c_str()?value.c_str():"";} + virtual void ResetValue (){;} + virtual bool Equal (PropValue* val) {return (value==((CaptionValue*)val)->value);} + bool ApplyValue (const shared_str& val){value=val; return false;} +}; + +class CanvasValue: public PropValue{ + shared_str value; +public: + typedef fastdelegate::FastDelegate TOnTestEqual; + typedef fastdelegate::FastDelegate TOnDrawCanvasEvent; +public: + int height; + TOnTestEqual OnTestEqual; + TOnDrawCanvasEvent OnDrawCanvasEvent; +public: + CanvasValue (const shared_str& val, int h):OnDrawCanvasEvent(0),OnTestEqual(0),height(h){value=val;} + virtual xr_string GetDrawText (TOnDrawTextEvent){return value.c_str()?value.c_str():"";} + virtual void ResetValue (){;} + virtual bool Equal (PropValue* val) + { + if (!OnTestEqual.empty()){bool res=true; OnTestEqual(this,(CanvasValue*)val,res); return res;} + return false; + } +}; + +class ButtonValue: public PropValue{ +public: + RStringVec value; + int btn_num; + typedef fastdelegate::FastDelegate TOnBtnClick; + TOnBtnClick OnBtnClickEvent; + enum{ + flFirstOnly = (1<<0) + }; + Flags32 m_Flags; +public: + ButtonValue (const shared_str& val, u32 flags) + { + m_Flags.assign (flags); + OnBtnClickEvent = 0; + btn_num = -1; + xr_string v; + int cnt =_GetItemCount(val.c_str()); + for (int k=0; k{ +public: + typedef fastdelegate::FastDelegate TOnValidateResult; + TOnValidateResult OnValidateResultEvent; +public: + ShortcutValue (TYPE* val):CustomValue(val){} + virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText); + bool ApplyValue (const xr_shortcut& val) + { + if (!(*value==val)){ + bool allow = true; + if (!OnValidateResultEvent.empty()) + OnValidateResultEvent(this,val,allow); + if (allow){ + set_value (*value,val); + return true; + } + } + return false; + } +}; +class RTextValue: public CustomValue{ +public: + RTextValue (TYPE* val):CustomValue(val){}; + virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText) + { + xr_string txt = GetValue().c_str()?GetValue().c_str():""; + if (!OnDrawText.empty())OnDrawText(this, txt); + return txt; + } +}; +class STextValue: public CustomValue{ +public: + STextValue (TYPE* val):CustomValue(val){}; + virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText) + { + xr_string txt = GetValue(); + if (!OnDrawText.empty())OnDrawText(this, txt); + return txt; + } +}; + +class CTextValue: public PropValue{ + xr_string init_value; +public: + LPSTR value; +public: + typedef fastdelegate::FastDelegate TOnBeforeEditEvent; + typedef fastdelegate::FastDelegate TOnAfterEditEvent; + TOnBeforeEditEvent OnBeforeEditEvent; + TOnAfterEditEvent OnAfterEditEvent; +public: + int lim; +public: + CTextValue (LPSTR val, int _lim):value(val),init_value(val),lim(_lim) + { + OnBeforeEditEvent = 0; + OnAfterEditEvent = 0; + }; + virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText) + { + xr_string txt = GetValue(); + if (!OnDrawText.empty())OnDrawText(this, txt); + return txt; + } + virtual bool Equal (PropValue* val) + { + return (0==xr_strcmp(value,((CTextValue*)val)->value)); + } + bool ApplyValue (LPCSTR val) + { + if (0!=xr_strcmp(value,val)){ + xr_strcpy (value,xr_strlen(val)+1,val); + return true; + } + return false; + } + LPSTR GetValue (){return value;} + virtual void ResetValue (){xr_strcpy(value,init_value.size()+1,init_value.c_str());} +}; +//------------------------------------------------------------------------------ + +class ChooseValue: public RTextValue{ +public: + int subitem; + u32 m_ChooseID; + u32 m_ChooseFlags; + shared_str m_StartPath; + ChooseItemVec* m_Items; + typedef fastdelegate::FastDelegate TOnChooseValueFill; + TOnChooseValueFill OnChooseFillEvent; + //TOnDrawThumbnail OnDrawThumbnailEvent; + void* m_FillParam; +// utils + void AppendChooseItem (LPCSTR name, LPCSTR hint) + { +#ifdef _EDITOR + VERIFY(m_Items); + m_Items->push_back(SChooseItem(name,hint)); +#endif +} +public: + ChooseValue (shared_str* val, u32 cid, LPCSTR path, void* param, u32 sub_item_count, u32 choose_flags):RTextValue(val),m_ChooseID(cid),m_StartPath(path),subitem(sub_item_count),m_Items(0),m_FillParam(param),OnChooseFillEvent(0),/*OnDrawThumbnailEvent(0),*/m_ChooseFlags(choose_flags){} +}; + +typedef CustomValue BOOLValue; +//------------------------------------------------------------------------------ + +IC bool operator == (const WaveForm& A, const WaveForm& B){return !!A.Similar(B);} +class WaveValue: public CustomValue{ +public: + WaveValue (TYPE* val):CustomValue(val){}; + virtual xr_string GetDrawText (TOnDrawTextEvent){return "[Wave]";} +}; + +IC bool operator == (const GameTypeChooser& A, const GameTypeChooser& B){return A.m_GameType.flags==B.m_GameType.flags;} +class GameTypeValue: public CustomValue{ +public: + GameTypeValue (TYPE* val):CustomValue(val){}; + virtual xr_string GetDrawText (TOnDrawTextEvent); +}; + +//------------------------------------------------------------------------------ + +IC bool operator == (const Fcolor& A, const Fcolor& B) +{ return !!A.similar_rgba(B); } +typedef CustomValue ColorValue; +//------------------------------------------------------------------------------ + +template +class NumericValue: public CustomValue +{ +public: + T lim_mn; + T lim_mx; + T inc; + int dec; +public: + NumericValue (T* val):CustomValue(val) + { + this->value = val; + this->init_value = *this->value; + dec = 0; + }; + NumericValue (T* val, T mn, T mx, T increm, int decim):CustomValue(val),lim_mn(mn),lim_mx(mx),inc(increm),dec(decim) + { + clamp (*val,lim_mn,lim_mx); + this->value = val; + this->init_value = *this->value; + }; + bool ApplyValue (const T& _val) + { + T val = _val; + clamp (val,lim_mn,lim_mx); + return CustomValue::ApplyValue(val); + } + virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText) + { + xr_string draw_val; + if (!OnDrawText.empty()) OnDrawText(this, draw_val); + else draw_sprintf (draw_val,*this->value,dec); + return draw_val; + } +}; + +//------------------------------------------------------------------------------ +template +IC xr_string draw_sprintf(xr_string& s, const T& V, int tag) +{ string256 tmp; xr_sprintf(tmp,sizeof(tmp),"%d",V); s=tmp; return s;} +//------------------------------------------------------------------------------ +IC xr_string draw_sprintf(xr_string& s, const float& V, int dec) +{ + string32 fmt; xr_sprintf(fmt, sizeof(fmt), "%%.%df",dec); + string256 tmp; xr_sprintf(tmp, sizeof(tmp), fmt,V); + s = tmp; + return s; +} +//------------------------------------------------------------------------------ +IC bool operator == (const Fvector& A, const Fvector& B) +{ return !!A.similar(B); } +IC void clamp(Fvector& V, const Fvector& mn, const Fvector& mx) +{ + clamp(V.x,mn.x,mx.x); + clamp(V.y,mn.y,mx.y); + clamp(V.z,mn.z,mx.z); +} +IC xr_string draw_sprintf(xr_string& s, const Fvector& V, int dec) +{ + string128 fmt; xr_sprintf(fmt,sizeof(fmt),"{%%.%df, %%.%df, %%.%df}",dec,dec,dec); + string256 tmp; xr_sprintf(tmp,sizeof(tmp),fmt,V.x,V.y,V.z); + s = tmp; + return s; +} +//------------------------------------------------------------------------------ +typedef NumericValue U8Value; +typedef NumericValue U16Value; +typedef NumericValue U32Value; +typedef NumericValue S8Value; +typedef NumericValue S16Value; +typedef NumericValue S32Value; +typedef NumericValue FloatValue; +class VectorValue: public NumericValue{ +public: + VectorValue (Fvector* val, float mn, float mx, float increment, int decimal):NumericValue(val) + { + lim_mn.set (mn,mn,mn); + lim_mx.set (mx,mx,mx); + inc.set (increment,increment,increment); + dec = decimal; + }; +}; +//------------------------------------------------------------------------------ + +class FlagValueCustom +{ +public: + shared_str caption[2]; + enum{ + flInvertedDraw = (1<<0), + }; + Flags32 m_Flags; +public: + FlagValueCustom (u32 mask, LPCSTR c0, LPCSTR c1) + { + caption[0] = c0; + caption[1] = c1; + m_Flags.assign(mask); + } + virtual bool HaveCaption (){return caption[0].size()&&caption[1].size();} + virtual bool GetValueEx ()=0; +}; + +template +class FlagValue: public CustomValue, public FlagValueCustom +{ +public: + typedef T TYPE; + typedef typename T::TYPE FLAG_TYPE; +public: + FLAG_TYPE mask; +public: + FlagValue (T* val, FLAG_TYPE _mask, LPCSTR c0, LPCSTR c1, u32 flags):CustomValue(val),FlagValueCustom(flags,c0,c1),mask(_mask){} + virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText) + { + xr_string draw_val; + if (!OnDrawText.empty()) OnDrawText(this, draw_val); + else return HaveCaption()?caption[GetValueEx()?1:0].c_str():""; + return draw_val; + } + virtual bool Equal (PropValue* val){return !!this->value->equal(*((FlagValue*)val)->value,mask);} + virtual const T& GetValue () {return *this->value; } + virtual void ResetValue () { this->value->set(mask, this->init_value.is(mask));} + virtual bool GetValueEx () {return !!this->value->is(mask);} + bool ApplyValue (const T& val) + { + if (!val.equal(*this->value,mask)){ + this->value->set (mask,val.is(mask)); + return true; + } + return false; + } +}; +//------------------------------------------------------------------------------ +typedef FlagValue Flag8Value; +typedef FlagValue Flag16Value; +typedef FlagValue Flag32Value; +//------------------------------------------------------------------------------ +class TokenValueCustom +{ +public: + xr_token* token; + TokenValueCustom(xr_token* _token):token(_token){;} +}; +template +class TokenValue: public CustomValue, public TokenValueCustom +{ +public: + TokenValue (T* val, xr_token* _token):TokenValueCustom(_token),CustomValue(val){}; + virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText) + { + xr_string draw_val; + if (!OnDrawText.empty()) OnDrawText(this, draw_val); + else for(int i=0; token[i].name; i++) if (token[i].id==(int)this->GetValue()) return token[i].name; + return draw_val; + } +}; +//------------------------------------------------------------------------------ +typedef TokenValue Token8Value; +typedef TokenValue Token16Value; +typedef TokenValue Token32Value; +//------------------------------------------------------------------------------ + +class RTokenValueCustom{ +public: + xr_rtoken* token; + u32 token_count; + RTokenValueCustom(xr_rtoken* _token, u32 _t_cnt):token(_token),token_count(_t_cnt){;} +}; +template +class RTokenValue: public CustomValue, public RTokenValueCustom +{ +public: + RTokenValue (T* val, xr_rtoken* _token, u32 _t_cnt):CustomValue(val),RTokenValueCustom(_token,_t_cnt){}; + virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText) + { + xr_string draw_val; + if (!OnDrawText.empty()) OnDrawText(this, draw_val); + else for(u32 k=0; kGetValue()) return *token[k].name; + return draw_val; + } +}; +//------------------------------------------------------------------------------ +typedef RTokenValue RToken8Value; +typedef RTokenValueRToken16Value; +typedef RTokenValueRToken32Value; +//------------------------------------------------------------------------------ + +class TokenValueSH: public CustomValue{ +public: + struct Item { + u32 ID; + string64 str; + }; + u32 cnt; + const Item* items; +public: + TokenValueSH (u32* val, const Item* _items, u32 _cnt):CustomValue(val),cnt(_cnt),items(_items){}; + virtual xr_string GetDrawText (TOnDrawTextEvent OnDrawText) + { + u32 draw_val = GetValue(); + for(u32 i=0; iitems){ + m_Owner->m_Flags.set(PropItem::flDisabled,TRUE); + return false; + } + return RTextValue::Equal(val); + } +}; +class CListValue: public CTextValue{ +public: + xr_string* items; + u32 item_count; +public: + CListValue (LPSTR val, u32 sz, xr_string* _items, u32 cnt):CTextValue(val,sz),items(_items),item_count(cnt){}; + virtual bool Equal (PropValue* val) + { + if (items!=((CListValue*)val)->items){ + m_Owner->m_Flags.set(PropItem::flDisabled,TRUE); + return false; + } + return CTextValue::Equal(val); + } +}; +//------------------------------------------------------------------------------ #pragma pack( pop ) \ No newline at end of file diff --git a/src/Editors/ShaderEditor/SHCompilerToolsProperties.cpp b/src/Editors/ShaderEditor/SHCompilerToolsProperties.cpp index 31c5230298..edc59b64df 100644 --- a/src/Editors/ShaderEditor/SHCompilerToolsProperties.cpp +++ b/src/Editors/ShaderEditor/SHCompilerToolsProperties.cpp @@ -3,7 +3,7 @@ #pragma hdrstop #include "SHCompilerTools.h" -#include "../xrEProps/folderlib.h" +#include "../xrEProps/FolderLib.h" //#include "../xrEProps/ItemList.h" //------------------------------------------------------------------------------ diff --git a/src/Editors/ShaderEditor/SHEngineTools.cpp b/src/Editors/ShaderEditor/SHEngineTools.cpp index 7dab38c0bf..fcbde6d011 100644 --- a/src/Editors/ShaderEditor/SHEngineTools.cpp +++ b/src/Editors/ShaderEditor/SHEngineTools.cpp @@ -3,9 +3,9 @@ #pragma hdrstop #include "SHEngineTools.h" -#include "UI_ShaderTools.h" +#include "UI_shadertools.h" #include "ui_shadermain.h" -#include "..\XrECore\Editor\EditMesh.h" +#include "../xrECore/Editor/EditMesh.h" //------------------------------------------------------------------------------ class CCollapseBlender: public CParseBlender{ public: diff --git a/src/Editors/ShaderEditor/SHEngineToolsProperties.cpp b/src/Editors/ShaderEditor/SHEngineToolsProperties.cpp index 6c0cd7d200..fc19bb4d40 100644 --- a/src/Editors/ShaderEditor/SHEngineToolsProperties.cpp +++ b/src/Editors/ShaderEditor/SHEngineToolsProperties.cpp @@ -3,7 +3,7 @@ #pragma hdrstop #include "SHEngineTools.h" -#include "../xrEProps/folderlib.h" +#include "../xrEProps/FolderLib.h" //--------------------------------------------------------------------------- xr_token mode_token [ ]={ diff --git a/src/Editors/ShaderEditor/SHGameMtlPairTools.cpp b/src/Editors/ShaderEditor/SHGameMtlPairTools.cpp index e9bf74172c..f85ae08dc8 100644 --- a/src/Editors/ShaderEditor/SHGameMtlPairTools.cpp +++ b/src/Editors/ShaderEditor/SHGameMtlPairTools.cpp @@ -3,8 +3,8 @@ #pragma hdrstop #include "SHGameMtlPairTools.h" -#include "UI_ShaderTools.h" -#include "../xrEProps/folderlib.h" +#include "UI_shadertools.h" +#include "../xrEProps/FolderLib.h" //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ diff --git a/src/Editors/ShaderEditor/SHGameMtlTools.cpp b/src/Editors/ShaderEditor/SHGameMtlTools.cpp index 7912ed403a..920ad67604 100644 --- a/src/Editors/ShaderEditor/SHGameMtlTools.cpp +++ b/src/Editors/ShaderEditor/SHGameMtlTools.cpp @@ -4,8 +4,8 @@ #include "SHGameMtlTools.h" #include "../Public/PropertiesListHelper.h" #include "ui_shadermain.h" -#include "../xrEProps/folderlib.h" -#include "UI_ShaderTools.h" +#include "../xrEProps/FolderLib.h" +#include "UI_shadertools.h" //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ diff --git a/src/Editors/ShaderEditor/SHSoundEnvTools.cpp b/src/Editors/ShaderEditor/SHSoundEnvTools.cpp index c4332ecb2c..f63ce0667c 100644 --- a/src/Editors/ShaderEditor/SHSoundEnvTools.cpp +++ b/src/Editors/ShaderEditor/SHSoundEnvTools.cpp @@ -7,7 +7,7 @@ #include "ui_shadermain.h" #include "../../xrSound/stdafx.h" #include "../../xrSound/SoundRender_Source.h" -#include "../XrECORE/Editor/D3DUtils.h" +#include "../xrECore/Editor/D3DUtils.h" #include "SHSoundEnvTools.h" //------------------------------------------------------------------------------ diff --git a/src/Editors/ShaderEditor/SHSoundEnvTools.h b/src/Editors/ShaderEditor/SHSoundEnvTools.h index 2a0b5add0a..87804696ec 100644 --- a/src/Editors/ShaderEditor/SHSoundEnvTools.h +++ b/src/Editors/ShaderEditor/SHSoundEnvTools.h @@ -2,7 +2,7 @@ #ifndef SHSoundEnvToolsH #define SHSoundEnvToolsH #include "SHToolsInterface.h" -#include "../../xrSound/soundrender_environment.h" +#include "../../xrSound/SoundRender_Environment.h" // refs class PropValue; diff --git a/src/Editors/ShaderEditor/SHToolsInterface.cpp b/src/Editors/ShaderEditor/SHToolsInterface.cpp index 4265e4fe42..dc1e90200a 100644 --- a/src/Editors/ShaderEditor/SHToolsInterface.cpp +++ b/src/Editors/ShaderEditor/SHToolsInterface.cpp @@ -4,7 +4,7 @@ #include "SHToolsInterface.h" #include "../xrEProps/FolderLib.h" -#include "../XrECore/Editor/ui_main.h" +#include "../xrECore/Editor/ui_main.h" ISHTools::ISHTools(const ISHInit& init) { diff --git a/src/Editors/ShaderEditor/UIMainForm.cpp b/src/Editors/ShaderEditor/UIMainForm.cpp index 631517217f..1786e2c12f 100644 --- a/src/Editors/ShaderEditor/UIMainForm.cpp +++ b/src/Editors/ShaderEditor/UIMainForm.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "../XrECore/Editor/EditorChooseEvents.h" +#include "../xrECore/Editor/EditorChooseEvents.h" UIMainForm* MainForm = nullptr; UIMainForm::UIMainForm() { diff --git a/src/Editors/ShaderEditor/UI_shadertools.cpp b/src/Editors/ShaderEditor/UI_shadertools.cpp index cfd824908a..fa491dc43d 100644 --- a/src/Editors/ShaderEditor/UI_shadertools.cpp +++ b/src/Editors/ShaderEditor/UI_shadertools.cpp @@ -3,7 +3,7 @@ #include "stdafx.h" #pragma hdrstop -#include "UI_ShaderTools.h" +#include "UI_shadertools.h" #include "../../xrEngine/GameMtlLib.h" //------------------------------------------------------------------------------ diff --git a/src/Editors/ShaderEditor/stdafx.h b/src/Editors/ShaderEditor/stdafx.h index fbcd01bedd..e244cb6116 100644 --- a/src/Editors/ShaderEditor/stdafx.h +++ b/src/Editors/ShaderEditor/stdafx.h @@ -2,16 +2,16 @@ // file: stdafx.h //---------------------------------------------------- #pragma once -#include "..\XrECore\stdafx.h" -#include "..\XrECore\Editor\device.h" -#include "..\XrECore\Editor\UI_MainCommand.h" -#include "..\XrECore\Editor\UI_ToolsCustom.h" -#include "..\XrECore\Editor\ui_main.h" -#include "..\XrECore\Editor\EditorPreferences.h" -#include "..\XrECore\Editor\render.h" -#include "..\XrECore\Editor\UIRenderForm.h" -#include "..\XrECore\Editor\ELog.h" -#include "..\XrECore\Editor\Library.h" +#include "../xrECore/stdafx.h" +#include "../xrECore/Editor/device.h" +#include "../xrECore/Editor/UI_MainCommand.h" +#include "../xrECore/Editor/UI_ToolsCustom.h" +#include "../xrECore/Editor/ui_main.h" +#include "../xrECore/Editor/EditorPreferences.h" +#include "../xrECore/Editor/render.h" +#include "../xrECore/Editor/UIRenderForm.h" +#include "../xrECore/Editor/ELog.h" +#include "../xrECore/Editor/Library.h" #include "UI_shadertools.h" #include "ui_shadermain.h" diff --git a/src/Editors/ShaderEditor/ui_shadermain.cpp b/src/Editors/ShaderEditor/ui_shadermain.cpp index f332aadbdf..c0c60428ba 100644 --- a/src/Editors/ShaderEditor/ui_shadermain.cpp +++ b/src/Editors/ShaderEditor/ui_shadermain.cpp @@ -2,8 +2,8 @@ #include "stdafx.h" #pragma hdrstop -#include "UI_ShaderMain.h" -#include "UI_ShaderTools.h" +#include "ui_shadermain.h" +#include "UI_shadertools.h" #include "../../xrEngine/xr_input.h" //--------------------------------------------------------------------------- diff --git a/src/Editors/xrECore/Editor/BoneEditor.cpp b/src/Editors/xrECore/Editor/BoneEditor.cpp index be15c7738d..38c664f08a 100644 --- a/src/Editors/xrECore/Editor/BoneEditor.cpp +++ b/src/Editors/xrECore/Editor/BoneEditor.cpp @@ -3,7 +3,7 @@ #include "../xrEngine/bone.h" #include "../xrEngine/envelope.h" #include "../xrEngine/GameMtlLib.h" -#include "ui_toolscustom.h" +#include "UI_ToolsCustom.h" void SJointIKData::clamp_by_limits(Fvector& dest_xyz) { diff --git a/src/Editors/xrECore/Editor/D3DUtils.cpp b/src/Editors/xrECore/Editor/D3DUtils.cpp index e9be4c62a0..25ed8958a2 100644 --- a/src/Editors/xrECore/Editor/D3DUtils.cpp +++ b/src/Editors/xrECore/Editor/D3DUtils.cpp @@ -6,7 +6,7 @@ #include #include "../xrEngine/GameFont.h" -#include "d3dutils.h" +#include "D3DUtils.h" #include "du_box.h" #include "du_sphere.h" #include "du_sphere_part.h" diff --git a/src/Editors/xrECore/Editor/D3DUtils.h b/src/Editors/xrECore/Editor/D3DUtils.h index 7ffed2fb21..5bda7b6661 100644 --- a/src/Editors/xrECore/Editor/D3DUtils.h +++ b/src/Editors/xrECore/Editor/D3DUtils.h @@ -2,6 +2,6 @@ // file: D3DUtils.h //---------------------------------------------------- #include "device.h" -#include "..\..\..\Layers\xrRender\D3DUtils.h" +#include "../../../Layers/xrRender/D3DUtils.h" extern ECORE_API CDrawUtilities DU_impl; \ No newline at end of file diff --git a/src/Editors/xrECore/Editor/DeviceScreenshot.cpp b/src/Editors/xrECore/Editor/DeviceScreenshot.cpp index b21f6d8ddb..7a56e238ab 100644 --- a/src/Editors/xrECore/Editor/DeviceScreenshot.cpp +++ b/src/Editors/xrECore/Editor/DeviceScreenshot.cpp @@ -2,7 +2,7 @@ #include "stdafx.h" #pragma hdrstop -#include "ui_toolscustom.h" +#include "UI_ToolsCustom.h" #include "ui_main.h" #include "../Layers/xrRender/ResourceManager.h" #include "../Layers/xrRender/dxRenderDeviceRender.h" diff --git a/src/Editors/xrECore/Editor/EStats.cpp b/src/Editors/xrECore/Editor/EStats.cpp index 24dfe81aba..273dd1130e 100644 --- a/src/Editors/xrECore/Editor/EStats.cpp +++ b/src/Editors/xrECore/Editor/EStats.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "EStats.h" -#include "UI_Main.h" +#include "ui_main.h" ECORE_API extern bool bIsLevelEditor = true; ////////////////////////////////////////////////////////////////////// diff --git a/src/Editors/xrECore/Editor/EStats.h b/src/Editors/xrECore/Editor/EStats.h index 67e5839534..b22468d47b 100644 --- a/src/Editors/xrECore/Editor/EStats.h +++ b/src/Editors/xrECore/Editor/EStats.h @@ -3,7 +3,7 @@ ////////////////////////////////////////////////////////////////////// #pragma once -#include "../../../xrengine/stats.h" +#include "../../../xrEngine/Stats.h" // refs class CGameFont; diff --git a/src/Editors/xrECore/Editor/EThumbnail.h b/src/Editors/xrECore/Editor/EThumbnail.h index 56ea82cd50..0a7c6f53be 100644 --- a/src/Editors/xrECore/Editor/EThumbnail.h +++ b/src/Editors/xrECore/Editor/EThumbnail.h @@ -1,7 +1,7 @@ #ifndef EThumbnailH #define EThumbnailH -#include "..\..\..\Layers\xrRender\ETextureParams.h" +#include "../../../Layers/xrRender/ETextureParams.h" #include "../Public/PropertiesListHelper.h" //------------------------------------------------------------------------------ diff --git a/src/Editors/xrECore/Editor/EThumbnailSound.cpp b/src/Editors/xrECore/Editor/EThumbnailSound.cpp index 50294a1fe7..4d66b53ac6 100644 --- a/src/Editors/xrECore/Editor/EThumbnailSound.cpp +++ b/src/Editors/xrECore/Editor/EThumbnailSound.cpp @@ -113,7 +113,7 @@ void ESoundThumbnail::Save(int age, LPCSTR path) } //------------------------------------------------------------------------------ -#include "..\Engine\ai_sounds.h" +#include "../Engine/ai_sounds.h" bool ESoundThumbnail::OnMaxAIDistAfterEdit(PropValue* sender, float& edit_val) { diff --git a/src/Editors/xrECore/Editor/EditMeshRender.cpp b/src/Editors/xrECore/Editor/EditMeshRender.cpp index 19276a8594..5b8ae4ecea 100644 --- a/src/Editors/xrECore/Editor/EditMeshRender.cpp +++ b/src/Editors/xrECore/Editor/EditMeshRender.cpp @@ -9,7 +9,7 @@ #include "EditMesh.h" #include "EditObject.h" #include "ui_main.h" -#include "d3dutils.h" +#include "D3DUtils.h" #include "render.h" #include diff --git a/src/Editors/xrECore/Editor/EditObject.cpp b/src/Editors/xrECore/Editor/EditObject.cpp index 9c676fd6e2..9ab40c3c3a 100644 --- a/src/Editors/xrECore/Editor/EditObject.cpp +++ b/src/Editors/xrECore/Editor/EditObject.cpp @@ -5,7 +5,7 @@ #include "stdafx.h" #pragma hdrstop -#include "..\..\..\xrEngine\fmesh.h" +#include "../../../xrEngine/Fmesh.h" #include "EditObject.h" #include "EditMesh.h" diff --git a/src/Editors/xrECore/Editor/EditObject.h b/src/Editors/xrECore/Editor/EditObject.h index a4a3537709..19d582399f 100644 --- a/src/Editors/xrECore/Editor/EditObject.h +++ b/src/Editors/xrECore/Editor/EditObject.h @@ -11,7 +11,7 @@ #endif # include "..\..\..\Include\xrRender\Kinematics.h" -#include "physicsshellholdereditorbase.h" +#include "PhysicsShellHolderEditorBase.h" #include "Engine/GameMtlLib.h" //---------------------------------------------------- diff --git a/src/Editors/xrECore/Editor/EditObjectEditor.cpp b/src/Editors/xrECore/Editor/EditObjectEditor.cpp index 04ad648530..b896fc095c 100644 --- a/src/Editors/xrECore/Editor/EditObjectEditor.cpp +++ b/src/Editors/xrECore/Editor/EditObjectEditor.cpp @@ -7,7 +7,7 @@ #include "../../xrEngine/bone.h" #include "ExportSkeleton.h" #include "ExportObjectOGF.h" -#include "d3dutils.h" +#include "D3DUtils.h" #include "ui_main.h" #include "render.h" #include "../Public/PropertiesListHelper.h" diff --git a/src/Editors/xrECore/Editor/EditObjectIO.cpp b/src/Editors/xrECore/Editor/EditObjectIO.cpp index 8af47e1db5..5c61f7bbf4 100644 --- a/src/Editors/xrECore/Editor/EditObjectIO.cpp +++ b/src/Editors/xrECore/Editor/EditObjectIO.cpp @@ -10,8 +10,8 @@ #include "../xrEngine/bone.h" #include "../xrEngine/motion.h" - #include "exportskeleton.h" - #include "exportobjectOGF.h" +#include "ExportSkeleton.h" +#include "ExportObjectOGF.h" #if 1 #include "../Layers/xrRender/Shader.h" diff --git a/src/Editors/xrECore/Editor/EditObjectSkin.cpp b/src/Editors/xrECore/Editor/EditObjectSkin.cpp index ede4bc44de..d2b988c16f 100644 --- a/src/Editors/xrECore/Editor/EditObjectSkin.cpp +++ b/src/Editors/xrECore/Editor/EditObjectSkin.cpp @@ -7,7 +7,7 @@ #include "EditObject.h" #include "EditMesh.h" -#include "d3dutils.h" +#include "D3DUtils.h" #include "../Public/PropertiesListHelper.h" #include "ui_main.h" diff --git a/src/Editors/xrECore/Editor/EditorPreferences.cpp b/src/Editors/xrECore/Editor/EditorPreferences.cpp index d8cdcd437f..7f11053aca 100644 --- a/src/Editors/xrECore/Editor/EditorPreferences.cpp +++ b/src/Editors/xrECore/Editor/EditorPreferences.cpp @@ -6,7 +6,7 @@ #include "../xrEUI/xrUITheme.h" #include "ui_main.h" -#include "ui_toolscustom.h" +#include "UI_ToolsCustom.h" //--------------------------------------------------------------------------- CCustomPreferences* EPrefs=0; //--------------------------------------------------------------------------- diff --git a/src/Editors/xrECore/Editor/ExportSkeleton.cpp b/src/Editors/xrECore/Editor/ExportSkeleton.cpp index e300fd6c45..22e8f8065b 100644 --- a/src/Editors/xrECore/Editor/ExportSkeleton.cpp +++ b/src/Editors/xrECore/Editor/ExportSkeleton.cpp @@ -19,8 +19,8 @@ #if 1 #include "ui_main.h" -#include "ui_toolscustom.h" -#include "..\Engine\XrGameMaterialLibraryEditors.h" +#include "UI_ToolsCustom.h" +#include "../Engine/XrGameMaterialLibraryEditors.h" #endif //#include "../../../Layers/xrRender/SkeletonAnimated.h" #include diff --git a/src/Editors/xrECore/Editor/ExportSkeletonCalculateTB.cpp b/src/Editors/xrECore/Editor/ExportSkeletonCalculateTB.cpp index 525fd47662..0b40c2ad22 100644 --- a/src/Editors/xrECore/Editor/ExportSkeletonCalculateTB.cpp +++ b/src/Editors/xrECore/Editor/ExportSkeletonCalculateTB.cpp @@ -11,8 +11,8 @@ // #include "../../xrCore/xrCore.h" -#include "../../../Layers/xrRender/hwcaps.h" -#include "../../../Layers/xrRender/hw.h" +#include "../../../Layers/xrRender/HWCaps.h" +#include "../../../Layers/xrRender/HW.h" #include "../../../xrEngine/pure.h" class CGameFont; @@ -33,7 +33,7 @@ DEFINE_VECTOR(shared_str,RStrVec,RStrVecIt); #include "ExportSkeleton.h" -#include "../engine/nvMeshMender.h" +#include "../Engine/NVMeshMender.h" #include "../../common/NvMender2003/nvMeshMender.cpp" #include "../../common/NvMender2003/nvMeshMender.h" #include "../../common/NvMender2003/mender_input_output.h" diff --git a/src/Editors/xrECore/Editor/ImageManagerLOD.cpp b/src/Editors/xrECore/Editor/ImageManagerLOD.cpp index ee0cef3471..a6b2a4f8cf 100644 --- a/src/Editors/xrECore/Editor/ImageManagerLOD.cpp +++ b/src/Editors/xrECore/Editor/ImageManagerLOD.cpp @@ -2,8 +2,8 @@ #pragma hdrstop #include "ImageManager.h" -#include "editobject.h" -#include "editmesh.h" +#include "EditObject.h" +#include "EditMesh.h" #include "ui_main.h" #include "../xrEngine/xrHemisphere.h" diff --git a/src/Editors/xrECore/Editor/PhysicsShellHolderEditorBase.h b/src/Editors/xrECore/Editor/PhysicsShellHolderEditorBase.h index 3eba8bba3a..3847ff01fe 100644 --- a/src/Editors/xrECore/Editor/PhysicsShellHolderEditorBase.h +++ b/src/Editors/xrECore/Editor/PhysicsShellHolderEditorBase.h @@ -1,7 +1,7 @@ #ifndef _PHYSICS_SHELL_HOLDER_EDITOR_BASE_ #define _PHYSICS_SHELL_HOLDER_EDITOR_BASE_ -#include "../../../xrphysics/iphysicsshellholder.h" +#include "../../../xrPhysics/IPhysicsShellHolder.h" class ECORE_API CPhysicsShellHolderEditorBase: public IPhysicsShellHolder { diff --git a/src/Editors/xrECore/Editor/SoundManager.cpp b/src/Editors/xrECore/Editor/SoundManager.cpp index f76e51315a..71b9c41809 100644 --- a/src/Editors/xrECore/Editor/SoundManager.cpp +++ b/src/Editors/xrECore/Editor/SoundManager.cpp @@ -3,7 +3,7 @@ #include "SoundManager.h" #include "../../utils/ETools/ETools.h" -#include "../../../xrSound/soundrender_environment.h" +#include "../../../xrSound/SoundRender_Environment.h" #include "EThumbnail.h" #include "ui_main.h" diff --git a/src/Editors/xrECore/Editor/UIIConPicker.cpp b/src/Editors/xrECore/Editor/UIIConPicker.cpp index ec66fa16b7..687dfbbcd3 100644 --- a/src/Editors/xrECore/Editor/UIIConPicker.cpp +++ b/src/Editors/xrECore/Editor/UIIConPicker.cpp @@ -1,6 +1,6 @@ //--------------------------------------------------------------------------- #include "stdafx.h" -#include "UIIconPicker.h" +#include "UIIConPicker.h" UIIconPicker* UIIconPicker::Form = nullptr; UIIconPicker::UIIconPicker() diff --git a/src/Editors/xrECore/Editor/UISoundEditorForm.cpp b/src/Editors/xrECore/Editor/UISoundEditorForm.cpp index 57244d89b4..3f6300230f 100644 --- a/src/Editors/xrECore/Editor/UISoundEditorForm.cpp +++ b/src/Editors/xrECore/Editor/UISoundEditorForm.cpp @@ -3,7 +3,7 @@ #include "UISoundEditorForm.h" #include "SoundManager.h" #include "../../../xrSound/stdafx.h" -#include "../../../xrSound/soundrender_source.h" +#include "../../../xrSound/SoundRender_Source.h" UISoundEditorForm *UISoundEditorForm::Form = nullptr; UISoundEditorForm::UISoundEditorForm() diff --git a/src/Editors/xrECore/Editor/UI_Camera.cpp b/src/Editors/xrECore/Editor/UI_Camera.cpp index 9c896c88aa..af76b2fe01 100644 --- a/src/Editors/xrECore/Editor/UI_Camera.cpp +++ b/src/Editors/xrECore/Editor/UI_Camera.cpp @@ -3,7 +3,7 @@ #include "UI_Camera.h" #include "ui_main.h" -#include "ui_toolscustom.h" +#include "UI_ToolsCustom.h" #include "../xrEngine/IGame_Level.h" #include "../xrEngine/CameraManager.h" diff --git a/src/Editors/xrECore/Editor/UI_MainCommand.cpp b/src/Editors/xrECore/Editor/UI_MainCommand.cpp index 3111d0c816..e51b6579e4 100644 --- a/src/Editors/xrECore/Editor/UI_MainCommand.cpp +++ b/src/Editors/xrECore/Editor/UI_MainCommand.cpp @@ -11,7 +11,7 @@ #include "UIImageEditorForm.h" #include "UIMinimapEditorForm.h" #include "UISoundEditorForm.h" -#include "d3dutils.h" +#include "D3DUtils.h" #include "UIMoveToCamera.h" #include "Library.h" diff --git a/src/Editors/xrECore/Editor/UI_ToolsCustom.cpp b/src/Editors/xrECore/Editor/UI_ToolsCustom.cpp index 7eb214b4e4..eb34a40d26 100644 --- a/src/Editors/xrECore/Editor/UI_ToolsCustom.cpp +++ b/src/Editors/xrECore/Editor/UI_ToolsCustom.cpp @@ -10,8 +10,8 @@ #include "../xrEngine/motion.h" #include "../xrEngine/bone.h" #include "../xrEngine/fmesh.h" -#include "library.h" -#include "d3dutils.h" +#include "Library.h" +#include "D3DUtils.h" //------------------------------------------------------------------------------ CToolCustom* Tools=0; diff --git a/src/Editors/xrECore/Editor/bone.cpp b/src/Editors/xrECore/Editor/bone.cpp index b5c0a17e55..7565e13241 100644 --- a/src/Editors/xrECore/Editor/bone.cpp +++ b/src/Editors/xrECore/Editor/bone.cpp @@ -3,7 +3,7 @@ #include "../xrEngine/bone.h" #include "../xrEngine/envelope.h" -#include "..\Editor\UI_ToolsCustom.h" +#include "UI_ToolsCustom.h" #define BONE_VERSION 0x0002 //------------------------------------------------------------------------------ diff --git a/src/Editors/xrECore/Editor/device.h b/src/Editors/xrECore/Editor/device.h index 1e7ada3416..c0169d0a09 100644 --- a/src/Editors/xrECore/Editor/device.h +++ b/src/Editors/xrECore/Editor/device.h @@ -1,14 +1,14 @@ #pragma once -#include "../../../xrengine/device.h" -#include "ui_camera.h" +#include "../../../xrEngine/device.h" +#include "UI_Camera.h" #include "../../../Layers/xrRender/HWCaps.h" -#include "../../../Layers/xrRender/hw.h" +#include "../../../Layers/xrRender/HW.h" #include "../../../xrEngine/pure.h" -#include "../../../xrCore/ftimer.h" -#include "estats.h" -#include "../../../xrEngine/shader_xrlc.h" -#include "../../../Layers/xrRender/shader.h" +#include "../../../xrCore/FTimer.h" +#include "EStats.h" +#include "../../../xrEngine/Shader_xrLC.h" +#include "../../../Layers/xrRender/Shader.h" #include "../../../Layers/xrRender/R_Backend.h" //--------------------------------------------------------------------------- diff --git a/src/Editors/xrECore/Editor/pDomain.cpp b/src/Editors/xrECore/Editor/pDomain.cpp index a98e99d530..596eba08c1 100644 --- a/src/Editors/xrECore/Editor/pDomain.cpp +++ b/src/Editors/xrECore/Editor/pDomain.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "d3dutils.h" +#include "D3DUtils.h" #include "ui_main.h" #include "../../Editors/Public/PropertiesListHelper.h" #include "ParticleEffectActions.h" diff --git a/src/Editors/xrECore/Editor/render.h b/src/Editors/xrECore/Editor/render.h index 2bdee1b72e..1cd46f1b62 100644 --- a/src/Editors/xrECore/Editor/render.h +++ b/src/Editors/xrECore/Editor/render.h @@ -1,16 +1,16 @@ //--------------------------------------------------------------------------- #pragma once -#include "..\..\..\xrCDB\frustum.h" -#include "..\..\..\XrEngine\vis_common.h" -#include "..\..\..\XrEngine\Render.h" +#include "../../../xrCDB/Frustum.h" +#include "../../../xrEngine/vis_common.h" +#include "../../../xrEngine/Render.h" -#include "../../../Layers/xrRender/blenders\blender.h" -#include "../../../Layers/xrRender/blenders\blender_clsid.h" +#include "../../../Layers/xrRender/blenders/Blender.h" +#include "../../../Layers/xrRender/blenders/Blender_CLSID.h" #include "../../../Layers/xrRender/xrRender_console.h" #include "../../../Layers/xrRender/PSLibrary.h" -#include "../../../Layers/xrRender/IRenderDetailModel.H" -#include "../../../Layers/xrRender/DetailModel.H" +#include "../../../Layers/xrRender/IRenderDetailModel.h" +#include "../../../Layers/xrRender/DetailModel.h" #include "../../../Layers/xrRender/ModelPool.h" #include "../../../Layers/xrRender/SkeletonCustom.h" #include "../../../xrCore/API/xrAPI.h" diff --git a/src/Editors/xrECore/Editor/ui_main.cpp b/src/Editors/xrECore/Editor/ui_main.cpp index b30ee71d83..11e82034a2 100644 --- a/src/Editors/xrECore/Editor/ui_main.cpp +++ b/src/Editors/xrECore/Editor/ui_main.cpp @@ -6,13 +6,13 @@ #include "../xrEngine/xr_input.h" #include "UI_ToolsCustom.h" -#include "UI_Main.h" -#include "d3dutils.h" +#include "ui_main.h" +#include "D3DUtils.h" #include "SoundManager.h" #include "../Layers/xrRender/PSLibrary.h" #include "../Layers/xrRender/dxRenderDeviceRender.h" -#include "UIIconPicker.h" +#include "UIIConPicker.h" #include "UIEditLightAnim.h" #include "UIImageEditorForm.h" #include "UISoundEditorForm.h" diff --git a/src/Editors/xrECore/stdafx.h b/src/Editors/xrECore/stdafx.h index 31e72e57b7..ef09e0e9bc 100644 --- a/src/Editors/xrECore/stdafx.h +++ b/src/Editors/xrECore/stdafx.h @@ -5,7 +5,7 @@ // DirectX headers #include #include "../xrEUI/stdafx.h" -#include "..\..\Layers\xrRenderDX9\xrD3DDefs.h" +#include "../../Layers/xrRenderDX9/xrD3DDefs.h" #include "../../utils/xrDXT/xrDXT.h" @@ -15,15 +15,15 @@ #define ECORE_API __declspec(dllimport) #endif -#include "..\..\xrEngine\stdafx.h" -#include "..\..\xrEngine\device.h" -#include "..\xrEProps\stdafx.h" -#include "..\..\xrCDB\xrCDB.h" -#include "..\..\xrSound\Sound.h" -#include "..\..\xrParticles\psystem.h" +#include "../../xrEngine/stdafx.h" +#include "../../xrEngine/device.h" +#include "../xrEProps/stdafx.h" +#include "../../xrCDB/xrCDB.h" +#include "../../xrSound/Sound.h" +#include "../../xrParticles/psystem.h" -#include "..\..\XrEngine\fmesh.h" -#include "..\..\XrEngine\_d3d_extensions.h" +#include "../../xrEngine/Fmesh.h" +#include "../../xrEngine/_d3d_extensions.h" #define smart_cast dynamic_cast #ifndef O_SEQUENTIAL @@ -63,13 +63,13 @@ using LPAStringVec = xr_vector; using LPAStringIt = LPAStringVec::iterator; -#include "..\Public\xrEProps.h" -#include "..\..\xrCore\Log.h" -#include "editor\ELog.h" -#include "..\..\XrEngine\defines.h" +#include "../Public/xrEProps.h" +#include "../../xrCore/log.h" +#include "Editor/ELog.h" +#include "../../xrEngine/defines.h" -#include "../../xrphysics/xrphysics.h" -#include "../../Layers\xrRender\FVF.h" +#include "../../xrPhysics/xrPhysics.h" +#include "../../Layers/xrRender/FVF.h" struct str_pred { @@ -82,9 +82,9 @@ struct astr_pred { return x; using FLvertexIt = FLvertexVec::iterator; @@ -129,8 +129,8 @@ using RStrVecIt = RStrVec::iterator; #define TEX_POINT_ATT "internal\\internal_light_attpoint" #define TEX_SPOT_ATT "internal\\internal_light_attclip" -#include "..\..\Layers\xrRender\ETextureParams.h" -#include "..\..\Layers\xrRender\\ResourceManager.h" +#include "../../Layers/xrRender/ETextureParams.h" +#include "../../Layers/xrRender/ResourceManager.h" #include "../../Layers/xrRender/blenders/Blender_Recorder.h" #include "../../Layers/xrRender/blenders/Blender.h" diff --git a/src/Editors/xrEProps/stdafx.h b/src/Editors/xrEProps/stdafx.h index e89dd4b834..cb1f3912ff 100644 --- a/src/Editors/xrEProps/stdafx.h +++ b/src/Editors/xrEProps/stdafx.h @@ -7,7 +7,7 @@ #endif #include -#include "..\..\XrCore\xrCore.h" +#include "../../xrCore/xrCore.h" #ifdef XREPROPS_EXPORTS inline void not_implemented() { @@ -17,18 +17,18 @@ inline void not_implemented() } #endif -#include "..\xrEUI\stdafx.h" -#include "..\..\xrEngine\stdafx.h" -#include "..\Public\xrEProps.h" +#include "../xrEUI/stdafx.h" +#include "../../xrEngine/stdafx.h" +#include "../Public/xrEProps.h" #include "ChooseTypes.H" #include "FolderLib.h" -#include "Tree\Base\UITreeItem.h" +#include "Tree/Base/UITreeItem.h" #include "ItemListHelper.h" #include "UITextForm.h" #include "UINumericVectorForm.h" -#include "Tree\Properties\UIPropertiesItem.h" -#include "Tree\Properties\UIPropertiesForm.h" -#include "Tree\ItemList\UIItemListForm.h" -#include "Tree\Choose\UIChooseFormItem.h" -#include "Tree\Choose\UIChooseForm.h" +#include "Tree/Properties/UIPropertiesItem.h" +#include "Tree/Properties/UIPropertiesForm.h" +#include "Tree/ItemList/UIItemListForm.h" +#include "Tree/Choose/UIChooseFormItem.h" +#include "Tree/Choose/UIChooseForm.h" #include "UIKeyPressForm.h" \ No newline at end of file diff --git a/src/Editors/xrEUI/imgui_impl_dx9.h b/src/Editors/xrEUI/imgui_impl_dx9.h index 9c7778e8e6..32ac98712a 100644 --- a/src/Editors/xrEUI/imgui_impl_dx9.h +++ b/src/Editors/xrEUI/imgui_impl_dx9.h @@ -10,7 +10,7 @@ // https://github.com/ocornut/imgui #pragma once -#include "..\XrEUI\stdafx.h" // IMGUI_IMPL_API +#include "stdafx.h" struct IDirect3DDevice9; diff --git a/src/Editors/xrEUI/stdafx.h b/src/Editors/xrEUI/stdafx.h index b279149fbc..6021163e45 100644 --- a/src/Editors/xrEUI/stdafx.h +++ b/src/Editors/xrEUI/stdafx.h @@ -9,7 +9,7 @@ using ImTextureID = IDirect3DBaseTexture9*; #define XREUI_API __declspec(dllimport) #endif -#include "..\..\xrCore\xrCore.h" +#include "../../xrCore/xrCore.h" #include "EditorWnd.h" #include "XrUIManager.h" diff --git a/src/Include/xrRender/KinematicsAnimated.h b/src/Include/xrRender/KinematicsAnimated.h index 41331722b9..430bb846a7 100644 --- a/src/Include/xrRender/KinematicsAnimated.h +++ b/src/Include/xrRender/KinematicsAnimated.h @@ -4,7 +4,7 @@ #include "../../xrEngine/SkeletonMotions.h" #include "animation_blend.h" -#include "../../layers/xrrender/KinematicAnimatedDefs.h" +#include "../../Layers/xrRender/KinematicAnimatedDefs.h" class IKinematics; class CBlend; diff --git a/src/Layers/xrRender/Animation.cpp b/src/Layers/xrRender/Animation.cpp index ad39722eeb..bde9c8a680 100644 --- a/src/Layers/xrRender/Animation.cpp +++ b/src/Layers/xrRender/Animation.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "animation.h" +#include "Animation.h" using namespace animation; diff --git a/src/Layers/xrRender/Blender_BmmD.cpp b/src/Layers/xrRender/Blender_BmmD.cpp index 15ec302f90..79ac7cffaf 100644 --- a/src/Layers/xrRender/Blender_BmmD.cpp +++ b/src/Layers/xrRender/Blender_BmmD.cpp @@ -5,8 +5,8 @@ #include "stdafx.h" #pragma hdrstop -#include "blender_BmmD.h" -#include "..\xrRender\uber_deffer.h" +#include "Blender_BmmD.h" +#include "uber_deffer.h" ////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/src/Layers/xrRender/Blender_Lm(EbB).cpp b/src/Layers/xrRender/Blender_Lm(EbB).cpp index 475382138a..88d4c94469 100644 --- a/src/Layers/xrRender/Blender_Lm(EbB).cpp +++ b/src/Layers/xrRender/Blender_Lm(EbB).cpp @@ -5,7 +5,7 @@ #include "stdafx.h" #pragma hdrstop -#include "blender_Lm(EbB).h" +#include "Blender_Lm(EbB).h" #include "uber_deffer.h" ////////////////////////////////////////////////////////////////////// diff --git a/src/Layers/xrRender/Blender_Model_EbB.cpp b/src/Layers/xrRender/Blender_Model_EbB.cpp index a91c566765..263bdd0169 100644 --- a/src/Layers/xrRender/Blender_Model_EbB.cpp +++ b/src/Layers/xrRender/Blender_Model_EbB.cpp @@ -5,7 +5,7 @@ #include "stdafx.h" #pragma hdrstop -#include "blender_Model_EbB.h" +#include "Blender_Model_EbB.h" #include "uber_deffer.h" ////////////////////////////////////////////////////////////////////// diff --git a/src/Layers/xrRender/Blender_Recorder_R2.cpp b/src/Layers/xrRender/Blender_Recorder_R2.cpp index a3c39cb9e1..7944740817 100644 --- a/src/Layers/xrRender/Blender_Recorder_R2.cpp +++ b/src/Layers/xrRender/Blender_Recorder_R2.cpp @@ -2,8 +2,8 @@ #pragma hdrstop #include "ResourceManager.h" -#include "blenders\Blender_Recorder.h" -#include "blenders\Blender.h" +#include "blenders/Blender_Recorder.h" +#include "blenders/Blender.h" #include "dxRenderDeviceRender.h" diff --git a/src/Layers/xrRender/Blender_Recorder_StandartBinding.cpp b/src/Layers/xrRender/Blender_Recorder_StandartBinding.cpp index e4607c39f7..809a8d0346 100644 --- a/src/Layers/xrRender/Blender_Recorder_StandartBinding.cpp +++ b/src/Layers/xrRender/Blender_Recorder_StandartBinding.cpp @@ -2,11 +2,11 @@ #pragma hdrstop #include "ResourceManager.h" -#include "blenders\Blender_Recorder.h" -#include "blenders\Blender.h" +#include "blenders/Blender_Recorder.h" +#include "blenders/Blender.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" #include "dxRenderDeviceRender.h" #include "../../xrEngine/IGame_Level.h" diff --git a/src/Layers/xrRender/Blender_detail_still.cpp b/src/Layers/xrRender/Blender_detail_still.cpp index e3cc77046f..c64c0e9ca9 100644 --- a/src/Layers/xrRender/Blender_detail_still.cpp +++ b/src/Layers/xrRender/Blender_detail_still.cpp @@ -5,7 +5,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_Detail_still.h" +#include "Blender_detail_still.h" ////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/src/Layers/xrRender/D3DUtils.cpp b/src/Layers/xrRender/D3DUtils.cpp index 7d8378ff88..1533877f28 100644 --- a/src/Layers/xrRender/D3DUtils.cpp +++ b/src/Layers/xrRender/D3DUtils.cpp @@ -3,8 +3,8 @@ #include "stdafx.h" #pragma hdrstop -#include "../../xrEngine/gamefont.h" -#include "d3dutils.h" +#include "../../xrEngine/GameFont.h" +#include "D3DUtils.h" #include "du_box.h" #include "du_sphere.h" #include "du_sphere_part.h" diff --git a/src/Layers/xrRender/DetailManager.h b/src/Layers/xrRender/DetailManager.h index 1cbf1bf314..630440f0fb 100644 --- a/src/Layers/xrRender/DetailManager.h +++ b/src/Layers/xrRender/DetailManager.h @@ -6,9 +6,9 @@ #define DetailManagerH #pragma once -#include "../../xrCore/xrpool.h" -#include "detailformat.h" -#include "detailmodel.h" +#include "../../xrCore/xrPool.h" +#include "DetailFormat.h" +#include "DetailModel.h" #include "light.h" #ifdef _EDITOR //. #include "ESceneClassList.h" diff --git a/src/Layers/xrRender/DetailManager_Decompress.cpp b/src/Layers/xrRender/DetailManager_Decompress.cpp index 09dd30028e..f3607d37e6 100644 --- a/src/Layers/xrRender/DetailManager_Decompress.cpp +++ b/src/Layers/xrRender/DetailManager_Decompress.cpp @@ -65,7 +65,7 @@ bool det_render_debug = false; #endif #endif -#include "../../xrEngine/gamemtllib.h" +#include "../../xrEngine/GameMtlLib.h" static void correction_orientation(const Fvector &pos, const Fvector &dir, const Fvector &ground_normal, float& target_angle) { diff --git a/src/Layers/xrRender/DetailManager_VS.cpp b/src/Layers/xrRender/DetailManager_VS.cpp index dbd0c42a86..3da1f1ef3c 100644 --- a/src/Layers/xrRender/DetailManager_VS.cpp +++ b/src/Layers/xrRender/DetailManager_VS.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #pragma hdrstop -#include "detailmanager.h" +#include "DetailManager.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" #ifdef USE_DX11 #include "../xrRenderDX10/dx10BufferUtils.h" diff --git a/src/Layers/xrRender/DetailManager_soft.cpp b/src/Layers/xrRender/DetailManager_soft.cpp index f0702ed47b..ec8c2b7657 100644 --- a/src/Layers/xrRender/DetailManager_soft.cpp +++ b/src/Layers/xrRender/DetailManager_soft.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "detailmanager.h" +#include "DetailManager.h" const u32 vs_size = 3000; diff --git a/src/Layers/xrRender/DetailModel.cpp b/src/Layers/xrRender/DetailModel.cpp index eee2c232e9..d71e2ba3be 100644 --- a/src/Layers/xrRender/DetailModel.cpp +++ b/src/Layers/xrRender/DetailModel.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #pragma hdrstop -#include "detailmodel.h" +#include "DetailModel.h" CDetail::~CDetail() { @@ -115,7 +115,7 @@ void CDetail::Load (IReader* S) } #ifndef _EDITOR -#include "xrstripify.h" +#include "xrStripify.h" void CDetail::Optimize () { diff --git a/src/Layers/xrRender/FBasicVisual.cpp b/src/Layers/xrRender/FBasicVisual.cpp index fa5bd28a14..244f227619 100644 --- a/src/Layers/xrRender/FBasicVisual.cpp +++ b/src/Layers/xrRender/FBasicVisual.cpp @@ -9,8 +9,8 @@ # include "../../xrEngine/render.h" #endif // #ifndef _EDITOR -#include "fbasicvisual.h" -#include "../../xrEngine/fmesh.h" +#include "FBasicVisual.h" +#include "../../xrEngine/Fmesh.h" ////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/src/Layers/xrRender/FHierrarhyVisual.cpp b/src/Layers/xrRender/FHierrarhyVisual.cpp index 40aef52fe8..a422e69dbb 100644 --- a/src/Layers/xrRender/FHierrarhyVisual.cpp +++ b/src/Layers/xrRender/FHierrarhyVisual.cpp @@ -8,7 +8,7 @@ #include "FHierrarhyVisual.h" #include "../../xrEngine/Fmesh.h" #ifndef _EDITOR -#include "../../xrEngine/render.h" +#include "../../xrEngine/Render.h" #else #include "../../xrCore/API/xrAPI.h" #endif diff --git a/src/Layers/xrRender/FHierrarhyVisual.h b/src/Layers/xrRender/FHierrarhyVisual.h index d67fe82a97..59ba65deda 100644 --- a/src/Layers/xrRender/FHierrarhyVisual.h +++ b/src/Layers/xrRender/FHierrarhyVisual.h @@ -7,7 +7,7 @@ #pragma once -#include "fbasicvisual.h" +#include "FBasicVisual.h" class FHierrarhyVisual : public dxRender_Visual { diff --git a/src/Layers/xrRender/FLOD.cpp b/src/Layers/xrRender/FLOD.cpp index 317bd38a1f..ee82f21776 100644 --- a/src/Layers/xrRender/FLOD.cpp +++ b/src/Layers/xrRender/FLOD.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "../../xrEngine/fmesh.h" -#include "flod.h" +#include "../../xrEngine/Fmesh.h" +#include "FLOD.h" struct _hw { diff --git a/src/Layers/xrRender/FLOD.h b/src/Layers/xrRender/FLOD.h index 00f0520366..9d271792cd 100644 --- a/src/Layers/xrRender/FLOD.h +++ b/src/Layers/xrRender/FLOD.h @@ -1,5 +1,5 @@ #pragma once -#include "fhierrarhyvisual.h" +#include "FHierrarhyVisual.h" class FLOD : public FHierrarhyVisual { diff --git a/src/Layers/xrRender/FProgressive.cpp b/src/Layers/xrRender/FProgressive.cpp index b075742745..5ad445b69c 100644 --- a/src/Layers/xrRender/FProgressive.cpp +++ b/src/Layers/xrRender/FProgressive.cpp @@ -5,7 +5,7 @@ #include "stdafx.h" #pragma hdrstop -#include "../../xrEngine/fmesh.h" +#include "../../xrEngine/Fmesh.h" #include "FProgressive.h" ////////////////////////////////////////////////////////////////////// diff --git a/src/Layers/xrRender/FSkinned.cpp b/src/Layers/xrRender/FSkinned.cpp index d54d318cfc..6369e142e6 100644 --- a/src/Layers/xrRender/FSkinned.cpp +++ b/src/Layers/xrRender/FSkinned.cpp @@ -5,7 +5,7 @@ #include "stdafx.h" #pragma hdrstop -#include "../../xrEngine/fmesh.h" +#include "../../xrEngine/Fmesh.h" #include "FSkinned.h" #include "SkeletonX.h" diff --git a/src/Layers/xrRender/FTreeVisual.cpp b/src/Layers/xrRender/FTreeVisual.cpp index 99d382d1a4..f26bfe9937 100644 --- a/src/Layers/xrRender/FTreeVisual.cpp +++ b/src/Layers/xrRender/FTreeVisual.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #pragma hdrstop -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/igame_level.h" -#include "../../xrEngine/environment.h" -#include "../../xrEngine/fmesh.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/IGame_Level.h" +#include "../../xrEngine/Environment.h" +#include "../../xrEngine/Fmesh.h" -#include "ftreevisual.h" +#include "FTreeVisual.h" shared_str m_xform ; shared_str m_xform_v ; diff --git a/src/Layers/xrRender/FVisual.cpp b/src/Layers/xrRender/FVisual.cpp index c69293c78e..36b0522047 100644 --- a/src/Layers/xrRender/FVisual.cpp +++ b/src/Layers/xrRender/FVisual.cpp @@ -5,8 +5,8 @@ #include "stdafx.h" #pragma hdrstop -#include "../../xrEngine/fmesh.h" -#include "fvisual.h" +#include "../../xrEngine/Fmesh.h" +#include "FVisual.h" #ifdef USE_DX11 #include "../xrRenderDX10/dx10BufferUtils.h" diff --git a/src/Layers/xrRender/HW.h b/src/Layers/xrRender/HW.h index 580d65f962..ca70fd8803 100644 --- a/src/Layers/xrRender/HW.h +++ b/src/Layers/xrRender/HW.h @@ -3,7 +3,7 @@ ////////////////////////////////////////////////////////////////////// #pragma once -#include "hwcaps.h" +#include "HWCaps.h" #ifndef _EDITOR # include diff --git a/src/Layers/xrRender/HWCaps.cpp b/src/Layers/xrRender/HWCaps.cpp index 2bd9652ff3..8cd63d44a5 100644 --- a/src/Layers/xrRender/HWCaps.cpp +++ b/src/Layers/xrRender/HWCaps.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #pragma hdrstop -#include "hwcaps.h" -#include "hw.h" +#include "HWCaps.h" +#include "HW.h" #ifndef _EDITOR u32 GetGpuNum() diff --git a/src/Layers/xrRender/LightTrack.cpp b/src/Layers/xrRender/LightTrack.cpp index 26bb2e2536..ac55b3a8b9 100644 --- a/src/Layers/xrRender/LightTrack.cpp +++ b/src/Layers/xrRender/LightTrack.cpp @@ -4,7 +4,7 @@ #include "stdafx.h" #include "LightTrack.h" -#include "../../include/xrRender/RenderVisual.h" +#include "../../Include/xrRender/RenderVisual.h" #include "../../xrEngine/xr_object.h" #ifdef _EDITOR diff --git a/src/Layers/xrRender/Light_DB.cpp b/src/Layers/xrRender/Light_DB.cpp index 2e9461aa79..cf3f9fe4ba 100644 --- a/src/Layers/xrRender/Light_DB.cpp +++ b/src/Layers/xrRender/Light_DB.cpp @@ -1,10 +1,10 @@ #include "StdAfx.h" #include "../../xrEngine/_d3d_extensions.h" #include "../../xrEngine/xrLevel.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" #include "../../utils/xrLC_Light/R_light.h" -#include "light_db.h" +#include "Light_DB.h" CLight_DB::CLight_DB() { diff --git a/src/Layers/xrRender/Light_DB.h b/src/Layers/xrRender/Light_DB.h index 2ed3dad666..eb5673ca8a 100644 --- a/src/Layers/xrRender/Light_DB.h +++ b/src/Layers/xrRender/Light_DB.h @@ -1,7 +1,7 @@ #pragma once #include "light.h" -#include "light_package.h" +#include "Light_Package.h" class CLight_DB { diff --git a/src/Layers/xrRender/ModelPool.cpp b/src/Layers/xrRender/ModelPool.cpp index 0b9baa2a05..939fa985fd 100644 --- a/src/Layers/xrRender/ModelPool.cpp +++ b/src/Layers/xrRender/ModelPool.cpp @@ -3,25 +3,25 @@ #include "ModelPool.h" -#include "../../xrEngine/fmesh.h" +#include "../../xrEngine/Fmesh.h" #include "../../xrEngine/IGame_Persistent.h" #ifndef _EDITOR - #include "fhierrarhyvisual.h" +#include "FHierrarhyVisual.h" #include "SkeletonAnimated.h" - #include "fvisual.h" - #include "fprogressive.h" - #include "fskinned.h" - #include "flod.h" - #include "ftreevisual.h" +#include "FVisual.h" +#include "FProgressive.h" +#include "FSkinned.h" +#include "FLOD.h" +#include "FTreeVisual.h" #include "ParticleGroup.h" #include "ParticleEffect.h" #else - #include "fvisual.h" - #include "fprogressive.h" +#include "FVisual.h" +#include "FProgressive.h" #include "ParticleEffect.h" #include "ParticleGroup.h" - #include "fskinned.h" - #include "fhierrarhyvisual.h" +#include "FSkinned.h" +#include "FHierrarhyVisual.h" #include "SkeletonAnimated.h" #endif diff --git a/src/Layers/xrRender/PSLibrary.h b/src/Layers/xrRender/PSLibrary.h index b94b3e1a62..67239a7cf7 100644 --- a/src/Layers/xrRender/PSLibrary.h +++ b/src/Layers/xrRender/PSLibrary.h @@ -4,7 +4,7 @@ #ifndef PSLibraryH #define PSLibraryH -#include "../../include/xrRender/particles_systems_library_interface.hpp" +#include "../../Include/xrRender/particles_systems_library_interface.hpp" namespace PS { class CPEDef; diff --git a/src/Layers/xrRender/ParticleEffect.h b/src/Layers/xrRender/ParticleEffect.h index 21d9f423ba..bc4165b3ab 100644 --- a/src/Layers/xrRender/ParticleEffect.h +++ b/src/Layers/xrRender/ParticleEffect.h @@ -5,8 +5,8 @@ #include "ParticleEffectDef.h" -#include "../xrRender/FBasicVisual.h" -#include "../xrRender/dxParticleCustom.h" +#include "FBasicVisual.h" +#include "dxParticleCustom.h" namespace PS { diff --git a/src/Layers/xrRender/ParticleGroup.h b/src/Layers/xrRender/ParticleGroup.h index 25d2536b47..c9d2d1a7ce 100644 --- a/src/Layers/xrRender/ParticleGroup.h +++ b/src/Layers/xrRender/ParticleGroup.h @@ -3,7 +3,7 @@ #define ParticleGroupH class ButtonValue; -#include "../xrRender/dxParticleCustom.h" +#include "dxParticleCustom.h" namespace PS { diff --git a/src/Layers/xrRender/R_Backend.h b/src/Layers/xrRender/R_Backend.h index 08878ceff1..1708d7b440 100644 --- a/src/Layers/xrRender/R_Backend.h +++ b/src/Layers/xrRender/R_Backend.h @@ -10,17 +10,17 @@ #define PGO(a) #endif -#include "r_DStreams.h" +#include "R_DStreams.h" #include "r_constants_cache.h" -#include "r_backend_xform.h" -#include "r_backend_hemi.h" -#include "r_backend_tree.h" +#include "R_Backend_xform.h" +#include "R_Backend_hemi.h" +#include "R_Backend_tree.h" #ifdef USE_DX11 # include "..\xrRenderPC_R4\r_backend_lod.h" #endif -#include "fvf.h" +#include "FVF.h" const u32 CULL_CCW = D3DCULL_CCW; const u32 CULL_CW = D3DCULL_CW; diff --git a/src/Layers/xrRender/R_Backend_Runtime.cpp b/src/Layers/xrRender/R_Backend_Runtime.cpp index da9f1ddd06..e384be67a7 100644 --- a/src/Layers/xrRender/R_Backend_Runtime.cpp +++ b/src/Layers/xrRender/R_Backend_Runtime.cpp @@ -3,7 +3,7 @@ using namespace DirectX; -#include "../../xrCDB/frustum.h" +#include "../../xrCDB/Frustum.h" #ifdef USE_DX11 #include "../xrRenderDX10/StateManager/dx10StateManager.h" diff --git a/src/Layers/xrRender/R_Backend_Runtime.h b/src/Layers/xrRender/R_Backend_Runtime.h index 4f64be33f5..3a897596e6 100644 --- a/src/Layers/xrRender/R_Backend_Runtime.h +++ b/src/Layers/xrRender/R_Backend_Runtime.h @@ -2,10 +2,10 @@ #define R_BACKEND_RUNTIMEH #pragma once -#include "sh_texture.h" -#include "sh_matrix.h" -#include "sh_constant.h" -#include "sh_rt.h" +#include "SH_Texture.h" +#include "SH_Matrix.h" +#include "SH_Constant.h" +#include "SH_RT.h" #ifdef USE_DX11 #include "../xrRenderDX10/dx10R_Backend_Runtime.h" diff --git a/src/Layers/xrRender/R_Backend_hemi.cpp b/src/Layers/xrRender/R_Backend_hemi.cpp index ca9a388246..a9a127f0a7 100644 --- a/src/Layers/xrRender/R_Backend_hemi.cpp +++ b/src/Layers/xrRender/R_Backend_hemi.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "r_backend_hemi.h" +#include "R_Backend_hemi.h" R_hemi::R_hemi() { diff --git a/src/Layers/xrRender/R_Backend_tree.cpp b/src/Layers/xrRender/R_Backend_tree.cpp index 953a15e34d..8ef15296bc 100644 --- a/src/Layers/xrRender/R_Backend_tree.cpp +++ b/src/Layers/xrRender/R_Backend_tree.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "r_backend_tree.h" +#include "R_Backend_tree.h" R_tree::R_tree() { diff --git a/src/Layers/xrRender/R_Backend_xform.cpp b/src/Layers/xrRender/R_Backend_xform.cpp index 847e569639..257339c42b 100644 --- a/src/Layers/xrRender/R_Backend_xform.cpp +++ b/src/Layers/xrRender/R_Backend_xform.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "r_backend_xform.h" +#include "R_Backend_xform.h" void R_xforms::set_W (const Fmatrix& m) { diff --git a/src/Layers/xrRender/R_DStreams.cpp b/src/Layers/xrRender/R_DStreams.cpp index ffa32c3414..414b283f26 100644 --- a/src/Layers/xrRender/R_DStreams.cpp +++ b/src/Layers/xrRender/R_DStreams.cpp @@ -4,7 +4,7 @@ #include "ResourceManager.h" #include "R_DStreams.h" -#include "../xrRender/dxRenderDeviceRender.h" +#include "dxRenderDeviceRender.h" ////////////////////////////////////////////////////////////////////// // Construction/Destruction ////////////////////////////////////////////////////////////////////// diff --git a/src/Layers/xrRender/R_calculate.cpp b/src/Layers/xrRender/R_calculate.cpp index 88542dcfea..abc7c8e4c4 100644 --- a/src/Layers/xrRender/R_calculate.cpp +++ b/src/Layers/xrRender/R_calculate.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "../../xrEngine/customhud.h" +#include "../../xrEngine/CustomHUD.h" float g_fSCREEN ; diff --git a/src/Layers/xrRender/R_sun.cpp b/src/Layers/xrRender/R_sun.cpp index ea56645aa6..f6a2361353 100644 --- a/src/Layers/xrRender/R_sun.cpp +++ b/src/Layers/xrRender/R_sun.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/irenderable.h" -#include "../xrRender/FBasicVisual.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/IRenderable.h" +#include "FBasicVisual.h" -#include "../xrRender/R_sun_support.h" +#include "R_sun_support.h" using namespace DirectX; diff --git a/src/Layers/xrRender/ResourceManager.cpp b/src/Layers/xrRender/ResourceManager.cpp index 24315d25d6..e9b63b938d 100644 --- a/src/Layers/xrRender/ResourceManager.cpp +++ b/src/Layers/xrRender/ResourceManager.cpp @@ -7,8 +7,8 @@ #include "ResourceManager.h" #include "tss.h" -#include "blenders\blender.h" -#include "blenders\blender_recorder.h" +#include "blenders/Blender.h" +#include "blenders/Blender_Recorder.h" #include #include "../xrRenderDX10/dx11XMLBlendCompiler.h" diff --git a/src/Layers/xrRender/ResourceManager.h b/src/Layers/xrRender/ResourceManager.h index f92faf922c..41d293bdfe 100644 --- a/src/Layers/xrRender/ResourceManager.h +++ b/src/Layers/xrRender/ResourceManager.h @@ -6,7 +6,7 @@ #define ResourceManagerH #pragma once -#include "shader.h" +#include "Shader.h" #include "tss_def.h" #include "TextureDescrManager.h" // refs diff --git a/src/Layers/xrRender/ResourceManager_Loader.cpp b/src/Layers/xrRender/ResourceManager_Loader.cpp index bff734ae77..a6e24b0bd9 100644 --- a/src/Layers/xrRender/ResourceManager_Loader.cpp +++ b/src/Layers/xrRender/ResourceManager_Loader.cpp @@ -2,7 +2,7 @@ #pragma hdrstop #include "ResourceManager.h" -#include "blenders\blender.h" +#include "blenders/Blender.h" void CResourceManager::OnDeviceDestroy(BOOL ) diff --git a/src/Layers/xrRender/SH_Atomic.cpp b/src/Layers/xrRender/SH_Atomic.cpp index 02b5ba51e2..6e44fd1e5b 100644 --- a/src/Layers/xrRender/SH_Atomic.cpp +++ b/src/Layers/xrRender/SH_Atomic.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "sh_atomic.h" +#include "SH_Atomic.h" #include "ResourceManager.h" #include "dxRenderDeviceRender.h" diff --git a/src/Layers/xrRender/Shader.h b/src/Layers/xrRender/Shader.h index 35efff0a6e..b2042e4eb2 100644 --- a/src/Layers/xrRender/Shader.h +++ b/src/Layers/xrRender/Shader.h @@ -9,11 +9,11 @@ #include "r_constants.h" #include "../../xrCore/xr_resource.h" -#include "sh_atomic.h" -#include "sh_texture.h" -#include "sh_matrix.h" -#include "sh_constant.h" -#include "sh_rt.h" +#include "SH_Atomic.h" +#include "SH_Texture.h" +#include "SH_Matrix.h" +#include "SH_Constant.h" +#include "SH_RT.h" typedef xr_vector sh_list; class CBlender_Compile; diff --git a/src/Layers/xrRender/SkeletonAnimated.cpp b/src/Layers/xrRender/SkeletonAnimated.cpp index bbafe4c73a..1120c89376 100644 --- a/src/Layers/xrRender/SkeletonAnimated.cpp +++ b/src/Layers/xrRender/SkeletonAnimated.cpp @@ -6,9 +6,9 @@ #include "AnimationKeyCalculate.h" #include "SkeletonX.h" -#include "../../xrEngine/fmesh.h" +#include "../../xrEngine/Fmesh.h" #ifdef DEBUG -#include "../../xrcore/dump_string.h" +#include "../../xrCore/dump_string.h" #endif extern int psSkeletonUpdate; using namespace animation; diff --git a/src/Layers/xrRender/SkeletonAnimated.h b/src/Layers/xrRender/SkeletonAnimated.h index 462037af68..dc19c3a556 100644 --- a/src/Layers/xrRender/SkeletonAnimated.h +++ b/src/Layers/xrRender/SkeletonAnimated.h @@ -2,8 +2,8 @@ #ifndef SkeletonAnimatedH #define SkeletonAnimatedH -#include "skeletoncustom.h" -#include "animation.h" +#include "SkeletonCustom.h" +#include "Animation.h" #include "../../xrEngine/SkeletonMotions.h" #include "../../Include/xrRender/KinematicsAnimated.h" diff --git a/src/Layers/xrRender/SkeletonCustom.cpp b/src/Layers/xrRender/SkeletonCustom.cpp index bd065cc909..ab1268d180 100644 --- a/src/Layers/xrRender/SkeletonCustom.cpp +++ b/src/Layers/xrRender/SkeletonCustom.cpp @@ -4,7 +4,7 @@ #include "SkeletonCustom.h" #include "SkeletonX.h" -#include "../../xrEngine/fmesh.h" +#include "../../xrEngine/Fmesh.h" #ifndef _EDITOR #include "../../xrEngine/Render.h" #endif diff --git a/src/Layers/xrRender/SkeletonCustom.h b/src/Layers/xrRender/SkeletonCustom.h index 57867a10f2..0f54694c2a 100644 --- a/src/Layers/xrRender/SkeletonCustom.h +++ b/src/Layers/xrRender/SkeletonCustom.h @@ -2,10 +2,10 @@ #ifndef SkeletonCustomH #define SkeletonCustomH -#include "fhierrarhyvisual.h" +#include "FHierrarhyVisual.h" #include "../../xrEngine/bone.h" #include "../../Include/xrRender/Kinematics.h" -#include "..\..\xrEngine\VisMask.h" +#include "../../xrEngine/VisMask.h" // refs class CKinematics; diff --git a/src/Layers/xrRender/SkeletonX.cpp b/src/Layers/xrRender/SkeletonX.cpp index ce3abf69e1..df5eec8701 100644 --- a/src/Layers/xrRender/SkeletonX.cpp +++ b/src/Layers/xrRender/SkeletonX.cpp @@ -13,7 +13,7 @@ #include "SkeletonX.h" #include "SkeletonCustom.h" -#include "../../xrEngine/fmesh.h" +#include "../../xrEngine/Fmesh.h" void xrSkin1W_x86( vertRender* D, vertBoned1W* S, u32 vCount, diff --git a/src/Layers/xrRender/blenders/Blender_Palette.cpp b/src/Layers/xrRender/blenders/Blender_Palette.cpp index b7e405bca3..59410bb7ae 100644 --- a/src/Layers/xrRender/blenders/Blender_Palette.cpp +++ b/src/Layers/xrRender/blenders/Blender_Palette.cpp @@ -4,7 +4,7 @@ #include "Blender.h" ////////////////////////////////////////////////////////////////////// -#include "blender_clsid.h" +#include "Blender_CLSID.h" IC bool p_sort (IBlender* A, IBlender* B) { return _stricmp(A->getComment(),B->getComment())<0; @@ -62,7 +62,7 @@ void IBlender::CreatePalette(xr_vector &palette) #ifndef _EDITOR // Engine -#include "../../../xrEngine/render.h" +#include "../../../xrEngine/Render.h" IBlender* IBlender::Create (CLASS_ID cls) { return ::RImplementation.blender_create (cls); @@ -74,26 +74,26 @@ void IBlender::Destroy (IBlender*& B) #else // Editor -#include "../../xrRenderPC_R1/blenderdefault.h" -#include "../../xrRenderPC_R1/blender_default_aref.h" -#include "../../xrRenderPC_R1/blender_vertex.h" -#include "../../xrRenderPC_R1/blender_vertex_aref.h" -#include "../blender_screen_set.h" -#include "../../xrRenderPC_R1/blender_screen_gray.h" -#include "../blender_editor_wire.h" -#include "../blender_editor_selection.h" +#include "../../xrRenderPC_R1/BlenderDefault.h" +#include "../../xrRenderPC_R1/Blender_default_aref.h" +#include "../../xrRenderPC_R1/Blender_Vertex.h" +#include "../../xrRenderPC_R1/Blender_Vertex_aref.h" +#include "../Blender_Screen_SET.h" +#include "../../xrRenderPC_R1/Blender_Screen_GRAY.h" +#include "../Blender_Editor_Wire.h" +#include "../Blender_Editor_Selection.h" //#include "blenders/blender_light.h" -#include "../../xrRenderPC_R1/blender_LaEmB.h" -#include "../blender_Lm(EbB).h" -#include "../blender_BmmD.h" +#include "../../xrRenderPC_R1/Blender_LaEmB.h" +#include "../Blender_Lm(EbB).h" +#include "../Blender_BmmD.h" //#include "blenders/blender_B.h" -#include "../../xrRenderPC_R1/blender_shadow_world.h" -#include "../../xrRenderPC_R1/blender_blur.h" -#include "../../xrRenderPC_R1/blender_model.h" -#include "../blender_model_ebb.h" -#include "../blender_detail_still.h" -#include "../blender_tree.h" -#include "../blender_particle.h" +#include "../../xrRenderPC_R1/Blender_Shadow_World.h" +#include "../../xrRenderPC_R1/Blender_Blur.h" +#include "../../xrRenderPC_R1/Blender_Model.h" +#include "../Blender_Model_EbB.h" +#include "../Blender_detail_still.h" +#include "../Blender_tree.h" +#include "../Blender_Particle.h" IBlender* IBlender::Create (CLASS_ID cls) { diff --git a/src/Layers/xrRender/dxEnvironmentRender.cpp b/src/Layers/xrRender/dxEnvironmentRender.cpp index aeaf3b88dc..e63589fd2e 100644 --- a/src/Layers/xrRender/dxEnvironmentRender.cpp +++ b/src/Layers/xrRender/dxEnvironmentRender.cpp @@ -3,8 +3,8 @@ #include "dxRenderDeviceRender.h" -#include "../../xrEngine/environment.h" -#include "../../Layers/xrRender/ResourceManager.h" +#include "../../xrEngine/Environment.h" +#include "ResourceManager.h" #include "../../xrEngine/xr_efflensflare.h" diff --git a/src/Layers/xrRender/dxEnvironmentRender.h b/src/Layers/xrRender/dxEnvironmentRender.h index 328615638a..666727d4d7 100644 --- a/src/Layers/xrRender/dxEnvironmentRender.h +++ b/src/Layers/xrRender/dxEnvironmentRender.h @@ -4,7 +4,7 @@ #include "../../Include/xrRender/EnvironmentRender.h" -#include "blenders/blender.h" +#include "blenders/Blender.h" class CBlender_skybox : public IBlender { public: diff --git a/src/Layers/xrRender/dxLensFlareRender.cpp b/src/Layers/xrRender/dxLensFlareRender.cpp index cbf272c17a..55739a5bbc 100644 --- a/src/Layers/xrRender/dxLensFlareRender.cpp +++ b/src/Layers/xrRender/dxLensFlareRender.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "dxLensFlareRender.h" #include "../../xrEngine/xr_efflensflare.h" -#include "../../xrEngine/iGame_persistent.h" +#include "../../xrEngine/IGame_Persistent.h" #define MAX_Flares 24 #define FAR_DIST g_pGamePersistent->Environment().CurrentEnv->far_plane diff --git a/src/Layers/xrRender/dxRainRender.cpp b/src/Layers/xrRender/dxRainRender.cpp index 6e55adb698..bb73fa032c 100644 --- a/src/Layers/xrRender/dxRainRender.cpp +++ b/src/Layers/xrRender/dxRainRender.cpp @@ -50,7 +50,7 @@ void dxRainRender::Copy(IRainRender &_in) *this = *(dxRainRender*)&_in; } -#include "../../xrEngine/iGame_persistent.h" +#include "../../xrEngine/IGame_Persistent.h" void dxRainRender::Render(CEffect_Rain &owner) { diff --git a/src/Layers/xrRender/dxRenderFactory.h b/src/Layers/xrRender/dxRenderFactory.h index 4e6130ad5d..2c039d0b8f 100644 --- a/src/Layers/xrRender/dxRenderFactory.h +++ b/src/Layers/xrRender/dxRenderFactory.h @@ -2,7 +2,7 @@ #define dxRenderFactory_included #pragma once -#include "..\..\Include\xrRender\RenderFactory.h" +#include "../../Include/xrRender/RenderFactory.h" #define RENDER_FACTORY_DECLARE(Class) \ virtual I##Class* Create##Class(); \ diff --git a/src/Layers/xrRender/dxStatGraphRender.h b/src/Layers/xrRender/dxStatGraphRender.h index 52c705bbff..df6bead8be 100644 --- a/src/Layers/xrRender/dxStatGraphRender.h +++ b/src/Layers/xrRender/dxStatGraphRender.h @@ -2,7 +2,7 @@ #define dxStatGraphRender_included #pragma once -#include "..\..\Include\xrRender\StatGraphRender.h" +#include "../../Include/xrRender/StatGraphRender.h" #include "../../xrEngine/StatGraph.h" diff --git a/src/Layers/xrRender/dxStatsRender.h b/src/Layers/xrRender/dxStatsRender.h index 1914cc2028..91de0ee8cd 100644 --- a/src/Layers/xrRender/dxStatsRender.h +++ b/src/Layers/xrRender/dxStatsRender.h @@ -2,7 +2,7 @@ #define dxStatsRender_included #pragma once -#include "..\..\Include\xrRender\StatsRender.h" +#include "../../Include/xrRender/StatsRender.h" class dxStatsRender : public IStatsRender { diff --git a/src/Layers/xrRender/dxThunderboltDescRender.h b/src/Layers/xrRender/dxThunderboltDescRender.h index bcc93b1764..8e6e5efd90 100644 --- a/src/Layers/xrRender/dxThunderboltDescRender.h +++ b/src/Layers/xrRender/dxThunderboltDescRender.h @@ -2,7 +2,7 @@ #define dxThunderboltDescRender_included #pragma once -#include "..\..\Include\xrRender\ThunderboltDescRender.h" +#include "../../Include/xrRender/ThunderboltDescRender.h" class IRender_DetailModel; diff --git a/src/Layers/xrRender/dxThunderboltRender.h b/src/Layers/xrRender/dxThunderboltRender.h index ac930fc5ac..c824a4a9e1 100644 --- a/src/Layers/xrRender/dxThunderboltRender.h +++ b/src/Layers/xrRender/dxThunderboltRender.h @@ -2,7 +2,7 @@ #define dxThunderboltRender_included #pragma once -#include "..\..\Include\xrRender\ThunderboltRender.h" +#include "../../Include/xrRender/ThunderboltRender.h" class dxThunderboltRender : public IThunderboltRender { diff --git a/src/Layers/xrRender/dxUIRender.h b/src/Layers/xrRender/dxUIRender.h index 90c97539ca..4b78591a8e 100644 --- a/src/Layers/xrRender/dxUIRender.h +++ b/src/Layers/xrRender/dxUIRender.h @@ -2,7 +2,7 @@ #define dxUIRender_included #pragma once -#include "..\..\Include\xrRender\UIRender.h" +#include "../../Include/xrRender/UIRender.h" class dxUIRender : public IUIRender { diff --git a/src/Layers/xrRender/dxUISequenceVideoItem.h b/src/Layers/xrRender/dxUISequenceVideoItem.h index f7f772a341..b8cc77aa7f 100644 --- a/src/Layers/xrRender/dxUISequenceVideoItem.h +++ b/src/Layers/xrRender/dxUISequenceVideoItem.h @@ -2,7 +2,7 @@ #define dxUISequenceVideoItem_included #pragma once -#include "..\..\Include\xrRender\UISequenceVideoItem.h" +#include "../../Include/xrRender/UISequenceVideoItem.h" class dxUISequenceVideoItem : public IUISequenceVideoItem { diff --git a/src/Layers/xrRender/dxUIShader.h b/src/Layers/xrRender/dxUIShader.h index 751c114c4c..b108657fd5 100644 --- a/src/Layers/xrRender/dxUIShader.h +++ b/src/Layers/xrRender/dxUIShader.h @@ -2,7 +2,7 @@ #define dxUIShader_included #pragma once -#include "..\..\Include\xrRender\UIShader.h" +#include "../../Include/xrRender/UIShader.h" class dxUIShader : public IUIShader { diff --git a/src/Layers/xrRender/dxWallMarkArray.h b/src/Layers/xrRender/dxWallMarkArray.h index 69aae1013e..a80162ed07 100644 --- a/src/Layers/xrRender/dxWallMarkArray.h +++ b/src/Layers/xrRender/dxWallMarkArray.h @@ -2,7 +2,7 @@ #define dxWallMarkArray_included #pragma once -#include "..\..\Include\xrRender\WallMarkArray.h" +#include "../../Include/xrRender/WallMarkArray.h" class dxWallMarkArray : public IWallMarkArray { diff --git a/src/Layers/xrRender/light.h b/src/Layers/xrRender/light.h index 3692bbd21c..78f75cc470 100644 --- a/src/Layers/xrRender/light.h +++ b/src/Layers/xrRender/light.h @@ -1,7 +1,7 @@ #ifndef LAYERS_XRRENDER_LIGHT_H_INCLUDED #define LAYERS_XRRENDER_LIGHT_H_INCLUDED -#include "../../xrcdb/ispatial.h" +#include "../../xrCDB/ISpatial.h" //#include "../../xrEngine/xr_object.h" #if (RENDER==R_R2) || (RENDER==R_R4) # include "light_package.h" diff --git a/src/Layers/xrRender/r__blenders.cpp b/src/Layers/xrRender/r__blenders.cpp index 73a05faf54..2a0a1cf081 100644 --- a/src/Layers/xrRender/r__blenders.cpp +++ b/src/Layers/xrRender/r__blenders.cpp @@ -1,19 +1,19 @@ #include "stdafx.h" -#include "../xrRender/uber_deffer.h" +#include "uber_deffer.h" -#include "../xrRender/blender_BmmD.h" +#include "Blender_BmmD.h" #include "blender_deffer_flat.h" #include "blender_deffer_model.h" #include "blender_deffer_aref.h" -#include "../xrRender/blender_screen_set.h" -#include "../xrRender/blender_editor_wire.h" -#include "../xrRender/blender_editor_selection.h" -#include "../xrRender/blender_tree.h" -#include "../xrRender/blender_detail_still.h" -#include "../xrRender/blender_particle.h" -#include "../xrRender/Blender_Model_EbB.h" -#include "../xrRender/blender_Lm(EbB).h" +#include "Blender_Screen_SET.h" +#include "Blender_Editor_Wire.h" +#include "Blender_Editor_Selection.h" +#include "Blender_tree.h" +#include "Blender_detail_still.h" +#include "Blender_Particle.h" +#include "Blender_Model_EbB.h" +#include "Blender_Lm(EbB).h" IBlender* CRender::blender_create (CLASS_ID cls) { diff --git a/src/Layers/xrRender/r__dsgraph_build.cpp b/src/Layers/xrRender/r__dsgraph_build.cpp index a7fffc8b20..0f05fc6635 100644 --- a/src/Layers/xrRender/r__dsgraph_build.cpp +++ b/src/Layers/xrRender/r__dsgraph_build.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "fhierrarhyvisual.h" +#include "FHierrarhyVisual.h" #include "SkeletonCustom.h" -#include "../../xrEngine/fmesh.h" -#include "../../xrEngine/irenderable.h" +#include "../../xrEngine/Fmesh.h" +#include "../../xrEngine/IRenderable.h" -#include "flod.h" -#include "particlegroup.h" +#include "FLOD.h" +#include "ParticleGroup.h" #include "FTreeVisual.h" using namespace R_dsgraph; diff --git a/src/Layers/xrRender/r__dsgraph_render.cpp b/src/Layers/xrRender/r__dsgraph_render.cpp index 52a94fafd9..8422cb188c 100644 --- a/src/Layers/xrRender/r__dsgraph_render.cpp +++ b/src/Layers/xrRender/r__dsgraph_render.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "../../xrEngine/render.h" -#include "../../xrEngine/irenderable.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" +#include "../../xrEngine/Render.h" +#include "../../xrEngine/IRenderable.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" #include "../../xrEngine/CustomHUD.h" #include "../../xrEngine/xr_object.h" @@ -716,10 +716,10 @@ void R_dsgraph_structure::r_dsgraph_render_subspace (IRender_Sector* _sector, CF View = 0; } -#include "fhierrarhyvisual.h" +#include "FHierrarhyVisual.h" #include "SkeletonCustom.h" -#include "../../xrEngine/fmesh.h" -#include "flod.h" +#include "../../xrEngine/Fmesh.h" +#include "FLOD.h" void R_dsgraph_structure::r_dsgraph_render_R1_box (IRender_Sector* _S, Fbox& BB, int sh) { diff --git a/src/Layers/xrRender/r__dsgraph_render_lods.cpp b/src/Layers/xrRender/r__dsgraph_render_lods.cpp index 8ed43cbdc5..c4765455b2 100644 --- a/src/Layers/xrRender/r__dsgraph_render_lods.cpp +++ b/src/Layers/xrRender/r__dsgraph_render_lods.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "flod.h" +#include "FLOD.h" #ifdef _EDITOR #include "igame_persistent.h" #include "environment.h" #else -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" #endif extern float r_ssaLOD_A; diff --git a/src/Layers/xrRender/r__dsgraph_structure.h b/src/Layers/xrRender/r__dsgraph_structure.h index f99917901b..6234a37c53 100644 --- a/src/Layers/xrRender/r__dsgraph_structure.h +++ b/src/Layers/xrRender/r__dsgraph_structure.h @@ -1,7 +1,7 @@ #pragma once -#include "../../xrEngine/render.h" -#include "../../xrcdb/ispatial.h" +#include "../../xrEngine/Render.h" +#include "../../xrCDB/ISpatial.h" #include "r__dsgraph_types.h" #include "r__sector.h" diff --git a/src/Layers/xrRender/r__dsgraph_types.h b/src/Layers/xrRender/r__dsgraph_types.h index e111b3eeba..e1dd729164 100644 --- a/src/Layers/xrRender/r__dsgraph_types.h +++ b/src/Layers/xrRender/r__dsgraph_types.h @@ -1,6 +1,6 @@ #pragma once -#include "../../xrCore/fixedmap.h" +#include "../../xrCore/FixedMap.h" //#define USE_DOUG_LEA_ALLOCATOR_FOR_RENDER diff --git a/src/Layers/xrRender/r__occlusion.cpp b/src/Layers/xrRender/r__occlusion.cpp index 2f420abfea..6e87442d8c 100644 --- a/src/Layers/xrRender/r__occlusion.cpp +++ b/src/Layers/xrRender/r__occlusion.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include ".\r__occlusion.h" +#include "r__occlusion.h" #include "QueryHelper.h" diff --git a/src/Layers/xrRender/r__pixel_calculator.cpp b/src/Layers/xrRender/r__pixel_calculator.cpp index fe57f7e285..589d7340bd 100644 --- a/src/Layers/xrRender/r__pixel_calculator.cpp +++ b/src/Layers/xrRender/r__pixel_calculator.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "r__pixel_calculator.h" #define rt_dimensions 1024 -#include "../xrRender/FBasicVisual.h" +#include "FBasicVisual.h" using namespace DirectX; diff --git a/src/Layers/xrRender/r__sector.cpp b/src/Layers/xrRender/r__sector.cpp index 1530384558..7b58ba7537 100644 --- a/src/Layers/xrRender/r__sector.cpp +++ b/src/Layers/xrRender/r__sector.cpp @@ -6,7 +6,7 @@ #include "r__sector.h" #include "../../xrEngine/xrLevel.h" #include "../../xrEngine/xr_object.h" -#include "fbasicvisual.h" +#include "FBasicVisual.h" #include "../../xrEngine/IGame_Persistent.h" #include "dxRenderDeviceRender.h" diff --git a/src/Layers/xrRender/r__sector_traversal.cpp b/src/Layers/xrRender/r__sector_traversal.cpp index 88bbb0d5f1..f13c8c752b 100644 --- a/src/Layers/xrRender/r__sector_traversal.cpp +++ b/src/Layers/xrRender/r__sector_traversal.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" -#include "fvf.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" +#include "FVF.h" CPortalTraverser PortalTraverser; diff --git a/src/Layers/xrRender/r_constants.cpp b/src/Layers/xrRender/r_constants.cpp index edf286b85c..4b46234b02 100644 --- a/src/Layers/xrRender/r_constants.cpp +++ b/src/Layers/xrRender/r_constants.cpp @@ -6,7 +6,7 @@ #include "../../xrCore/xrPool.h" #include "r_constants.h" -#include "../xrRender/dxRenderDeviceRender.h" +#include "dxRenderDeviceRender.h" #ifndef USE_DX11 #include "../xrRenderDX9/dx9ShaderUtils.h" diff --git a/src/Layers/xrRender/r_constants.h b/src/Layers/xrRender/r_constants.h index 0b93a7b4dd..f3be14c673 100644 --- a/src/Layers/xrRender/r_constants.h +++ b/src/Layers/xrRender/r_constants.h @@ -2,7 +2,7 @@ #define r_constantsH #pragma once -#include "../../xrcore/xr_resource.h" +#include "../../xrCore/xr_resource.h" #ifdef USE_DX11 diff --git a/src/Layers/xrRender/xrRender_console.cpp b/src/Layers/xrRender/xrRender_console.cpp index 936a0508c7..df13c9f658 100644 --- a/src/Layers/xrRender/xrRender_console.cpp +++ b/src/Layers/xrRender/xrRender_console.cpp @@ -198,7 +198,7 @@ float ps_r__test_exp_to_shaders_4 = 1.0f; BOOL ps_r2_particle_dt = FALSE; #ifndef _EDITOR -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" #include "../../xrEngine/xr_ioc_cmd.h" #ifdef USE_DX11 diff --git a/src/Layers/xrRender/xrStripify.cpp b/src/Layers/xrRender/xrStripify.cpp index d66f9f5f84..60d795c6e9 100644 --- a/src/Layers/xrRender/xrStripify.cpp +++ b/src/Layers/xrRender/xrStripify.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "xrstripify.h" +#include "xrStripify.h" #include "NvTriStrip.h" #include "VertexCache.h" diff --git a/src/Layers/xrRenderDX10/DX10 Rain/dx10RainBlender.cpp b/src/Layers/xrRenderDX10/DX10 Rain/dx10RainBlender.cpp index e0fec0c141..70bc79e648 100644 --- a/src/Layers/xrRenderDX10/DX10 Rain/dx10RainBlender.cpp +++ b/src/Layers/xrRenderDX10/DX10 Rain/dx10RainBlender.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "./dx10RainBlender.h" +#include "dx10RainBlender.h" void CBlender_rain::Compile(CBlender_Compile& C) { diff --git a/src/Layers/xrRenderDX10/dx10DetailManager_VS.cpp b/src/Layers/xrRenderDX10/dx10DetailManager_VS.cpp index b8ff60bbe0..bcb2c8ffa7 100644 --- a/src/Layers/xrRenderDX10/dx10DetailManager_VS.cpp +++ b/src/Layers/xrRenderDX10/dx10DetailManager_VS.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "../xrRender/DetailManager.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" -#include "../xrRenderDX10/dx10BufferUtils.h" +#include "dx10BufferUtils.h" const int quant = 16384; const int c_hdr = 10; diff --git a/src/Layers/xrRenderDX10/dx10r_constants.cpp b/src/Layers/xrRenderDX10/dx10r_constants.cpp index e3456c147d..320ef26735 100644 --- a/src/Layers/xrRenderDX10/dx10r_constants.cpp +++ b/src/Layers/xrRenderDX10/dx10r_constants.cpp @@ -8,7 +8,7 @@ #include "../xrRender/dxRenderDeviceRender.h" -#include "../xrRenderDX10/dx10ConstantBuffer.h" +#include "dx10ConstantBuffer.h" IC bool p_sort (ref_constant C1, ref_constant C2) { diff --git a/src/Layers/xrRenderDX10/dx11HWCaps.cpp b/src/Layers/xrRenderDX10/dx11HWCaps.cpp index 7873ba0af1..8a6d52e419 100644 --- a/src/Layers/xrRenderDX10/dx11HWCaps.cpp +++ b/src/Layers/xrRenderDX10/dx11HWCaps.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #pragma hdrstop -#include "../xrRender/hwcaps.h" -#include "../xrRender/hw.h" +#include "../xrRender/HWCaps.h" +#include "../xrRender/HW.h" extern u32 GetGpuNum(); diff --git a/src/Layers/xrRenderDX10/dx11ResourceManager_Resources.cpp b/src/Layers/xrRenderDX10/dx11ResourceManager_Resources.cpp index 3490c008fa..91d88c517e 100644 --- a/src/Layers/xrRenderDX10/dx11ResourceManager_Resources.cpp +++ b/src/Layers/xrRenderDX10/dx11ResourceManager_Resources.cpp @@ -3,17 +3,17 @@ #pragma warning(disable:4995) #ifndef _EDITOR -#include "../../xrEngine/render.h" +#include "../../xrEngine/Render.h" #endif #pragma warning(default:4995) #include "../xrRender/ResourceManager.h" #include "../xrRender/tss.h" -#include "../xrRender/blenders/blender.h" -#include "../xrRender/blenders/blender_recorder.h" +#include "../xrRender/blenders/Blender.h" +#include "../xrRender/blenders/Blender_Recorder.h" -#include "../xrRenderDX10/dx10BufferUtils.h" -#include "../xrRenderDX10/dx10ConstantBuffer.h" +#include "dx10BufferUtils.h" +#include "dx10ConstantBuffer.h" #include "../xrRender/ShaderResourceTraits.h" diff --git a/src/Layers/xrRenderDX10/dx11ResourceManager_Scripting.cpp b/src/Layers/xrRenderDX10/dx11ResourceManager_Scripting.cpp index 4f273ac022..1afc91572f 100644 --- a/src/Layers/xrRenderDX10/dx11ResourceManager_Scripting.cpp +++ b/src/Layers/xrRenderDX10/dx11ResourceManager_Scripting.cpp @@ -4,8 +4,8 @@ #include "../../xrEngine/Render.h" #include "../xrRender/ResourceManager.h" #include "../xrRender/tss.h" -#include "../xrRender/blenders/blender.h" -#include "../xrRender/blenders/blender_recorder.h" +#include "../xrRender/blenders/Blender.h" +#include "../xrRender/blenders/Blender_Recorder.h" // adopt_compiler don't have = operator And it can't have = operator #pragma warning( push ) #pragma warning( disable : 4512) diff --git a/src/Layers/xrRenderDX10/dx11SH_Texture.cpp b/src/Layers/xrRenderDX10/dx11SH_Texture.cpp index 8d6f9e58be..dccf623d76 100644 --- a/src/Layers/xrRenderDX10/dx11SH_Texture.cpp +++ b/src/Layers/xrRenderDX10/dx11SH_Texture.cpp @@ -4,7 +4,7 @@ #include "../xrRender/ResourceManager.h" #ifndef _EDITOR -#include "../../xrEngine/render.h" +#include "../../xrEngine/Render.h" #endif #include "../../xrEngine/tntQAVI.h" diff --git a/src/Layers/xrRenderDX10/dx11XMLBlendCompiler.h b/src/Layers/xrRenderDX10/dx11XMLBlendCompiler.h index f2bb442796..384c34deeb 100644 --- a/src/Layers/xrRenderDX10/dx11XMLBlendCompiler.h +++ b/src/Layers/xrRenderDX10/dx11XMLBlendCompiler.h @@ -1,7 +1,7 @@ #pragma once #include "../../xrCore/XmlParser/xrXMLParser.h" -#include "../xrRender/blenders/blender.h" -#include "../xrRender/blenders/blender_recorder.h" +#include "../xrRender/blenders/Blender.h" +#include "../xrRender/blenders/Blender_Recorder.h" class CXMLBlend { diff --git a/src/Layers/xrRenderDX9/dx9HWCaps.cpp b/src/Layers/xrRenderDX9/dx9HWCaps.cpp index d236b621f3..a8973e334e 100644 --- a/src/Layers/xrRenderDX9/dx9HWCaps.cpp +++ b/src/Layers/xrRenderDX9/dx9HWCaps.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #pragma hdrstop -#include "../xrRender/hwcaps.h" -#include "../xrRender/hw.h" +#include "../xrRender/HWCaps.h" +#include "../xrRender/HW.h" #ifndef USE_DX11 ECORE_API CHWCaps Caps; diff --git a/src/Layers/xrRenderDX9/dx9ResourceManager_Resources.cpp b/src/Layers/xrRenderDX9/dx9ResourceManager_Resources.cpp index 68b14c6cc1..a0cc3285fc 100644 --- a/src/Layers/xrRenderDX9/dx9ResourceManager_Resources.cpp +++ b/src/Layers/xrRenderDX9/dx9ResourceManager_Resources.cpp @@ -3,14 +3,14 @@ #pragma warning(disable:4995) #ifndef _EDITOR -#include "../../xrEngine/render.h" +#include "../../xrEngine/Render.h" #endif #pragma warning(default:4995) #include "../xrRender/ResourceManager.h" #include "../xrRender/tss.h" -#include "../xrRender/blenders/blender.h" -#include "../xrRender/blenders/blender_recorder.h" +#include "../xrRender/blenders/Blender.h" +#include "../xrRender/blenders/Blender_Recorder.h" #include #include diff --git a/src/Layers/xrRenderDX9/dx9ResourceManager_Scripting.cpp b/src/Layers/xrRenderDX9/dx9ResourceManager_Scripting.cpp index 3ee20c2562..3318e44d4a 100644 --- a/src/Layers/xrRenderDX9/dx9ResourceManager_Scripting.cpp +++ b/src/Layers/xrRenderDX9/dx9ResourceManager_Scripting.cpp @@ -5,8 +5,8 @@ #include "../../xrEngine/Render.h" #include "../xrRender/ResourceManager.h" #include "../xrRender/tss.h" -#include "../xrRender/blenders\blender.h" -#include "../xrRender/blenders\blender_recorder.h" +#include "../xrRender/blenders/Blender.h" +#include "../xrRender/blenders/Blender_Recorder.h" #include "../../xrEngine/ai_script_space.h" #include "../../xrEngine/ai_script_lua_extension.h" #include "luabind/return_reference_to_policy.hpp" diff --git a/src/Layers/xrRenderDX9/dx9SH_Texture.cpp b/src/Layers/xrRenderDX9/dx9SH_Texture.cpp index dffd72f5fe..a85e54e55b 100644 --- a/src/Layers/xrRenderDX9/dx9SH_Texture.cpp +++ b/src/Layers/xrRenderDX9/dx9SH_Texture.cpp @@ -4,7 +4,7 @@ #include "../xrRender/ResourceManager.h" #ifndef _EDITOR -#include "../../xrEngine/render.h" +#include "../../xrEngine/Render.h" #endif #include "../../xrEngine/tntQAVI.h" diff --git a/src/Layers/xrRenderPC_R1/BlenderDefault.cpp b/src/Layers/xrRenderPC_R1/BlenderDefault.cpp index 3d5e0d66d5..8909c79187 100644 --- a/src/Layers/xrRenderPC_R1/BlenderDefault.cpp +++ b/src/Layers/xrRenderPC_R1/BlenderDefault.cpp @@ -6,7 +6,7 @@ #pragma hdrstop #include "BlenderDefault.h" -#include "..\xrRender\uber_deffer.h" +#include "../xrRender/uber_deffer.h" ////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/src/Layers/xrRenderPC_R1/Blender_LaEmB.cpp b/src/Layers/xrRenderPC_R1/Blender_LaEmB.cpp index 27f548d665..4039f10c4b 100644 --- a/src/Layers/xrRenderPC_R1/Blender_LaEmB.cpp +++ b/src/Layers/xrRenderPC_R1/Blender_LaEmB.cpp @@ -5,7 +5,7 @@ #include "stdafx.h" #pragma hdrstop -#include "blender_LaEmB.h" +#include "Blender_LaEmB.h" ////////////////////////////////////////////////////////////////////// // Construction/Destruction diff --git a/src/Layers/xrRenderPC_R1/FStaticRender.cpp b/src/Layers/xrRenderPC_R1/FStaticRender.cpp index bd59882498..dacda2b5c0 100644 --- a/src/Layers/xrRenderPC_R1/FStaticRender.cpp +++ b/src/Layers/xrRenderPC_R1/FStaticRender.cpp @@ -8,14 +8,14 @@ #include "../xrRenderDX9/dx9ShaderUtils.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" -#include "../xrRender/fbasicvisual.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" +#include "../xrRender/FBasicVisual.h" #include "../../xrEngine/CustomHUD.h" #include "../../xrEngine/xr_object.h" -#include "../../xrEngine/fmesh.h" +#include "../../xrEngine/Fmesh.h" #include "../xrRender/SkeletonCustom.h" -#include "../xrRender/lighttrack.h" +#include "../xrRender/LightTrack.h" #include "../xrRender/dxRenderDeviceRender.h" #include "../xrRender/dxWallMarkArray.h" #include "../xrRender/dxUIShader.h" diff --git a/src/Layers/xrRenderPC_R1/FStaticRender.h b/src/Layers/xrRenderPC_R1/FStaticRender.h index 4f31e6571a..09b39dc57f 100644 --- a/src/Layers/xrRenderPC_R1/FStaticRender.h +++ b/src/Layers/xrRenderPC_R1/FStaticRender.h @@ -4,18 +4,18 @@ #include "../xrRender/PSLibrary.h" -#include "../xrRender/hom.h" -#include "../xrRender/detailmanager.h" -#include "glowmanager.h" -#include "../xrRender/wallmarksengine.h" -#include "fstaticrender_rendertarget.h" -#include "../xrRender/modelpool.h" - -#include "lightShadows.h" -#include "lightProjector.h" -#include "lightPPA.h" -#include "../xrRender/light_DB.h" -#include "../../xrEngine/fmesh.h" +#include "../xrRender/HOM.h" +#include "../xrRender/DetailManager.h" +#include "GlowManager.h" +#include "../xrRender/WallmarksEngine.h" +#include "FStaticRender_RenderTarget.h" +#include "../xrRender/ModelPool.h" + +#include "LightShadows.h" +#include "LightProjector.h" +#include "LightPPA.h" +#include "../xrRender/Light_DB.h" +#include "../../xrEngine/Fmesh.h" #include class dxRender_Visual; diff --git a/src/Layers/xrRenderPC_R1/FStaticRender_Blenders.cpp b/src/Layers/xrRenderPC_R1/FStaticRender_Blenders.cpp index 83aba6aa78..29da121a11 100644 --- a/src/Layers/xrRenderPC_R1/FStaticRender_Blenders.cpp +++ b/src/Layers/xrRenderPC_R1/FStaticRender_Blenders.cpp @@ -1,23 +1,23 @@ #include "stdafx.h" -#include "blenderdefault.h" -#include "blender_default_aref.h" -#include "blender_vertex.h" -#include "blender_vertex_aref.h" -#include "../xrRender/blender_screen_set.h" -#include "blender_screen_gray.h" -#include "../xrRender/blender_editor_wire.h" -#include "../xrRender/blender_editor_selection.h" -#include "blender_LaEmB.h" -#include "../xrRender/blender_Lm(EbB).h" -#include "../xrRender/blender_BmmD.h" -#include "blender_shadow_world.h" -#include "blender_blur.h" -#include "blender_model.h" -#include "../xrRender/blender_model_ebb.h" -#include "../xrRender/blender_detail_still.h" -#include "../xrRender/blender_tree.h" -#include "../xrRender/blender_particle.h" +#include "BlenderDefault.h" +#include "Blender_default_aref.h" +#include "Blender_Vertex.h" +#include "Blender_Vertex_aref.h" +#include "../xrRender/Blender_Screen_SET.h" +#include "Blender_Screen_GRAY.h" +#include "../xrRender/Blender_Editor_Wire.h" +#include "../xrRender/Blender_Editor_Selection.h" +#include "Blender_LaEmB.h" +#include "../xrRender/Blender_Lm(EbB).h" +#include "../xrRender/Blender_BmmD.h" +#include "Blender_Shadow_World.h" +#include "Blender_Blur.h" +#include "Blender_Model.h" +#include "../xrRender/Blender_Model_EbB.h" +#include "../xrRender/Blender_detail_still.h" +#include "../xrRender/Blender_tree.h" +#include "../xrRender/Blender_Particle.h" IBlender* CRender::blender_create (CLASS_ID cls) { diff --git a/src/Layers/xrRenderPC_R1/FStaticRender_Loader.cpp b/src/Layers/xrRenderPC_R1/FStaticRender_Loader.cpp index e25e78f092..62bb296ff5 100644 --- a/src/Layers/xrRenderPC_R1/FStaticRender_Loader.cpp +++ b/src/Layers/xrRenderPC_R1/FStaticRender_Loader.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "../xrRender/fbasicvisual.h" -#include "../../xrEngine/fmesh.h" +#include "../xrRender/FBasicVisual.h" +#include "../../xrEngine/Fmesh.h" #include "../../xrEngine/xrLevel.h" #include "../../xrEngine/x_ray.h" #include "../../xrEngine/IGame_Persistent.h" diff --git a/src/Layers/xrRenderPC_R1/FStaticRender_RenderTarget.cpp b/src/Layers/xrRenderPC_R1/FStaticRender_RenderTarget.cpp index 10cfc63c65..c96e2efb2b 100644 --- a/src/Layers/xrRenderPC_R1/FStaticRender_RenderTarget.cpp +++ b/src/Layers/xrRenderPC_R1/FStaticRender_RenderTarget.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "fstaticrender_rendertarget.h" +#include "FStaticRender_RenderTarget.h" #include "../../xrEngine/IGame_Persistent.h" #include "../xrRender/blender_fxaa.h" diff --git a/src/Layers/xrRenderPC_R1/GlowManager.cpp b/src/Layers/xrRenderPC_R1/GlowManager.cpp index 5c428c772d..3ce225556e 100644 --- a/src/Layers/xrRenderPC_R1/GlowManager.cpp +++ b/src/Layers/xrRenderPC_R1/GlowManager.cpp @@ -3,8 +3,8 @@ ////////////////////////////////////////////////////////////////////// #include "stdafx.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" #include "../../xrEngine/x_ray.h" #include "../../xrEngine/GameFont.h" #include "GlowManager.h" diff --git a/src/Layers/xrRenderPC_R1/GlowManager.h b/src/Layers/xrRenderPC_R1/GlowManager.h index bfbc5059ac..8eec7429c6 100644 --- a/src/Layers/xrRenderPC_R1/GlowManager.h +++ b/src/Layers/xrRenderPC_R1/GlowManager.h @@ -6,8 +6,8 @@ #define AFX_GLOWMANAGER_H__EC35911F_479B_469A_845C_1A64D81D0326__INCLUDED_ #pragma once -#include "../../xrcdb/ispatial.h" -#include "../../xrcdb/xr_collide_defs.h" +#include "../../xrCDB/ISpatial.h" +#include "../../xrCDB/xr_collide_defs.h" class CGlow : public IRender_Glow, public ISpatial { diff --git a/src/Layers/xrRenderPC_R1/LightPPA.cpp b/src/Layers/xrRenderPC_R1/LightPPA.cpp index e3bb096cb1..88b668a80c 100644 --- a/src/Layers/xrRenderPC_R1/LightPPA.cpp +++ b/src/Layers/xrRenderPC_R1/LightPPA.cpp @@ -4,9 +4,9 @@ #include "stdafx.h" #include "LightPPA.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" -#include "../xrRender/fbasicvisual.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" +#include "../xrRender/FBasicVisual.h" #include "../../xrEngine/CustomHUD.h" const u32 MAX_POLYGONS = 1024*8; diff --git a/src/Layers/xrRenderPC_R1/LightProjector.cpp b/src/Layers/xrRenderPC_R1/LightProjector.cpp index 0cc480fb88..e81a1297e9 100644 --- a/src/Layers/xrRenderPC_R1/LightProjector.cpp +++ b/src/Layers/xrRenderPC_R1/LightProjector.cpp @@ -4,9 +4,9 @@ #include "stdafx.h" #include "LightProjector.h" -#include "../../include/xrRender/RenderVisual.h" +#include "../../Include/xrRender/RenderVisual.h" #include "../../xrEngine/xr_object.h" -#include "../xrRender/lighttrack.h" +#include "../xrRender/LightTrack.h" // tir2.xrdemo -> 45.2 // tir2.xrdemo -> 61.8 diff --git a/src/Layers/xrRenderPC_R1/LightShadows.cpp b/src/Layers/xrRenderPC_R1/LightShadows.cpp index 4189a33a44..3724ac5f8e 100644 --- a/src/Layers/xrRenderPC_R1/LightShadows.cpp +++ b/src/Layers/xrRenderPC_R1/LightShadows.cpp @@ -6,7 +6,7 @@ #include "LightShadows.h" #include "../xrRender/LightTrack.h" #include "../../xrEngine/xr_object.h" -#include "../xrRender/fbasicvisual.h" +#include "../xrRender/FBasicVisual.h" #include "../../xrEngine/CustomHUD.h" const float S_distance = 48; diff --git a/src/Layers/xrRenderPC_R1/stdafx.h b/src/Layers/xrRenderPC_R1/stdafx.h index 8ffe35844c..795ddfcac1 100644 --- a/src/Layers/xrRenderPC_R1/stdafx.h +++ b/src/Layers/xrRenderPC_R1/stdafx.h @@ -26,14 +26,14 @@ #define R_R4 4 #define RENDER R_R1 -#include "../xrRender/resourcemanager.h" +#include "../xrRender/ResourceManager.h" #include "../../xrEngine/vis_common.h" -#include "../../xrEngine/render.h" +#include "../../xrEngine/Render.h" #include "../../xrEngine/_d3d_extensions.h" #ifndef _EDITOR -#include "../../xrEngine/igame_level.h" +#include "../../xrEngine/IGame_Level.h" #include "../../xrParticles/psystem.h" #include "../xrRender/xrRender_console.h" @@ -45,5 +45,5 @@ #define TEX_SPOT_ATT "internal\\internal_light_attclip" -#include "../xrRender/blenders\blender.h" -#include "../xrRender/blenders\blender_clsid.h" \ No newline at end of file +#include "../xrRender/blenders/Blender.h" +#include "../xrRender/blenders/Blender_CLSID.h" diff --git a/src/Layers/xrRenderPC_R2/blender_bloom_build.cpp b/src/Layers/xrRenderPC_R2/blender_bloom_build.cpp index 346f5c052f..28646abffc 100644 --- a/src/Layers/xrRenderPC_R2/blender_bloom_build.cpp +++ b/src/Layers/xrRenderPC_R2/blender_bloom_build.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_bloom_build.h" +#include "blender_bloom_build.h" CBlender_bloom_build::CBlender_bloom_build () { description.CLS = 0; } CBlender_bloom_build::~CBlender_bloom_build () { } diff --git a/src/Layers/xrRenderPC_R2/blender_combine.cpp b/src/Layers/xrRenderPC_R2/blender_combine.cpp index 19271fd564..1e78e86085 100644 --- a/src/Layers/xrRenderPC_R2/blender_combine.cpp +++ b/src/Layers/xrRenderPC_R2/blender_combine.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_combine.h" +#include "blender_combine.h" CBlender_combine::CBlender_combine() { description.CLS = 0; diff --git a/src/Layers/xrRenderPC_R2/blender_deffer_aref.cpp b/src/Layers/xrRenderPC_R2/blender_deffer_aref.cpp index ffebf2869e..1114b17a27 100644 --- a/src/Layers/xrRenderPC_R2/blender_deffer_aref.cpp +++ b/src/Layers/xrRenderPC_R2/blender_deffer_aref.cpp @@ -2,7 +2,7 @@ #pragma hdrstop #include "../xrRender/uber_deffer.h" -#include "Blender_deffer_aref.h" +#include "blender_deffer_aref.h" CBlender_deffer_aref::CBlender_deffer_aref(bool _lmapped) : lmapped(_lmapped) { description.CLS = B_DEFAULT_AREF; diff --git a/src/Layers/xrRenderPC_R2/blender_deffer_flat.cpp b/src/Layers/xrRenderPC_R2/blender_deffer_flat.cpp index 3317f03558..0c6d6049c6 100644 --- a/src/Layers/xrRenderPC_R2/blender_deffer_flat.cpp +++ b/src/Layers/xrRenderPC_R2/blender_deffer_flat.cpp @@ -2,7 +2,7 @@ #pragma hdrstop #include "../xrRender/uber_deffer.h" -#include "Blender_deffer_flat.h" +#include "blender_deffer_flat.h" CBlender_deffer_flat::CBlender_deffer_flat() { description.CLS = B_DEFAULT; diff --git a/src/Layers/xrRenderPC_R2/blender_deffer_model.cpp b/src/Layers/xrRenderPC_R2/blender_deffer_model.cpp index abe2a2c830..97e49f61ac 100644 --- a/src/Layers/xrRenderPC_R2/blender_deffer_model.cpp +++ b/src/Layers/xrRenderPC_R2/blender_deffer_model.cpp @@ -2,7 +2,7 @@ #pragma hdrstop #include "../xrRender/uber_deffer.h" -#include "Blender_deffer_model.h" +#include "blender_deffer_model.h" CBlender_deffer_model::CBlender_deffer_model() { description.CLS = B_MODEL; diff --git a/src/Layers/xrRenderPC_R2/blender_light_mask.cpp b/src/Layers/xrRenderPC_R2/blender_light_mask.cpp index be3dc955dd..e7a57bf5ef 100644 --- a/src/Layers/xrRenderPC_R2/blender_light_mask.cpp +++ b/src/Layers/xrRenderPC_R2/blender_light_mask.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_light_mask.h" +#include "blender_light_mask.h" CBlender_accum_direct_mask::CBlender_accum_direct_mask () { description.CLS = 0; } CBlender_accum_direct_mask::~CBlender_accum_direct_mask () { } diff --git a/src/Layers/xrRenderPC_R2/blender_light_occq.cpp b/src/Layers/xrRenderPC_R2/blender_light_occq.cpp index adef8c73a4..510a555339 100644 --- a/src/Layers/xrRenderPC_R2/blender_light_occq.cpp +++ b/src/Layers/xrRenderPC_R2/blender_light_occq.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_light_occq.h" +#include "blender_light_occq.h" CBlender_light_occq::CBlender_light_occq () { description.CLS = 0; } CBlender_light_occq::~CBlender_light_occq () { } diff --git a/src/Layers/xrRenderPC_R2/blender_light_point.cpp b/src/Layers/xrRenderPC_R2/blender_light_point.cpp index 6495dd3a8a..f42b137e51 100644 --- a/src/Layers/xrRenderPC_R2/blender_light_point.cpp +++ b/src/Layers/xrRenderPC_R2/blender_light_point.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_light_point.h" +#include "blender_light_point.h" CBlender_accum_point::CBlender_accum_point() { description.CLS = 0; diff --git a/src/Layers/xrRenderPC_R2/blender_light_reflected.cpp b/src/Layers/xrRenderPC_R2/blender_light_reflected.cpp index 115ed03fa8..29d96d4e81 100644 --- a/src/Layers/xrRenderPC_R2/blender_light_reflected.cpp +++ b/src/Layers/xrRenderPC_R2/blender_light_reflected.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_light_reflected.h" +#include "blender_light_reflected.h" CBlender_accum_reflected::CBlender_accum_reflected () { description.CLS = 0; } CBlender_accum_reflected::~CBlender_accum_reflected () { } diff --git a/src/Layers/xrRenderPC_R2/blender_light_spot.cpp b/src/Layers/xrRenderPC_R2/blender_light_spot.cpp index 45d328221e..5595dd3f66 100644 --- a/src/Layers/xrRenderPC_R2/blender_light_spot.cpp +++ b/src/Layers/xrRenderPC_R2/blender_light_spot.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_light_spot.h" +#include "blender_light_spot.h" CBlender_accum_spot::CBlender_accum_spot() { description.CLS = 0; diff --git a/src/Layers/xrRenderPC_R2/blender_luminance.cpp b/src/Layers/xrRenderPC_R2/blender_luminance.cpp index 23bb883269..de8194978a 100644 --- a/src/Layers/xrRenderPC_R2/blender_luminance.cpp +++ b/src/Layers/xrRenderPC_R2/blender_luminance.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_luminance.h" +#include "blender_luminance.h" CBlender_luminance::CBlender_luminance () { description.CLS = 0; } CBlender_luminance::~CBlender_luminance () { } diff --git a/src/Layers/xrRenderPC_R2/blender_ssao.cpp b/src/Layers/xrRenderPC_R2/blender_ssao.cpp index 60b6f24ad9..b32e6bbbc4 100644 --- a/src/Layers/xrRenderPC_R2/blender_ssao.cpp +++ b/src/Layers/xrRenderPC_R2/blender_ssao.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_SSAO.h" +#include "blender_ssao.h" CBlender_SSAO::CBlender_SSAO () { description.CLS = 0; } CBlender_SSAO::~CBlender_SSAO () { } diff --git a/src/Layers/xrRenderPC_R2/r2.cpp b/src/Layers/xrRenderPC_R2/r2.cpp index b141b5bd48..a344017c88 100644 --- a/src/Layers/xrRenderPC_R2/r2.cpp +++ b/src/Layers/xrRenderPC_R2/r2.cpp @@ -4,11 +4,11 @@ #include "../xrRenderDX9/dx9ShaderUtils.h" #include "r2.h" -#include "../xrRender/fbasicvisual.h" +#include "../xrRender/FBasicVisual.h" #include "../../xrEngine/xr_object.h" #include "../../xrEngine/CustomHUD.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" #include "../../xrEngine/ICore_GPU.h" #include "../xrRender/SkeletonCustom.h" #include "../xrRender/LightTrack.h" diff --git a/src/Layers/xrRenderPC_R2/r2.h b/src/Layers/xrRenderPC_R2/r2.h index abf593d0dc..18be57fe89 100644 --- a/src/Layers/xrRenderPC_R2/r2.h +++ b/src/Layers/xrRenderPC_R2/r2.h @@ -8,18 +8,18 @@ #include "../xrRender/r__types.h" #include "r2_rendertarget.h" -#include "../xrRender/hom.h" -#include "../xrRender/detailmanager.h" -#include "../xrRender/modelpool.h" -#include "../xrRender/wallmarksengine.h" +#include "../xrRender/HOM.h" +#include "../xrRender/DetailManager.h" +#include "../xrRender/ModelPool.h" +#include "../xrRender/WallmarksEngine.h" -#include "smap_allocator.h" -#include "../xrRender/light_db.h" +#include "SMAP_Allocator.h" +#include "../xrRender/Light_DB.h" #include "../xrRender/LightTrack.h" #include "../xrRender/r_sun_cascades.h" -#include "../../xrEngine/irenderable.h" -#include "../../xrEngine/fmesh.h" +#include "../../xrEngine/IRenderable.h" +#include "../../xrEngine/Fmesh.h" #include diff --git a/src/Layers/xrRenderPC_R2/r2_R_render.cpp b/src/Layers/xrRenderPC_R2/r2_R_render.cpp index 5755cf7848..c6302428fc 100644 --- a/src/Layers/xrRenderPC_R2/r2_R_render.cpp +++ b/src/Layers/xrRenderPC_R2/r2_R_render.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "../../xrEngine/igame_persistent.h" +#include "../../xrEngine/IGame_Persistent.h" #include "../xrRender/FBasicVisual.h" -#include "../../xrEngine/customhud.h" +#include "../../xrEngine/CustomHUD.h" #include "../../xrEngine/xr_object.h" #include "../xrRender/SkeletonCustom.h" static float CalcSSADynamic (const Fvector& C, float R) diff --git a/src/Layers/xrRenderPC_R2/r2_loader.cpp b/src/Layers/xrRenderPC_R2/r2_loader.cpp index 585413b971..04d3ffcb0b 100644 --- a/src/Layers/xrRenderPC_R2/r2_loader.cpp +++ b/src/Layers/xrRenderPC_R2/r2_loader.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "r2.h" #include "../xrRender/ResourceManager.h" -#include "../xrRender/fbasicvisual.h" -#include "../../xrEngine/fmesh.h" +#include "../xrRender/FBasicVisual.h" +#include "../../xrEngine/Fmesh.h" #include "../../xrEngine/xrLevel.h" #include "../../xrEngine/x_ray.h" #include "../../xrEngine/IGame_Persistent.h" diff --git a/src/Layers/xrRenderPC_R2/r2_rendertarget.cpp b/src/Layers/xrRenderPC_R2/r2_rendertarget.cpp index 8b1e6c88ea..7dad19b2e7 100644 --- a/src/Layers/xrRenderPC_R2/r2_rendertarget.cpp +++ b/src/Layers/xrRenderPC_R2/r2_rendertarget.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "../xrRender/resourcemanager.h" +#include "../xrRender/ResourceManager.h" #include "blender_light_occq.h" #include "blender_light_mask.h" #include "blender_light_direct_cascade.h" diff --git a/src/Layers/xrRenderPC_R2/r2_rendertarget_accum_direct.cpp b/src/Layers/xrRenderPC_R2/r2_rendertarget_accum_direct.cpp index 16c8624e0d..837941e260 100644 --- a/src/Layers/xrRenderPC_R2/r2_rendertarget_accum_direct.cpp +++ b/src/Layers/xrRenderPC_R2/r2_rendertarget_accum_direct.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" ////////////////////////////////////////////////////////////////////////// // tables to calculate view-frustum bounds in world space diff --git a/src/Layers/xrRenderPC_R2/r2_rendertarget_phase_bloom.cpp b/src/Layers/xrRenderPC_R2/r2_rendertarget_phase_bloom.cpp index 78f1c0763f..770b93f9d7 100644 --- a/src/Layers/xrRenderPC_R2/r2_rendertarget_phase_bloom.cpp +++ b/src/Layers/xrRenderPC_R2/r2_rendertarget_phase_bloom.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" #pragma pack(push,4) struct v_build { diff --git a/src/Layers/xrRenderPC_R2/r2_rendertarget_phase_combine.cpp b/src/Layers/xrRenderPC_R2/r2_rendertarget_phase_combine.cpp index 98418d0365..dc563f5649 100644 --- a/src/Layers/xrRenderPC_R2/r2_rendertarget_phase_combine.cpp +++ b/src/Layers/xrRenderPC_R2/r2_rendertarget_phase_combine.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" #include "../xrRender/dxEnvironmentRender.h" diff --git a/src/Layers/xrRenderPC_R2/stdafx.h b/src/Layers/xrRenderPC_R2/stdafx.h index 72d0fd2a0d..232bc7ddbf 100644 --- a/src/Layers/xrRenderPC_R2/stdafx.h +++ b/src/Layers/xrRenderPC_R2/stdafx.h @@ -27,14 +27,14 @@ #define R_R4 4 #define RENDER R_R2 -#include "../xrRender/resourcemanager.h" +#include "../xrRender/ResourceManager.h" #include "../../xrEngine/vis_common.h" -#include "../../xrEngine/render.h" +#include "../../xrEngine/Render.h" #include "../../xrEngine/_d3d_extensions.h" -#include "../../xrEngine/igame_level.h" -#include "../xrRender/blenders\blender.h" -#include "../xrRender/blenders\blender_clsid.h" +#include "../../xrEngine/IGame_Level.h" +#include "../xrRender/blenders/Blender.h" +#include "../xrRender/blenders/Blender_CLSID.h" #include "../../xrParticles/psystem.h" #include "../xrRender/xrRender_console.h" #include "r2.h" diff --git a/src/Layers/xrRenderPC_R4/R_Backend_LOD.cpp b/src/Layers/xrRenderPC_R4/R_Backend_LOD.cpp index 1a999dc5e4..35546c0839 100644 --- a/src/Layers/xrRenderPC_R4/R_Backend_LOD.cpp +++ b/src/Layers/xrRenderPC_R4/R_Backend_LOD.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "r_backend_lod.h" +#include "R_Backend_LOD.h" R_LOD::R_LOD() { diff --git a/src/Layers/xrRenderPC_R4/blender_bloom_build.cpp b/src/Layers/xrRenderPC_R4/blender_bloom_build.cpp index 2914bb0991..f56b3cf2f1 100644 --- a/src/Layers/xrRenderPC_R4/blender_bloom_build.cpp +++ b/src/Layers/xrRenderPC_R4/blender_bloom_build.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_bloom_build.h" +#include "blender_bloom_build.h" CBlender_bloom_build::CBlender_bloom_build () { description.CLS = 0; } CBlender_bloom_build::~CBlender_bloom_build () { } diff --git a/src/Layers/xrRenderPC_R4/blender_combine.cpp b/src/Layers/xrRenderPC_R4/blender_combine.cpp index 14a07519e2..8986a2363a 100644 --- a/src/Layers/xrRenderPC_R4/blender_combine.cpp +++ b/src/Layers/xrRenderPC_R4/blender_combine.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_combine.h" +#include "blender_combine.h" CBlender_combine::CBlender_combine () { description.CLS = 0; } CBlender_combine::~CBlender_combine () { } diff --git a/src/Layers/xrRenderPC_R4/blender_deffer_aref.cpp b/src/Layers/xrRenderPC_R4/blender_deffer_aref.cpp index 260ba9a65e..d84ebe9df1 100644 --- a/src/Layers/xrRenderPC_R4/blender_deffer_aref.cpp +++ b/src/Layers/xrRenderPC_R4/blender_deffer_aref.cpp @@ -2,7 +2,7 @@ #pragma hdrstop #include "../xrRender/uber_deffer.h" -#include "Blender_deffer_aref.h" +#include "blender_deffer_aref.h" CBlender_deffer_aref::CBlender_deffer_aref (bool _lmapped) : lmapped(_lmapped) { description.CLS = B_DEFAULT_AREF; diff --git a/src/Layers/xrRenderPC_R4/blender_deffer_flat.cpp b/src/Layers/xrRenderPC_R4/blender_deffer_flat.cpp index 8feb53bba5..fa0fb91fab 100644 --- a/src/Layers/xrRenderPC_R4/blender_deffer_flat.cpp +++ b/src/Layers/xrRenderPC_R4/blender_deffer_flat.cpp @@ -2,7 +2,7 @@ #pragma hdrstop #include "../xrRender/uber_deffer.h" -#include "Blender_deffer_flat.h" +#include "blender_deffer_flat.h" CBlender_deffer_flat::CBlender_deffer_flat () { diff --git a/src/Layers/xrRenderPC_R4/blender_deffer_model.cpp b/src/Layers/xrRenderPC_R4/blender_deffer_model.cpp index 8d42e04d39..a09cec33a5 100644 --- a/src/Layers/xrRenderPC_R4/blender_deffer_model.cpp +++ b/src/Layers/xrRenderPC_R4/blender_deffer_model.cpp @@ -2,7 +2,7 @@ #pragma hdrstop #include "../xrRender/uber_deffer.h" -#include "Blender_deffer_model.h" +#include "blender_deffer_model.h" CBlender_deffer_model::CBlender_deffer_model () { description.CLS = B_MODEL; diff --git a/src/Layers/xrRenderPC_R4/blender_light_direct.cpp b/src/Layers/xrRenderPC_R4/blender_light_direct.cpp index 8e6eb5605a..4a2f436ae2 100644 --- a/src/Layers/xrRenderPC_R4/blender_light_direct.cpp +++ b/src/Layers/xrRenderPC_R4/blender_light_direct.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_light_direct.h" +#include "blender_light_direct.h" CBlender_accum_direct::CBlender_accum_direct () { description.CLS = 0; } CBlender_accum_direct::~CBlender_accum_direct () { } diff --git a/src/Layers/xrRenderPC_R4/blender_light_mask.cpp b/src/Layers/xrRenderPC_R4/blender_light_mask.cpp index 6aed618b53..7259c109e8 100644 --- a/src/Layers/xrRenderPC_R4/blender_light_mask.cpp +++ b/src/Layers/xrRenderPC_R4/blender_light_mask.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_light_mask.h" +#include "blender_light_mask.h" CBlender_accum_direct_mask::CBlender_accum_direct_mask() { description.CLS = 0; diff --git a/src/Layers/xrRenderPC_R4/blender_light_occq.cpp b/src/Layers/xrRenderPC_R4/blender_light_occq.cpp index 5e133c6bcf..5f8ab6f562 100644 --- a/src/Layers/xrRenderPC_R4/blender_light_occq.cpp +++ b/src/Layers/xrRenderPC_R4/blender_light_occq.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_light_occq.h" +#include "blender_light_occq.h" CBlender_light_occq::CBlender_light_occq() { description.CLS = 0; diff --git a/src/Layers/xrRenderPC_R4/blender_light_point.cpp b/src/Layers/xrRenderPC_R4/blender_light_point.cpp index 87d95aff04..3660cafd13 100644 --- a/src/Layers/xrRenderPC_R4/blender_light_point.cpp +++ b/src/Layers/xrRenderPC_R4/blender_light_point.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_light_point.h" +#include "blender_light_point.h" CBlender_accum_point::CBlender_accum_point() { description.CLS = 0; diff --git a/src/Layers/xrRenderPC_R4/blender_light_reflected.cpp b/src/Layers/xrRenderPC_R4/blender_light_reflected.cpp index 9c2038116e..4fd7cb725f 100644 --- a/src/Layers/xrRenderPC_R4/blender_light_reflected.cpp +++ b/src/Layers/xrRenderPC_R4/blender_light_reflected.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_light_reflected.h" +#include "blender_light_reflected.h" CBlender_accum_reflected::CBlender_accum_reflected() { description.CLS = 0; diff --git a/src/Layers/xrRenderPC_R4/blender_light_spot.cpp b/src/Layers/xrRenderPC_R4/blender_light_spot.cpp index c72a9f94c8..655814ddaf 100644 --- a/src/Layers/xrRenderPC_R4/blender_light_spot.cpp +++ b/src/Layers/xrRenderPC_R4/blender_light_spot.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_light_spot.h" +#include "blender_light_spot.h" CBlender_accum_spot::CBlender_accum_spot() { description.CLS = 0; diff --git a/src/Layers/xrRenderPC_R4/blender_luminance.cpp b/src/Layers/xrRenderPC_R4/blender_luminance.cpp index 666ac06c0e..ca65d60cc9 100644 --- a/src/Layers/xrRenderPC_R4/blender_luminance.cpp +++ b/src/Layers/xrRenderPC_R4/blender_luminance.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_luminance.h" +#include "blender_luminance.h" CBlender_luminance::CBlender_luminance() { description.CLS = 0; } CBlender_luminance::~CBlender_luminance() { } diff --git a/src/Layers/xrRenderPC_R4/blender_ssao.cpp b/src/Layers/xrRenderPC_R4/blender_ssao.cpp index 754628ed6a..a375d90123 100644 --- a/src/Layers/xrRenderPC_R4/blender_ssao.cpp +++ b/src/Layers/xrRenderPC_R4/blender_ssao.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "Blender_SSAO.h" +#include "blender_ssao.h" CBlender_SSAO::CBlender_SSAO () { description.CLS = 0; } CBlender_SSAO::~CBlender_SSAO () { } diff --git a/src/Layers/xrRenderPC_R4/r4.cpp b/src/Layers/xrRenderPC_R4/r4.cpp index 379e21c4ed..72824b753f 100644 --- a/src/Layers/xrRenderPC_R4/r4.cpp +++ b/src/Layers/xrRenderPC_R4/r4.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "r4.h" -#include "../xrRender/fbasicvisual.h" +#include "../xrRender/FBasicVisual.h" #include "../../xrEngine/xr_object.h" #include "../../xrEngine/CustomHUD.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" #include "../xrRender/SkeletonCustom.h" #include "../xrRender/LightTrack.h" #include "../xrRender/dxRenderDeviceRender.h" diff --git a/src/Layers/xrRenderPC_R4/r4.h b/src/Layers/xrRenderPC_R4/r4.h index a56654e152..c3c425cdd2 100644 --- a/src/Layers/xrRenderPC_R4/r4.h +++ b/src/Layers/xrRenderPC_R4/r4.h @@ -8,18 +8,18 @@ #include "../xrRender/r__types.h" #include "r4_rendertarget.h" -#include "../xrRender/hom.h" -#include "../xrRender/detailmanager.h" -#include "../xrRender/modelpool.h" -#include "../xrRender/wallmarksengine.h" +#include "../xrRender/HOM.h" +#include "../xrRender/DetailManager.h" +#include "../xrRender/ModelPool.h" +#include "../xrRender/WallmarksEngine.h" -#include "smap_allocator.h" -#include "../xrRender/light_db.h" +#include "SMAP_Allocator.h" +#include "../xrRender/Light_DB.h" #include "../xrRender/LightTrack.h" #include "../xrRender/r_sun_cascades.h" -#include "../../xrEngine/irenderable.h" -#include "../../xrEngine/fmesh.h" +#include "../../xrEngine/IRenderable.h" +#include "../../xrEngine/Fmesh.h" class dxRender_Visual; diff --git a/src/Layers/xrRenderPC_R4/r4_R_rain.cpp b/src/Layers/xrRenderPC_R4/r4_R_rain.cpp index 51027e3e41..c403f68f69 100644 --- a/src/Layers/xrRenderPC_R4/r4_R_rain.cpp +++ b/src/Layers/xrRenderPC_R4/r4_R_rain.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/irenderable.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/IRenderable.h" #include "../xrRender/FBasicVisual.h" #include "../xrRender/R_sun_support.h" diff --git a/src/Layers/xrRenderPC_R4/r4_R_render.cpp b/src/Layers/xrRenderPC_R4/r4_R_render.cpp index bfd2f4b29b..a4f65bde55 100644 --- a/src/Layers/xrRenderPC_R4/r4_R_render.cpp +++ b/src/Layers/xrRenderPC_R4/r4_R_render.cpp @@ -1,15 +1,15 @@ #include "stdafx.h" -#include "../../xrEngine/igame_persistent.h" +#include "../../xrEngine/IGame_Persistent.h" #include "../xrRender/FBasicVisual.h" -#include "../../xrEngine/customhud.h" +#include "../../xrEngine/CustomHUD.h" #include "../../xrEngine/xr_object.h" #include "../xrRender/QueryHelper.h" #include "FSR2Wrapper.h" -#include "../../xrEngine/gamefont.h" +#include "../../xrEngine/GameFont.h" #include "../../xrEngine/x_ray.h" #include "../xrRender/SkeletonCustom.h" static float CalcSSADynamic (const Fvector& C, float R) diff --git a/src/Layers/xrRenderPC_R4/r4_loader.cpp b/src/Layers/xrRenderPC_R4/r4_loader.cpp index 17e637b975..78677b3589 100644 --- a/src/Layers/xrRenderPC_R4/r4_loader.cpp +++ b/src/Layers/xrRenderPC_R4/r4_loader.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "r4.h" #include "../xrRender/ResourceManager.h" -#include "../xrRender/fbasicvisual.h" -#include "../../xrEngine/fmesh.h" +#include "../xrRender/FBasicVisual.h" +#include "../../xrEngine/Fmesh.h" #include "../../xrEngine/xrLevel.h" #include "../../xrEngine/x_ray.h" #include "../../xrEngine/IGame_Persistent.h" diff --git a/src/Layers/xrRenderPC_R4/r4_rendertarget.cpp b/src/Layers/xrRenderPC_R4/r4_rendertarget.cpp index c7840c9d1b..49add0bd7f 100644 --- a/src/Layers/xrRenderPC_R4/r4_rendertarget.cpp +++ b/src/Layers/xrRenderPC_R4/r4_rendertarget.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "../xrRender/resourcemanager.h" +#include "../xrRender/ResourceManager.h" #include "blender_light_occq.h" #include "blender_light_mask.h" #include "blender_light_direct.h" diff --git a/src/Layers/xrRenderPC_R4/r4_rendertarget_accum_direct.cpp b/src/Layers/xrRenderPC_R4/r4_rendertarget_accum_direct.cpp index ad183a2794..0dd2712224 100644 --- a/src/Layers/xrRenderPC_R4/r4_rendertarget_accum_direct.cpp +++ b/src/Layers/xrRenderPC_R4/r4_rendertarget_accum_direct.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" ////////////////////////////////////////////////////////////////////////// // tables to calculate view-frustum bounds in world space diff --git a/src/Layers/xrRenderPC_R4/r4_rendertarget_accum_point.cpp b/src/Layers/xrRenderPC_R4/r4_rendertarget_accum_point.cpp index be2052e543..7fca663ec9 100644 --- a/src/Layers/xrRenderPC_R4/r4_rendertarget_accum_point.cpp +++ b/src/Layers/xrRenderPC_R4/r4_rendertarget_accum_point.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "..\xrRender\CHudInitializer.h" +#include "../xrRender/CHudInitializer.h" void CRenderTarget::accum_point (light* L) { diff --git a/src/Layers/xrRenderPC_R4/r4_rendertarget_accum_spot.cpp b/src/Layers/xrRenderPC_R4/r4_rendertarget_accum_spot.cpp index 75a67ef261..0a818708ec 100644 --- a/src/Layers/xrRenderPC_R4/r4_rendertarget_accum_spot.cpp +++ b/src/Layers/xrRenderPC_R4/r4_rendertarget_accum_spot.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "../xrRender/du_cone.h" -#include "..\xrRender\CHudInitializer.h" +#include "../xrRender/CHudInitializer.h" void CRenderTarget::accum_spot(light* L) { if (L == nullptr) diff --git a/src/Layers/xrRenderPC_R4/r4_rendertarget_phase_bloom.cpp b/src/Layers/xrRenderPC_R4/r4_rendertarget_phase_bloom.cpp index 796cf10d80..59c096d17f 100644 --- a/src/Layers/xrRenderPC_R4/r4_rendertarget_phase_bloom.cpp +++ b/src/Layers/xrRenderPC_R4/r4_rendertarget_phase_bloom.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" #pragma pack(push,4) struct v_build { diff --git a/src/Layers/xrRenderPC_R4/r4_rendertarget_phase_combine.cpp b/src/Layers/xrRenderPC_R4/r4_rendertarget_phase_combine.cpp index 706c0232d0..4d003897a8 100644 --- a/src/Layers/xrRenderPC_R4/r4_rendertarget_phase_combine.cpp +++ b/src/Layers/xrRenderPC_R4/r4_rendertarget_phase_combine.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "../../xrEngine/igame_persistent.h" -#include "../../xrEngine/environment.h" +#include "../../xrEngine/IGame_Persistent.h" +#include "../../xrEngine/Environment.h" #include "../xrRender/dxEnvironmentRender.h" diff --git a/src/Layers/xrRenderPC_R4/stdafx.h b/src/Layers/xrRenderPC_R4/stdafx.h index bf769e934a..d0b647560f 100644 --- a/src/Layers/xrRenderPC_R4/stdafx.h +++ b/src/Layers/xrRenderPC_R4/stdafx.h @@ -33,14 +33,14 @@ #include "../xrRender/R_Backend.h" #include "../xrRender/R_Backend_Runtime.h" -#include "../xrRender/resourcemanager.h" +#include "../xrRender/ResourceManager.h" #include "../../xrEngine/vis_common.h" -#include "../../xrEngine/render.h" +#include "../../xrEngine/Render.h" #include "../../xrEngine/_d3d_extensions.h" -#include "../../xrEngine/igame_level.h" -#include "../xrRender/blenders\blender.h" -#include "../xrRender/blenders\blender_clsid.h" +#include "../../xrEngine/IGame_Level.h" +#include "../xrRender/blenders/Blender.h" +#include "../xrRender/blenders/Blender_CLSID.h" #include "../xrRender/xrRender_console.h" #include "r4.h" diff --git a/src/common/NvMender2003/NVMeshMender.cpp b/src/common/NvMender2003/NVMeshMender.cpp index 65c21fbd65..9ef5cd02aa 100644 --- a/src/common/NvMender2003/NVMeshMender.cpp +++ b/src/common/NvMender2003/NVMeshMender.cpp @@ -28,7 +28,7 @@ BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. */ #include "stdafx.h" -#include "nvMeshMender.h" +#include "NVMeshMender.h" #include "assert.h" namespace diff --git a/src/plugins/Max/kernel/DllEntry.cpp b/src/plugins/Max/kernel/DllEntry.cpp index 8a95a2d4b1..30ce4dd367 100644 --- a/src/plugins/Max/kernel/DllEntry.cpp +++ b/src/plugins/Max/kernel/DllEntry.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "Stdafx.h" #pragma hdrstop -#include "..\material\GameMaterial.h" +#include "../material/GameMaterial.h" extern ClassDesc2* GetXRayMtlDesc (); extern TCHAR* GetString (int id); diff --git a/src/plugins/Max/kernel/stdafx.cpp b/src/plugins/Max/kernel/stdafx.cpp index 47ba185752..23211831f4 100644 --- a/src/plugins/Max/kernel/stdafx.cpp +++ b/src/plugins/Max/kernel/stdafx.cpp @@ -1,3 +1,3 @@ -#include "stdafx.h" +#include "Stdafx.h" #pragma hdrstop diff --git a/src/plugins/Max/material/BlenderListLoader.cpp b/src/plugins/Max/material/BlenderListLoader.cpp index 442f87d738..763cb5ad22 100644 --- a/src/plugins/Max/material/BlenderListLoader.cpp +++ b/src/plugins/Max/material/BlenderListLoader.cpp @@ -1,4 +1,4 @@ -#include "../kernel/stdafx.h" +#include "../kernel/Stdafx.h" #pragma hdrstop #include "BlenderListLoader.h" diff --git a/src/plugins/Max/material/GameMaterial.cpp b/src/plugins/Max/material/GameMaterial.cpp index 7dec28ce9d..11f0eedccb 100644 --- a/src/plugins/Max/material/GameMaterial.cpp +++ b/src/plugins/Max/material/GameMaterial.cpp @@ -1,8 +1,8 @@ -#include "../kernel/stdafx.h" +#include "../kernel/Stdafx.h" #pragma hdrstop -#include "..\material\GameMaterial.h" -#include "..\material\BlenderListLoader.h" +#include "GameMaterial.h" +#include "BlenderListLoader.h" #include "macrorec.h" diff --git a/src/plugins/Max/material/GameMaterial.h b/src/plugins/Max/material/GameMaterial.h index e418a58cfe..f53d4f19fe 100644 --- a/src/plugins/Max/material/GameMaterial.h +++ b/src/plugins/Max/material/GameMaterial.h @@ -4,8 +4,8 @@ #include "shaders.h" #include "samplers.h" #include "iparamm2.h" -#include "texmaps.h" -#include "..\kernel\resources.h" +#include "TexMaps.h" +#include "../kernel/resources.h" #define XRAYMTL_CLASS_ID Class_ID(0x35e04198, 0x2293156c) diff --git a/src/plugins/Max/material/TexMaps.cpp b/src/plugins/Max/material/TexMaps.cpp index 8a99be07c8..3e537c6e56 100644 --- a/src/plugins/Max/material/TexMaps.cpp +++ b/src/plugins/Max/material/TexMaps.cpp @@ -1,11 +1,11 @@ //----------------------------------------------------------------------------- // Texmaps //----------------------------------------------------------------------------- -#include "../kernel/stdafx.h" +#include "../kernel/Stdafx.h" #pragma hdrstop -#include "texmaps.h" -#include "..\kernel\resources.h" +#include "TexMaps.h" +#include "../kernel/resources.h" extern TCHAR *GetString(int id); diff --git a/src/utils/CompressionTest/CompressionTest.cpp b/src/utils/CompressionTest/CompressionTest.cpp index 15a0c28aef..026d4980c7 100644 --- a/src/utils/CompressionTest/CompressionTest.cpp +++ b/src/utils/CompressionTest/CompressionTest.cpp @@ -1,8 +1,8 @@ #include #include #include - #include "../../xrcore/PPMd.h" - #include "../../xrcore/compression_ppmd_stream.h" +#include "../../xrCore/PPMd.h" +#include "../../xrCore/compression_ppmd_stream.h" #pragma warning( disable: 193 128 810 ) #include "../xrcompress/lzo/lzo1x.h" diff --git a/src/utils/ETools/ETools.cpp b/src/utils/ETools/ETools.cpp index bf031ac419..45a6d470f4 100644 --- a/src/utils/ETools/ETools.cpp +++ b/src/utils/ETools/ETools.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "ETools.h" #include "xrXRC.h" diff --git a/src/utils/ETools/ETools_cm.cpp b/src/utils/ETools/ETools_cm.cpp index 8d92251751..81588d92c2 100644 --- a/src/utils/ETools/ETools_cm.cpp +++ b/src/utils/ETools/ETools_cm.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "ETools.h" diff --git a/src/utils/ETools/Intersect.cpp b/src/utils/ETools/Intersect.cpp index 839b719bd9..6ce6964d8a 100644 --- a/src/utils/ETools/Intersect.cpp +++ b/src/utils/ETools/Intersect.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" +#include "StdAfx.h" -#include "etools.h" +#include "ETools.h" -#include "../../include/xrrender/kinematics.h" +#include "../../Include/xrRender/Kinematics.h" #define ECORE_API #include "../../xrEngine/bone.h" diff --git a/src/utils/ETools/PropSlimTools.cpp b/src/utils/ETools/PropSlimTools.cpp index c299e88197..0c9edc4314 100644 --- a/src/utils/ETools/PropSlimTools.cpp +++ b/src/utils/ETools/PropSlimTools.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "PropSlimTools.h" #include "object.h" #include "object_sliding.h" diff --git a/src/utils/ETools/StdAfx.cpp b/src/utils/ETools/StdAfx.cpp index 75acf6adaa..f6ede0831b 100644 --- a/src/utils/ETools/StdAfx.cpp +++ b/src/utils/ETools/StdAfx.cpp @@ -1,4 +1,4 @@ // stdafx.cpp : source file that includes just the standard includes // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/utils/ETools/audio.cpp b/src/utils/ETools/audio.cpp index 0a17ad959a..946a469309 100644 --- a/src/utils/ETools/audio.cpp +++ b/src/utils/ETools/audio.cpp @@ -7,7 +7,7 @@ ** ** AIFF/AIFC support from OggSquish, (c) 1994-1996 Monty **/ -#include "stdafx.h" +#include "StdAfx.h" #include #include diff --git a/src/utils/ETools/encode.cpp b/src/utils/ETools/encode.cpp index bdd96fda2d..20f0b0a4f3 100644 --- a/src/utils/ETools/encode.cpp +++ b/src/utils/ETools/encode.cpp @@ -8,7 +8,7 @@ ** Portions from Vorbize, (c) Kenneth Arnold ** and libvorbis examples, (c) Monty **/ -#include "stdafx.h" +#include "StdAfx.h" #include diff --git a/src/utils/ETools/mesh.h b/src/utils/ETools/mesh.h index f8c86bb9f0..9afaa604f0 100644 --- a/src/utils/ETools/mesh.h +++ b/src/utils/ETools/mesh.h @@ -12,8 +12,8 @@ // edges, points and triangles. //.#include "tomslib.h" -#include "dlink.h" -#include "arbitrarylist.h" +#include "DLink.h" +#include "ArbitraryList.h" // Before including this file, #define the following: // diff --git a/src/utils/ETools/object.cpp b/src/utils/ETools/object.cpp index 1470405078..1f7c88df9b 100644 --- a/src/utils/ETools/object.cpp +++ b/src/utils/ETools/object.cpp @@ -7,7 +7,7 @@ * below is included in the resulting source code, for example: * "Portions Copyright (C) Tom Forsyth, 2001" */ -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop #include "object.h" diff --git a/src/utils/ETools/object.h b/src/utils/ETools/object.h index a3be72a442..d3f087116c 100644 --- a/src/utils/ETools/object.h +++ b/src/utils/ETools/object.h @@ -59,7 +59,7 @@ struct MyTri #define MESHPT_APP_DEFINED MyPt mypt; -#include "../../xrcore/xrCore.h" +#include "../../xrCore/xrCore.h" #include "mesh.h" #include "../xrQSlim/src/MxQMetric.h" diff --git a/src/utils/ETools/object_sliding.cpp b/src/utils/ETools/object_sliding.cpp index 3c19fcc148..5abd10ca3d 100644 --- a/src/utils/ETools/object_sliding.cpp +++ b/src/utils/ETools/object_sliding.cpp @@ -7,7 +7,7 @@ * below is included in the resulting source code, for example: * "Portions Copyright (C) Tom Forsyth, 2001" */ -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop #pragma warning(push) diff --git a/src/utils/ETools/ogg_enc.cpp b/src/utils/ETools/ogg_enc.cpp index 23ff970788..6a1e42d29f 100644 --- a/src/utils/ETools/ogg_enc.cpp +++ b/src/utils/ETools/ogg_enc.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "ETools.h" #include "encode.h" diff --git a/src/utils/ETools/optimize_vertex_order.cpp b/src/utils/ETools/optimize_vertex_order.cpp index 20ea8b39f4..4d30100a0a 100644 --- a/src/utils/ETools/optimize_vertex_order.cpp +++ b/src/utils/ETools/optimize_vertex_order.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop #include "ArbitraryList.h" diff --git a/src/utils/ETools/platform.cpp b/src/utils/ETools/platform.cpp index a3025d0952..5d302f5d18 100644 --- a/src/utils/ETools/platform.cpp +++ b/src/utils/ETools/platform.cpp @@ -10,7 +10,7 @@ **/ /* Platform support routines - win32, OS/2, unix */ -#include "stdafx.h" +#include "StdAfx.h" #include "platform.h" #include "encode.h" diff --git a/src/utils/ETools/resample.cpp b/src/utils/ETools/resample.cpp index 110648d74c..b2a58997f4 100644 --- a/src/utils/ETools/resample.cpp +++ b/src/utils/ETools/resample.cpp @@ -1,6 +1,6 @@ /* resample.c: see resample.h for interesting stuff */ -#include "stdafx.h" +#include "StdAfx.h" #include #include diff --git a/src/utils/ETools/xrXRC.cpp b/src/utils/ETools/xrXRC.cpp index 3ad7251098..01d6bb6d53 100644 --- a/src/utils/ETools/xrXRC.cpp +++ b/src/utils/ETools/xrXRC.cpp @@ -2,7 +2,7 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop #include "xrXRC.h" diff --git a/src/utils/ctool/PPMTrain.cpp b/src/utils/ctool/PPMTrain.cpp index 6d56ab0b63..1e0f7243c4 100644 --- a/src/utils/ctool/PPMTrain.cpp +++ b/src/utils/ctool/PPMTrain.cpp @@ -10,7 +10,7 @@ #include #pragma hdrstop #include "PPMT_SA.hpp" -#include "../../xrcore/_types.h" +#include "../../xrCore/_types.h" const int MAX_O=8; const int UP_FREQ=5, INT_BITS=7, PERIOD_BITS=7, TOT_BITS=INT_BITS+PERIOD_BITS, diff --git a/src/utils/ctool/ctool.cpp b/src/utils/ctool/ctool.cpp index ccfc8ea20d..460aa6bdb3 100644 --- a/src/utils/ctool/ctool.cpp +++ b/src/utils/ctool/ctool.cpp @@ -1,7 +1,7 @@ #include - #include "../../xrcore/_types.h" +#include "../../xrCore/_types.h" #undef FLT_MAX #undef FLT_MIN #include diff --git a/src/utils/mp_balancer/xr_ini_ex.cpp b/src/utils/mp_balancer/xr_ini_ex.cpp index 3dc7ad3e39..b82084a343 100644 --- a/src/utils/mp_balancer/xr_ini_ex.cpp +++ b/src/utils/mp_balancer/xr_ini_ex.cpp @@ -2,7 +2,7 @@ #pragma hdrstop #include "xr_ini_ex.h" -#include "../../xrCore/fs_internal.h" +#include "../../xrCore/FS_internal.h" CInifileEx *pSettingsEx = NULL; diff --git a/src/utils/mp_gpprof_server/libraries/gamespy/GP/gptest/StdAfx.cpp b/src/utils/mp_gpprof_server/libraries/gamespy/GP/gptest/StdAfx.cpp index 46e6de4cee..fb49e219e0 100644 --- a/src/utils/mp_gpprof_server/libraries/gamespy/GP/gptest/StdAfx.cpp +++ b/src/utils/mp_gpprof_server/libraries/gamespy/GP/gptest/StdAfx.cpp @@ -2,7 +2,7 @@ // gptest.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/utils/mp_gpprof_server/libraries/gamespy/GP/gptest/gptest.cpp b/src/utils/mp_gpprof_server/libraries/gamespy/GP/gptest/gptest.cpp index 1d190f8192..5e56db3f70 100644 --- a/src/utils/mp_gpprof_server/libraries/gamespy/GP/gptest/gptest.cpp +++ b/src/utils/mp_gpprof_server/libraries/gamespy/GP/gptest/gptest.cpp @@ -1,7 +1,7 @@ // gptest.cpp : Defines the class behaviors for the application. // -#include "stdafx.h" +#include "StdAfx.h" #include "gptest.h" #include "gptestDlg.h" diff --git a/src/utils/mp_gpprof_server/libraries/gamespy/GP/gptest/gptestDlg.cpp b/src/utils/mp_gpprof_server/libraries/gamespy/GP/gptest/gptestDlg.cpp index 79c72ba1bb..e840a1aefa 100644 --- a/src/utils/mp_gpprof_server/libraries/gamespy/GP/gptest/gptestDlg.cpp +++ b/src/utils/mp_gpprof_server/libraries/gamespy/GP/gptest/gptestDlg.cpp @@ -1,7 +1,7 @@ // gptestDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "gptest.h" #include "gptestDlg.h" diff --git a/src/utils/mp_gpprof_server/libraries/gamespy/common/ps3/SpeexSpursTaskManager/SpursSpeexTaskManager.cpp b/src/utils/mp_gpprof_server/libraries/gamespy/common/ps3/SpeexSpursTaskManager/SpursSpeexTaskManager.cpp index 9860138ad1..618e3b1daa 100644 --- a/src/utils/mp_gpprof_server/libraries/gamespy/common/ps3/SpeexSpursTaskManager/SpursSpeexTaskManager.cpp +++ b/src/utils/mp_gpprof_server/libraries/gamespy/common/ps3/SpeexSpursTaskManager/SpursSpeexTaskManager.cpp @@ -19,7 +19,7 @@ subject to the following restrictions: #ifdef USE_SAMPLE_PROCESS -#include "spursThreadSupportInterface.h" +#include "spursthreadsupportinterface.h" //#include "SPUAssert.h" #include diff --git a/src/utils/mp_gpprof_server/libraries/gamespy/common/ps3/SpeexSpursTaskManager/spursSupportInterface.h b/src/utils/mp_gpprof_server/libraries/gamespy/common/ps3/SpeexSpursTaskManager/spursSupportInterface.h index 74250e8e26..d3584cd2bb 100644 --- a/src/utils/mp_gpprof_server/libraries/gamespy/common/ps3/SpeexSpursTaskManager/spursSupportInterface.h +++ b/src/utils/mp_gpprof_server/libraries/gamespy/common/ps3/SpeexSpursTaskManager/spursSupportInterface.h @@ -10,7 +10,7 @@ #include #include "spursUtilityMacros.h" -#include "spursThreadSupportInterface.h" +#include "spursthreadsupportinterface.h" #ifdef __SPU__ #include diff --git a/src/utils/mp_gpprof_server/libraries/gamespy/common/ps3/SpeexSpursTaskManager/spursThreadSupportInterface.cpp b/src/utils/mp_gpprof_server/libraries/gamespy/common/ps3/SpeexSpursTaskManager/spursThreadSupportInterface.cpp index 011b322f38..f20778294f 100644 --- a/src/utils/mp_gpprof_server/libraries/gamespy/common/ps3/SpeexSpursTaskManager/spursThreadSupportInterface.cpp +++ b/src/utils/mp_gpprof_server/libraries/gamespy/common/ps3/SpeexSpursTaskManager/spursThreadSupportInterface.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "spursThreadSupportInterface.h" +#include "spursthreadsupportinterface.h" spursThreadSupportInterface::~spursThreadSupportInterface() { diff --git a/src/utils/mp_gpprof_server/libraries/gamespy/ghttp/ghttpmfc/StdAfx.cpp b/src/utils/mp_gpprof_server/libraries/gamespy/ghttp/ghttpmfc/StdAfx.cpp index e371c47607..8e19c94248 100644 --- a/src/utils/mp_gpprof_server/libraries/gamespy/ghttp/ghttpmfc/StdAfx.cpp +++ b/src/utils/mp_gpprof_server/libraries/gamespy/ghttp/ghttpmfc/StdAfx.cpp @@ -2,7 +2,7 @@ // ghttpmfc.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/utils/mp_gpprof_server/libraries/gamespy/ghttp/ghttpmfc/ghttpmfc.cpp b/src/utils/mp_gpprof_server/libraries/gamespy/ghttp/ghttpmfc/ghttpmfc.cpp index b6f0f9f0c4..fdfec6037d 100644 --- a/src/utils/mp_gpprof_server/libraries/gamespy/ghttp/ghttpmfc/ghttpmfc.cpp +++ b/src/utils/mp_gpprof_server/libraries/gamespy/ghttp/ghttpmfc/ghttpmfc.cpp @@ -1,7 +1,7 @@ // ghttpmfc.cpp : Defines the class behaviors for the application. // -#include "stdafx.h" +#include "StdAfx.h" #include "ghttpmfc.h" #include "ghttpmfcDlg.h" diff --git a/src/utils/mp_gpprof_server/libraries/gamespy/ghttp/ghttpmfc/ghttpmfcDlg.cpp b/src/utils/mp_gpprof_server/libraries/gamespy/ghttp/ghttpmfc/ghttpmfcDlg.cpp index 9363bcee81..2e5c6e2ab4 100644 --- a/src/utils/mp_gpprof_server/libraries/gamespy/ghttp/ghttpmfc/ghttpmfcDlg.cpp +++ b/src/utils/mp_gpprof_server/libraries/gamespy/ghttp/ghttpmfc/ghttpmfcDlg.cpp @@ -1,7 +1,7 @@ // ghttpmfcDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "ghttpmfc.h" #include "ghttpmfcDlg.h" diff --git a/src/utils/mp_gpprof_server/libraries/gamespy/gt2/gt2test/StdAfx.cpp b/src/utils/mp_gpprof_server/libraries/gamespy/gt2/gt2test/StdAfx.cpp index 239320447d..5f39b895ea 100644 --- a/src/utils/mp_gpprof_server/libraries/gamespy/gt2/gt2test/StdAfx.cpp +++ b/src/utils/mp_gpprof_server/libraries/gamespy/gt2/gt2test/StdAfx.cpp @@ -2,7 +2,7 @@ // gt2test.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/utils/mp_gpprof_server/libraries/gamespy/gt2/gt2test/gt2test.cpp b/src/utils/mp_gpprof_server/libraries/gamespy/gt2/gt2test/gt2test.cpp index c17cc17a95..48f2770db6 100644 --- a/src/utils/mp_gpprof_server/libraries/gamespy/gt2/gt2test/gt2test.cpp +++ b/src/utils/mp_gpprof_server/libraries/gamespy/gt2/gt2test/gt2test.cpp @@ -1,7 +1,7 @@ // gt2test.cpp : Defines the class behaviors for the application. // -#include "stdafx.h" +#include "StdAfx.h" #include "gt2test.h" #include "gt2testDlg.h" diff --git a/src/utils/mp_gpprof_server/libraries/gamespy/gt2/gt2test/gt2testDlg.cpp b/src/utils/mp_gpprof_server/libraries/gamespy/gt2/gt2test/gt2testDlg.cpp index 6f63123fe5..037d999c9d 100644 --- a/src/utils/mp_gpprof_server/libraries/gamespy/gt2/gt2test/gt2testDlg.cpp +++ b/src/utils/mp_gpprof_server/libraries/gamespy/gt2/gt2test/gt2testDlg.cpp @@ -1,7 +1,7 @@ // gt2testDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "gt2test.h" #include "gt2testDlg.h" diff --git a/src/utils/xrAI/StdAfx.cpp b/src/utils/xrAI/StdAfx.cpp index 7b5402d9a3..612503aca3 100644 --- a/src/utils/xrAI/StdAfx.cpp +++ b/src/utils/xrAI/StdAfx.cpp @@ -2,7 +2,7 @@ // xrAI.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" // TODO: reference any additional headers you need in STDAFX.H // and not in this file diff --git a/src/utils/xrAI/StdAfx.h b/src/utils/xrAI/StdAfx.h index 124d02aa74..788b43a782 100644 --- a/src/utils/xrAI/StdAfx.h +++ b/src/utils/xrAI/StdAfx.h @@ -13,10 +13,10 @@ #define SCRIPTS_API #define ECORE_API #define XR_EPROPS_API -#include "../../xrcore/clsid.h" +#include "../../xrCore/clsid.h" #include "defines.h" #include "../xrForms/cl_log.h" -#include "../../xrcdb/xrCDB.h" +#include "../../xrCDB/xrCDB.h" #include "_d3d_extensions.h" #include "../../xrEngine/stdafx.h" #include diff --git a/src/utils/xrAI/alife_artefact_order.cpp b/src/utils/xrAI/alife_artefact_order.cpp index 4fd66b0e61..0f424cf7e5 100644 --- a/src/utils/xrAI/alife_artefact_order.cpp +++ b/src/utils/xrAI/alife_artefact_order.cpp @@ -6,7 +6,7 @@ // Description : ALife artefact demand class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_artefact_order.h" void SArtefactOrder::load (NET_Packet &packet) diff --git a/src/utils/xrAI/buffer_vector.cpp b/src/utils/xrAI/buffer_vector.cpp index bf5033add7..815895513d 100644 --- a/src/utils/xrAI/buffer_vector.cpp +++ b/src/utils/xrAI/buffer_vector.cpp @@ -6,7 +6,7 @@ // Description : buffer vector template class test cases //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" struct test_struct { shared_str a; diff --git a/src/utils/xrAI/cl_collector.cpp b/src/utils/xrAI/cl_collector.cpp index 709dab6f2d..c1cf14e556 100644 --- a/src/utils/xrAI/cl_collector.cpp +++ b/src/utils/xrAI/cl_collector.cpp @@ -2,7 +2,7 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop #include "cl_collector.h" diff --git a/src/utils/xrAI/compiler.cpp b/src/utils/xrAI/compiler.cpp index 1595e662e2..3af424b302 100644 --- a/src/utils/xrAI/compiler.cpp +++ b/src/utils/xrAI/compiler.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "compiler.h" #include "cl_intersect.h" diff --git a/src/utils/xrAI/compiler.h b/src/utils/xrAI/compiler.h index e11b017308..542193ee64 100644 --- a/src/utils/xrAI/compiler.h +++ b/src/utils/xrAI/compiler.h @@ -1,11 +1,11 @@ #pragma once -#include "../../xrcdb/xrCDB.h" +#include "../../xrCDB/xrCDB.h" #include "../../xrEngine/xrLevel.h" #include "AIMapExport.h" #include "Shader_xrLC.h" #include "../../Include/Editors/communicate.h" -#include "Etextureparams.h" +#include "ETextureParams.h" // base patch used all the time up to merging const u32 InvalidNode = (1<<24)-1; diff --git a/src/utils/xrAI/compiler_build.cpp b/src/utils/xrAI/compiler_build.cpp index 69b5c1b68e..e821e54302 100644 --- a/src/utils/xrAI/compiler_build.cpp +++ b/src/utils/xrAI/compiler_build.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "compiler.h" #include "cl_intersect.h" diff --git a/src/utils/xrAI/compiler_cover.cpp b/src/utils/xrAI/compiler_cover.cpp index c9a9727d6f..ef03661f3a 100644 --- a/src/utils/xrAI/compiler_cover.cpp +++ b/src/utils/xrAI/compiler_cover.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "compiler.h" #include "cl_intersect.h" #include "../xrForms/xrThread.h" diff --git a/src/utils/xrAI/compiler_light.cpp b/src/utils/xrAI/compiler_light.cpp index 9ac1f15bd6..12c12068a8 100644 --- a/src/utils/xrAI/compiler_light.cpp +++ b/src/utils/xrAI/compiler_light.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "compiler.h" #include "cl_intersect.h" #include "../xrForms/xrThread.h" diff --git a/src/utils/xrAI/compiler_load.cpp b/src/utils/xrAI/compiler_load.cpp index 72ffe25175..503804266e 100644 --- a/src/utils/xrAI/compiler_load.cpp +++ b/src/utils/xrAI/compiler_load.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "compiler.h" //.#include "communicate.h" #include "levelgamedef.h" diff --git a/src/utils/xrAI/compiler_save.cpp b/src/utils/xrAI/compiler_save.cpp index 7c82114efd..58a50a1c2b 100644 --- a/src/utils/xrAI/compiler_save.cpp +++ b/src/utils/xrAI/compiler_save.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "compiler.h" #include "guid_generator.h" diff --git a/src/utils/xrAI/compiler_smooth.cpp b/src/utils/xrAI/compiler_smooth.cpp index eb23aab6dc..85f5eef434 100644 --- a/src/utils/xrAI/compiler_smooth.cpp +++ b/src/utils/xrAI/compiler_smooth.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "compiler.h" #include "cl_intersect.h" diff --git a/src/utils/xrAI/game_graph_builder.cpp b/src/utils/xrAI/game_graph_builder.cpp index f8eabb049c..e1e2369643 100644 --- a/src/utils/xrAI/game_graph_builder.cpp +++ b/src/utils/xrAI/game_graph_builder.cpp @@ -6,7 +6,7 @@ // Description : Game graph builder //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "game_graph_builder.h" #include "level_graph.h" #include "graph_abstract.h" diff --git a/src/utils/xrAI/game_spawn_constructor.cpp b/src/utils/xrAI/game_spawn_constructor.cpp index 8b182184ce..4f41a57816 100644 --- a/src/utils/xrAI/game_spawn_constructor.cpp +++ b/src/utils/xrAI/game_spawn_constructor.cpp @@ -6,12 +6,12 @@ // Description : Game spawn constructor //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "game_spawn_constructor.h" #include "object_broker.h" #include "level_spawn_constructor.h" #include "xrServer_Objects_ALife_All.h" -#include "xrai.h" +#include "xrAI.h" #include "server_entity_wrapper.h" #include "graph_engine.h" #include "patrol_path_storage.h" diff --git a/src/utils/xrAI/guid_generator.cpp b/src/utils/xrAI/guid_generator.cpp index a193ec0172..fa883207d4 100644 --- a/src/utils/xrAI/guid_generator.cpp +++ b/src/utils/xrAI/guid_generator.cpp @@ -5,7 +5,7 @@ // Author : Dmitriy Iassenev // Description : GUID generator //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop #include "guid_generator.h" diff --git a/src/utils/xrAI/level_graph.cpp b/src/utils/xrAI/level_graph.cpp index 750f0559aa..4a61053d2f 100644 --- a/src/utils/xrAI/level_graph.cpp +++ b/src/utils/xrAI/level_graph.cpp @@ -6,7 +6,7 @@ // Description : Level graph //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "level_graph.h" LPCSTR LEVEL_GRAPH_NAME = "level.ai"; diff --git a/src/utils/xrAI/level_spawn_constructor.cpp b/src/utils/xrAI/level_spawn_constructor.cpp index 395fe47d41..88d0723d8b 100644 --- a/src/utils/xrAI/level_spawn_constructor.cpp +++ b/src/utils/xrAI/level_spawn_constructor.cpp @@ -6,7 +6,7 @@ // Description : Level spawn constructor //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "level_spawn_constructor.h" #include "level_graph.h" #include "graph_engine.h" diff --git a/src/utils/xrAI/motion_simulator.cpp b/src/utils/xrAI/motion_simulator.cpp index f4e5dfe20b..8fce6c13eb 100644 --- a/src/utils/xrAI/motion_simulator.cpp +++ b/src/utils/xrAI/motion_simulator.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "cl_intersect.h" #include "motion_simulator.h" #include "compiler.h" diff --git a/src/utils/xrAI/patrol_path.cpp b/src/utils/xrAI/patrol_path.cpp index f4afd61b10..a3a6dde7ad 100644 --- a/src/utils/xrAI/patrol_path.cpp +++ b/src/utils/xrAI/patrol_path.cpp @@ -6,7 +6,7 @@ // Description : Patrol path //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "patrol_path.h" #include "levelgamedef.h" diff --git a/src/utils/xrAI/patrol_path_storage.cpp b/src/utils/xrAI/patrol_path_storage.cpp index f1945fd33f..b4699aea2f 100644 --- a/src/utils/xrAI/patrol_path_storage.cpp +++ b/src/utils/xrAI/patrol_path_storage.cpp @@ -6,7 +6,7 @@ // Description : Patrol path storage //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "patrol_path_storage.h" #include "patrol_path.h" #include "patrol_point.h" diff --git a/src/utils/xrAI/patrol_point.cpp b/src/utils/xrAI/patrol_point.cpp index 834edc586d..b7a6e89e41 100644 --- a/src/utils/xrAI/patrol_point.cpp +++ b/src/utils/xrAI/patrol_point.cpp @@ -6,7 +6,7 @@ // Description : Patrol point //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "patrol_point.h" #include "level_graph.h" #include "level_graph.h" diff --git a/src/utils/xrAI/random32.cpp b/src/utils/xrAI/random32.cpp index 3f7f7f12f6..2e8858ed8d 100644 --- a/src/utils/xrAI/random32.cpp +++ b/src/utils/xrAI/random32.cpp @@ -6,7 +6,7 @@ // Description : 32-bit peudo random number generator //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "random32.h" CRandom32 Random32; \ No newline at end of file diff --git a/src/utils/xrAI/server_entity_wrapper.cpp b/src/utils/xrAI/server_entity_wrapper.cpp index e4a4c5af28..fafb0dcc09 100644 --- a/src/utils/xrAI/server_entity_wrapper.cpp +++ b/src/utils/xrAI/server_entity_wrapper.cpp @@ -6,7 +6,7 @@ // Description : Server entity wrapper //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "server_entity_wrapper.h" #include "xrServer_Objects.h" #include "xrmessages.h" diff --git a/src/utils/xrAI/space_restrictor_wrapper.cpp b/src/utils/xrAI/space_restrictor_wrapper.cpp index 052aee4a54..38555598d0 100644 --- a/src/utils/xrAI/space_restrictor_wrapper.cpp +++ b/src/utils/xrAI/space_restrictor_wrapper.cpp @@ -6,7 +6,7 @@ // Description : space restrictor wrapper //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "space_restrictor_wrapper.h" #include "xrServer_Objects_ALife.h" #include "level_graph.h" diff --git a/src/utils/xrAI/spawn_patcher.cpp b/src/utils/xrAI/spawn_patcher.cpp index 4a4ef738f6..b58325f8b7 100644 --- a/src/utils/xrAI/spawn_patcher.cpp +++ b/src/utils/xrAI/spawn_patcher.cpp @@ -6,7 +6,7 @@ // Description : spawn patcher class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #if 0 # include "spawn_patcher.h" diff --git a/src/utils/xrAI/tga.cpp b/src/utils/xrAI/tga.cpp index 7d98a9c85d..1319b60ab0 100644 --- a/src/utils/xrAI/tga.cpp +++ b/src/utils/xrAI/tga.cpp @@ -1,5 +1,5 @@ // file: targasaver.cpp -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop #include "tga.h" diff --git a/src/utils/xrAI/verify_level_graph.cpp b/src/utils/xrAI/verify_level_graph.cpp index e2089ee1d4..3658c51732 100644 --- a/src/utils/xrAI/verify_level_graph.cpp +++ b/src/utils/xrAI/verify_level_graph.cpp @@ -6,7 +6,7 @@ // Description : Verifying level graph //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "level_graph.h" CLevelGraph::CVertex **stack_storage; diff --git a/src/utils/xrAI/xrCrossTable.cpp b/src/utils/xrAI/xrCrossTable.cpp index 0c67854ab0..890edc9d3f 100644 --- a/src/utils/xrAI/xrCrossTable.cpp +++ b/src/utils/xrAI/xrCrossTable.cpp @@ -6,7 +6,7 @@ // Description : Building cross table for AI nodes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "defines.h" #include "xrCrossTable.h" diff --git a/src/utils/xrAI/xr_graph_merge.cpp b/src/utils/xrAI/xr_graph_merge.cpp index 93defe489a..f356818dd1 100644 --- a/src/utils/xrAI/xr_graph_merge.cpp +++ b/src/utils/xrAI/xr_graph_merge.cpp @@ -6,8 +6,8 @@ // Description : Merging level graphs for off-line AI NPC computations //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" -#include "../../xrcore/xr_ini.h" +#include "StdAfx.h" +#include "../../xrCore/xr_ini.h" #include "../../xrEngine/xrLevel.h" #include "xrAI.h" #include "xrServer_Objects_ALife_All.h" diff --git a/src/utils/xrDXT/StdAfx.cpp b/src/utils/xrDXT/StdAfx.cpp index 75acf6adaa..f6ede0831b 100644 --- a/src/utils/xrDXT/StdAfx.cpp +++ b/src/utils/xrDXT/StdAfx.cpp @@ -1,4 +1,4 @@ // stdafx.cpp : source file that includes just the standard includes // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/utils/xrForms/StartupDO.cpp b/src/utils/xrForms/StartupDO.cpp index 94558cf5d6..a7e7c4563c 100644 --- a/src/utils/xrForms/StartupDO.cpp +++ b/src/utils/xrForms/StartupDO.cpp @@ -1,6 +1,6 @@ #include "../../xrCore/xrCore.h" -#include "../xrlc_light/xrlc_light.h" -#include "../xrlc_light/global_calculation_data.h" +#include "../xrLC_Light/xrLC_Light.h" +#include "../xrLC_Light/global_calculation_data.h" #include "cl_log.h" extern volatile BOOL bClose; diff --git a/src/utils/xrForms/cl_log.cpp b/src/utils/xrForms/cl_log.cpp index 0c77f091df..8aaffe0f51 100644 --- a/src/utils/xrForms/cl_log.cpp +++ b/src/utils/xrForms/cl_log.cpp @@ -1,5 +1,5 @@ #include "resource.h" -#include "../../xrcore/xrCore.h" +#include "../../xrCore/xrCore.h" #include #include #include diff --git a/src/utils/xrLC/Build.cpp b/src/utils/xrLC/Build.cpp index e616a4189b..be6ac060cb 100644 --- a/src/utils/xrLC/Build.cpp +++ b/src/utils/xrLC/Build.cpp @@ -2,16 +2,16 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" -#include "build.h" +#include "Build.h" #include "../xrLC_Light/xrMU_Model.h" #include "../xrLC_Light/xrLC_GlobalData.h" -#include "../xrLC_Light/xrface.h" +#include "../xrLC_Light/xrFace.h" #include "../xrLC_Light/mu_model_light.h" //#include "../xrLC_Light/lcnet_task_manager.h" diff --git a/src/utils/xrLC/Build.h b/src/utils/xrLC/Build.h index 80cfc7d13e..484c33ac2d 100644 --- a/src/utils/xrLC/Build.h +++ b/src/utils/xrLC/Build.h @@ -4,10 +4,10 @@ #pragma once #include "../xrDXT/xrDXT.h" #include "../../xrCore/FS.h" -#include "../shader_xrlc.h" +#include "../Shader_xrLC.h" #include "../xrLC_Light/b_build_texture.h" -#include "../xrLC_Light/xrfacedefs.h" +#include "../xrLC_Light/xrFaceDefs.h" class xrLC_GlobalData; class xrMU_Model; diff --git a/src/utils/xrLC/Build_Load.cpp b/src/utils/xrLC/Build_Load.cpp index cf2149982e..d3eecca325 100644 --- a/src/utils/xrLC/Build_Load.cpp +++ b/src/utils/xrLC/Build_Load.cpp @@ -1,12 +1,12 @@ -#include "stdafx.h" -#include "elight_def.h" +#include "StdAfx.h" +#include "ELight_def.h" -#include "build.h" +#include "Build.h" #include "../xrLC_Light/xrLC_GlobalData.h" -#include "../xrLC_Light/xrface.h" +#include "../xrLC_Light/xrFace.h" #include "../xrLC_Light/xrMU_Model.h" diff --git a/src/utils/xrLC/MeshMenderLayerOGF.h b/src/utils/xrLC/MeshMenderLayerOGF.h index 220249a6a9..e947760fd3 100644 --- a/src/utils/xrLC/MeshMenderLayerOGF.h +++ b/src/utils/xrLC/MeshMenderLayerOGF.h @@ -1,7 +1,7 @@ #ifndef _MESH_MENDER_LAYER_OGF_H_ #define _MESH_MENDER_LAYER_OGF_H_ -#include "../../common/NvMender2003/nvMeshMender.h" +#include "../../common/NvMender2003/NVMeshMender.h" #include "../../common/NvMender2003/mender_input_output.h" #include "../../common/NvMender2003/remove_isolated_verts.h" diff --git a/src/utils/xrLC/MeshMenderLayerOrdinaryStatic.h b/src/utils/xrLC/MeshMenderLayerOrdinaryStatic.h index dbd39d4833..a74056aef7 100644 --- a/src/utils/xrLC/MeshMenderLayerOrdinaryStatic.h +++ b/src/utils/xrLC/MeshMenderLayerOrdinaryStatic.h @@ -1,10 +1,10 @@ #ifndef _MESH_MENDER_LAYER_ORDINARY_STATIC_H_ #define _MESH_MENDER_LAYER_ORDINARY_STATIC_H_ -#include "../../common/NvMender2003/nvMeshMender.h" +#include "../../common/NvMender2003/NVMeshMender.h" #include "../../common/NvMender2003/mender_input_output.h" -#include "../xrlc_light/xrFace.h" +#include "../xrLC_Light/xrFace.h" IC void set_vertex( MeshMender::Vertex &out_vertex, const Vertex& in_veretex, const Fvector2 Ftc ) { diff --git a/src/utils/xrLC/OGF_CalculateTB.cpp b/src/utils/xrLC/OGF_CalculateTB.cpp index 2279919c62..5b0f2abba5 100644 --- a/src/utils/xrLC/OGF_CalculateTB.cpp +++ b/src/utils/xrLC/OGF_CalculateTB.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "MeshMenderLayerOGF.h" diff --git a/src/utils/xrLC/OGF_Face.cpp b/src/utils/xrLC/OGF_Face.cpp index 8e7bf3f705..aaf0ebdb04 100644 --- a/src/utils/xrLC/OGF_Face.cpp +++ b/src/utils/xrLC/OGF_Face.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" -#include "build.h" -#include "ogf_face.h" +#include "StdAfx.h" +#include "Build.h" +#include "OGF_Face.h" //#include "std_classes.h" -#include "../../xrcore/fs.h" -#include "../../xrEngine/fmesh.h" +#include "../../xrCore/FS.h" +#include "../../xrEngine/Fmesh.h" #include "xrOcclusion.h" diff --git a/src/utils/xrLC/OGF_Face.h b/src/utils/xrLC/OGF_Face.h index 51e3941abe..971a1fde5f 100644 --- a/src/utils/xrLC/OGF_Face.h +++ b/src/utils/xrLC/OGF_Face.h @@ -8,9 +8,9 @@ #include "PropSlimTools.h" #include "vbm.h" -#include "../xrlc_light/xruvpoint.h" -#include "../xrlc_light/base_basis.h" -#include "../xrlc_light/base_color.h" +#include "../xrLC_Light/xrUVpoint.h" +#include "../xrLC_Light/base_basis.h" +#include "../xrLC_Light/base_color.h" struct OGF_Texture { diff --git a/src/utils/xrLC/OGF_Face_Save.cpp b/src/utils/xrLC/OGF_Face_Save.cpp index 37cec1fd32..ad2b56cd5a 100644 --- a/src/utils/xrLC/OGF_Face_Save.cpp +++ b/src/utils/xrLC/OGF_Face_Save.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" -#include "build.h" -#include "ogf_face.h" +#include "StdAfx.h" +#include "Build.h" +#include "OGF_Face.h" //#include "std_classes.h" -#include "../../xrcore/fs.h" -#include "../../xrEngine/fmesh.h" +#include "../../xrCore/FS.h" +#include "../../xrEngine/Fmesh.h" using namespace std; diff --git a/src/utils/xrLC/OGF_Face_Sphere.cpp b/src/utils/xrLC/OGF_Face_Sphere.cpp index dca430fd0e..aa83aee6cc 100644 --- a/src/utils/xrLC/OGF_Face_Sphere.cpp +++ b/src/utils/xrLC/OGF_Face_Sphere.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" -#include "build.h" -#include "ogf_face.h" +#include "StdAfx.h" +#include "Build.h" +#include "OGF_Face.h" #pragma warning(disable:4995) #include diff --git a/src/utils/xrLC/OGF_Face_Stripify.cpp b/src/utils/xrLC/OGF_Face_Stripify.cpp index cfb4adaac4..da9606ec21 100644 --- a/src/utils/xrLC/OGF_Face_Stripify.cpp +++ b/src/utils/xrLC/OGF_Face_Stripify.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" -#include "build.h" -#include "ogf_face.h" -#include "NV_Library\NvTriStrip.h" -#include "NV_Library\VertexCache.h" +#include "StdAfx.h" +#include "Build.h" +#include "OGF_Face.h" +#include "nv_library/NvTriStrip.h" +#include "nv_library/VertexCache.h" #include int xrSimulate (xr_vector &indices, int iCacheSize ) diff --git a/src/utils/xrLC/OGF_RemoveIsolatedVerts.cpp b/src/utils/xrLC/OGF_RemoveIsolatedVerts.cpp index b84670273c..09f7f4c750 100644 --- a/src/utils/xrLC/OGF_RemoveIsolatedVerts.cpp +++ b/src/utils/xrLC/OGF_RemoveIsolatedVerts.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "MeshMenderLayerOGF.h" diff --git a/src/utils/xrLC/Sector.cpp b/src/utils/xrLC/Sector.cpp index 53516550c3..2b4c6417f9 100644 --- a/src/utils/xrLC/Sector.cpp +++ b/src/utils/xrLC/Sector.cpp @@ -2,8 +2,8 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" -#include "build.h" +#include "StdAfx.h" +#include "Build.h" #include "Sector.h" #include "OGF_Face.h" ////////////////////////////////////////////////////////////////////// diff --git a/src/utils/xrLC/StdAfx.cpp b/src/utils/xrLC/StdAfx.cpp index 557ee3934d..db9821edee 100644 --- a/src/utils/xrLC/StdAfx.cpp +++ b/src/utils/xrLC/StdAfx.cpp @@ -2,7 +2,7 @@ // xrLBuilder.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" // TODO: reference any additional headers you need in STDAFX.H // and not in this file diff --git a/src/utils/xrLC/StdAfx.h b/src/utils/xrLC/StdAfx.h index d37e1ca27e..ef351277ec 100644 --- a/src/utils/xrLC/StdAfx.h +++ b/src/utils/xrLC/StdAfx.h @@ -14,7 +14,7 @@ #undef ECORE_API #define ECORE_API // fake, to enable sharing with editors #define XR_EPROPS_API -#include "../../xrcore/clsid.h" +#include "../../xrCore/clsid.h" #include "defines.h" #include "../xrForms/cl_log.h" diff --git a/src/utils/xrLC/cl_collector.cpp b/src/utils/xrLC/cl_collector.cpp index 709dab6f2d..c1cf14e556 100644 --- a/src/utils/xrLC/cl_collector.cpp +++ b/src/utils/xrLC/cl_collector.cpp @@ -2,7 +2,7 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop #include "cl_collector.h" diff --git a/src/utils/xrLC/fmesh.cpp b/src/utils/xrLC/fmesh.cpp index d0bb94bd67..2cad2605ef 100644 --- a/src/utils/xrLC/fmesh.cpp +++ b/src/utils/xrLC/fmesh.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include diff --git a/src/utils/xrLC/std_classes.h b/src/utils/xrLC/std_classes.h index 1d01f6d139..0c55d5ff28 100644 --- a/src/utils/xrLC/std_classes.h +++ b/src/utils/xrLC/std_classes.h @@ -1,7 +1,7 @@ #ifndef _STD_CLSID_ #define _STD_CLSID_ -#include "../../xrcore/clsid.h" +#include "../../xrCore/clsid.h" //***** Standart extension classes #define CLSID_HUDMANAGER MK_CLSID('H','U','D','_','M','N','G','R') diff --git a/src/utils/xrLC/vbm.h b/src/utils/xrLC/vbm.h index 557506e4f6..bcf5d60768 100644 --- a/src/utils/xrLC/vbm.h +++ b/src/utils/xrLC/vbm.h @@ -1,7 +1,7 @@ #pragma once -#include "../../xrEngine/fmesh.h" -#include "../../xrcore/fs.h" +#include "../../xrEngine/Fmesh.h" +#include "../../xrCore/FS.h" static const u32 c_VB_maxSize = 4096*1024; // bytes // Vertex containers diff --git a/src/utils/xrLC/xrBuildCForm.cpp b/src/utils/xrLC/xrBuildCForm.cpp index 513cb7aa2b..c21a43b4cb 100644 --- a/src/utils/xrLC/xrBuildCForm.cpp +++ b/src/utils/xrLC/xrBuildCForm.cpp @@ -1,14 +1,14 @@ -#include "stdafx.h" +#include "StdAfx.h" //#include "cl_collector.h" -#include "build.h" +#include "Build.h" #include "../xrLC_Light/xrMU_Model.h" #include "../xrLC_Light/xrMU_Model_Reference.h" #include "../xrLC_Light/xrLC_GlobalData.h" -#include "../xrLC_Light/xrface.h" +#include "../xrLC_Light/xrFace.h" -#include "../../xrcore/fs.h" -#include "../../xrcdb/xrcdb.h" +#include "../../xrCore/FS.h" +#include "../../xrCDB/xrCDB.h" int GetVertexIndex(Vertex *F) { diff --git a/src/utils/xrLC/xrBuildRapidModel.cpp b/src/utils/xrLC/xrBuildRapidModel.cpp index d4448b05e7..1befc5f385 100644 --- a/src/utils/xrLC/xrBuildRapidModel.cpp +++ b/src/utils/xrLC/xrBuildRapidModel.cpp @@ -1,12 +1,12 @@ -#include "stdafx.h" +#include "StdAfx.h" //#include "cl_collector.h" -#include "build.h" +#include "Build.h" #include "../xrLC_Light/xrMU_Model.h" #include "../xrLC_Light/xrMU_Model_Reference.h" #include "../xrLC_Light/xrLC_GlobalData.h" -#include "../../xrcdb/xrcdb.h" -#include "../xrLC_Light/xrface.h" +#include "../../xrCDB/xrCDB.h" +#include "../xrLC_Light/xrFace.h" //.#include "communicate.h" diff --git a/src/utils/xrLC/xrCalcNormals.cpp b/src/utils/xrLC/xrCalcNormals.cpp index 1a87472ca6..d8f42b37df 100644 --- a/src/utils/xrLC/xrCalcNormals.cpp +++ b/src/utils/xrLC/xrCalcNormals.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" -#include "build.h" -#include "../xrLC_Light/xrface.h" +#include "StdAfx.h" +#include "Build.h" +#include "../xrLC_Light/xrFace.h" #include "../xrLC_Light/calculate_normals.h" #include "../xrLC_Light/xrLC_GlobalData.h" diff --git a/src/utils/xrLC/xrFlex2OGF.cpp b/src/utils/xrLC/xrFlex2OGF.cpp index e48f8b12cf..f7450db8c1 100644 --- a/src/utils/xrLC/xrFlex2OGF.cpp +++ b/src/utils/xrLC/xrFlex2OGF.cpp @@ -1,10 +1,10 @@ -#include "stdafx.h" -#include "build.h" +#include "StdAfx.h" +#include "Build.h" #include "OGF_Face.h" #include "vbm.h" //#include "std_classes.h" -#include "../xrlc_light/lightmap.h" -#include "../xrlc_light/xrface.h" +#include "../xrLC_Light/Lightmap.h" +#include "../xrLC_Light/xrFace.h" #define TRY(a) try { a; } catch (...) { clMsg("* E: %s", #a); } diff --git a/src/utils/xrLC/xrLight.cpp b/src/utils/xrLC/xrLight.cpp index a499f0253f..f6c2e9244d 100644 --- a/src/utils/xrLC/xrLight.cpp +++ b/src/utils/xrLC/xrLight.cpp @@ -1,12 +1,12 @@ -#include "stdafx.h" -#include "build.h" +#include "StdAfx.h" +#include "Build.h" -#include "../xrlc_light/xrdeflector.h" +#include "../xrLC_Light/xrDeflector.h" #include "../xrForms/xrThread.h" #include "../xrLC_Light/xrLC_GlobalData.h" #include "../xrLC_Light/xrLightVertex.h" -#include "../../xrcore/xrSyncronize.h" +#include "../../xrCore/xrSyncronize.h" #include "../xrLC_Light/mu_model_light.h" xrCriticalSection task_CS diff --git a/src/utils/xrLC/xrMU_Model_Calc_ogf.cpp b/src/utils/xrLC/xrMU_Model_Calc_ogf.cpp index 40508ca0af..6e47cdde25 100644 --- a/src/utils/xrLC/xrMU_Model_Calc_ogf.cpp +++ b/src/utils/xrLC/xrMU_Model_Calc_ogf.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "../xrLC_Light/xrMU_Model.h" #include "OGF_Face.h" -#include "build.h" +#include "Build.h" #define TRY(a) try { a; } catch (...) { clMsg("* E: %s", #a); } diff --git a/src/utils/xrLC/xrMU_Model_export_OGF.cpp b/src/utils/xrLC/xrMU_Model_export_OGF.cpp index d2fdd1f74c..07fb7fba4d 100644 --- a/src/utils/xrLC/xrMU_Model_export_OGF.cpp +++ b/src/utils/xrLC/xrMU_Model_export_OGF.cpp @@ -1,10 +1,10 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "../xrLC_Light/xrMU_Model.h" #include "../xrLC_Light/xrMU_Model_Reference.h" -#include "build.h" +#include "Build.h" #include "OGF_Face.h" #define TRY(a) try { a; } catch (...) { clMsg("* E: %s", #a); } diff --git a/src/utils/xrLC/xrMU_Model_export_geometry.cpp b/src/utils/xrLC/xrMU_Model_export_geometry.cpp index 312a4e859f..3c519ee58d 100644 --- a/src/utils/xrLC/xrMU_Model_export_geometry.cpp +++ b/src/utils/xrLC/xrMU_Model_export_geometry.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "../xrLC_Light/xrMU_Model.h" #include "OGF_Face.h" diff --git a/src/utils/xrLC/xrOptimizeCFORM_qslim.cpp b/src/utils/xrLC/xrOptimizeCFORM_qslim.cpp index c08cd25f03..8b91d1665c 100644 --- a/src/utils/xrLC/xrOptimizeCFORM_qslim.cpp +++ b/src/utils/xrLC/xrOptimizeCFORM_qslim.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" -#include "build.h" +#include "StdAfx.h" +#include "Build.h" #include "../xrQSlim/src/MxStdModel.h" #include "../xrQSlim/src/MxQSlim.h" -#include "../../xrcdb/xrcdb.h" +#include "../../xrCDB/xrCDB.h" #include "../../common/face_smoth_flags.h" #define MAX_DECIMATE_ERROR 0.0005f diff --git a/src/utils/xrLC/xrPhase_AdaptiveHT.cpp b/src/utils/xrLC/xrPhase_AdaptiveHT.cpp index 03e52afc92..e003524889 100644 --- a/src/utils/xrLC/xrPhase_AdaptiveHT.cpp +++ b/src/utils/xrLC/xrPhase_AdaptiveHT.cpp @@ -1,12 +1,12 @@ -#include "stdafx.h" -#include "build.h" +#include "StdAfx.h" +#include "Build.h" #include "../xrLC_Light/xrLC_GlobalData.h" #include "../xrLC_Light/light_point.h" -#include "../xrLC_Light/xrdeflector.h" -#include "../xrLC_Light/xrface.h" +#include "../xrLC_Light/xrDeflector.h" +#include "../xrLC_Light/xrFace.h" -#include "../../xrcdb/xrcdb.h" +#include "../../xrCDB/xrCDB.h" #include "../../common/face_smoth_flags.h" #include "../xrForms/xrThread.h" diff --git a/src/utils/xrLC/xrPhase_GI.cpp b/src/utils/xrLC/xrPhase_GI.cpp index c4997dc820..4becafd939 100644 --- a/src/utils/xrLC/xrPhase_GI.cpp +++ b/src/utils/xrLC/xrPhase_GI.cpp @@ -1,13 +1,13 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xrHemisphere.h" -#include "build.h" +#include "Build.h" #include "../xrForms/xrThread.h" #include "../xrLC_Light/xrLC_GlobalData.h" -#include "../xrLC_Light/xrface.h" +#include "../xrLC_Light/xrFace.h" -#include "../../xrcore/xrSyncronize.h" -#include "../../xrcdb/xrcdb.h" +#include "../../xrCore/xrSyncronize.h" +#include "../../xrCDB/xrCDB.h" #define GI_THREADS 2 diff --git a/src/utils/xrLC/xrPhase_MergeGeometry.cpp b/src/utils/xrLC/xrPhase_MergeGeometry.cpp index 754b57f3cb..42d3823857 100644 --- a/src/utils/xrLC/xrPhase_MergeGeometry.cpp +++ b/src/utils/xrLC/xrPhase_MergeGeometry.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" -#include "build.h" -#include "../xrlc_light/xrface.h" +#include "Build.h" +#include "../xrLC_Light/xrFace.h" extern void Detach (vecFace* S); diff --git a/src/utils/xrLC/xrPhase_MergeLM.cpp b/src/utils/xrLC/xrPhase_MergeLM.cpp index 0e47af8406..c42b40d6df 100644 --- a/src/utils/xrLC/xrPhase_MergeLM.cpp +++ b/src/utils/xrLC/xrPhase_MergeLM.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" -#include "build.h" +#include "StdAfx.h" +#include "Build.h" #include "xrPhase_MergeLM_Rect.h" -#include "../xrlc_light/xrdeflector.h" -#include "../xrlc_light/xrlc_globaldata.h" -#include "../xrlc_light/lightmap.h" +#include "../xrLC_Light/xrDeflector.h" +#include "../xrLC_Light/xrLC_GlobalData.h" +#include "../xrLC_Light/Lightmap.h" // Surface access extern void _InitSurface (); extern BOOL _rect_place (L_rect &r, lm_layer* D); diff --git a/src/utils/xrLC/xrPhase_MergeLM_Surface.cpp b/src/utils/xrLC/xrPhase_MergeLM_Surface.cpp index 254627b463..63cbfbe061 100644 --- a/src/utils/xrLC/xrPhase_MergeLM_Surface.cpp +++ b/src/utils/xrLC/xrPhase_MergeLM_Surface.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" -#include "build.h" +#include "StdAfx.h" +#include "Build.h" #include "xrPhase_MergeLM_Rect.h" -#include "../xrlc_light/xrdeflector.h" +#include "../xrLC_Light/xrDeflector.h" #include static BYTE* surface; diff --git a/src/utils/xrLC/xrPhase_ResolveMaterials.cpp b/src/utils/xrLC/xrPhase_ResolveMaterials.cpp index 12b356dfb5..3781d75a10 100644 --- a/src/utils/xrLC/xrPhase_ResolveMaterials.cpp +++ b/src/utils/xrLC/xrPhase_ResolveMaterials.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" -#include "build.h" +#include "StdAfx.h" +#include "Build.h" #include "../xrLC_Light/xrLC_GlobalData.h" -#include "../xrLC_Light/xrface.h" +#include "../xrLC_Light/xrFace.h" extern void Detach (vecFace* S); diff --git a/src/utils/xrLC/xrPhase_Subdivide.cpp b/src/utils/xrLC/xrPhase_Subdivide.cpp index a7e0e84c08..de884bd395 100644 --- a/src/utils/xrLC/xrPhase_Subdivide.cpp +++ b/src/utils/xrLC/xrPhase_Subdivide.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" -#include "build.h" -#include "../xrlc_light/xrdeflector.h" -#include "../xrlc_light/xrface.h" -#include "../xrlc_light/xrlc_globaldata.h" +#include "StdAfx.h" +#include "Build.h" +#include "../xrLC_Light/xrDeflector.h" +#include "../xrLC_Light/xrFace.h" +#include "../xrLC_Light/xrLC_GlobalData.h" extern void Detach (vecFace* S); diff --git a/src/utils/xrLC/xrPhase_TangentBasis.cpp b/src/utils/xrLC/xrPhase_TangentBasis.cpp index 0a27c5d770..3ab2f5b85c 100644 --- a/src/utils/xrLC/xrPhase_TangentBasis.cpp +++ b/src/utils/xrLC/xrPhase_TangentBasis.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "build.h" +#include "StdAfx.h" +#include "Build.h" #include "MeshMenderLayerOrdinaryStatic.h" #include "../xrLC_Light/xrLC_GlobalData.h" diff --git a/src/utils/xrLC/xrPhase_UVmap.cpp b/src/utils/xrLC/xrPhase_UVmap.cpp index 43641adc59..846c0ed78e 100644 --- a/src/utils/xrLC/xrPhase_UVmap.cpp +++ b/src/utils/xrLC/xrPhase_UVmap.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" -#include "build.h" +#include "StdAfx.h" +#include "Build.h" #include "../xrLC_Light/xrDeflector.h" #include "../xrLC_Light/xrLC_GlobalData.h" -#include "../xrLC_Light/xrface.h" +#include "../xrLC_Light/xrFace.h" diff --git a/src/utils/xrLC/xrPreOptimize.cpp b/src/utils/xrLC/xrPreOptimize.cpp index 93db8f0987..d63c6ca90f 100644 --- a/src/utils/xrLC/xrPreOptimize.cpp +++ b/src/utils/xrLC/xrPreOptimize.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" +#include "StdAfx.h" -#include "build.h" +#include "Build.h" #include "../xrLC_Light/xrLC_GlobalData.h" -#include "../xrLC_Light/xrface.h" +#include "../xrLC_Light/xrFace.h" const int HDIM_X = 56; const int HDIM_Y = 24; diff --git a/src/utils/xrLC/xrSaveLights.cpp b/src/utils/xrLC/xrSaveLights.cpp index 91ffc14d52..0a5632832a 100644 --- a/src/utils/xrLC/xrSaveLights.cpp +++ b/src/utils/xrLC/xrSaveLights.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "build.h" +#include "StdAfx.h" +#include "Build.h" void CBuild::SaveLights(IWriter &fs) { diff --git a/src/utils/xrLC/xrSaveOGF.cpp b/src/utils/xrLC/xrSaveOGF.cpp index 32a0509194..80f98f4e1a 100644 --- a/src/utils/xrLC/xrSaveOGF.cpp +++ b/src/utils/xrLC/xrSaveOGF.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "build.h" +#include "StdAfx.h" +#include "Build.h" #include "OGF_Face.h" SWIContainer g_SWI,x_SWI; diff --git a/src/utils/xrLC/xrSectors.cpp b/src/utils/xrLC/xrSectors.cpp index 956fac22d1..07ebbaa657 100644 --- a/src/utils/xrLC/xrSectors.cpp +++ b/src/utils/xrLC/xrSectors.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" -#include "build.h" -#include "sector.h" +#include "StdAfx.h" +#include "Build.h" +#include "Sector.h" #include "OGF_Face.h" xr_vector g_sectors; diff --git a/src/utils/xrLC/xrT_Junction.cpp b/src/utils/xrLC/xrT_Junction.cpp index e298b0ad32..5b8c3bf3f2 100644 --- a/src/utils/xrLC/xrT_Junction.cpp +++ b/src/utils/xrLC/xrT_Junction.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" -#include "build.h" +#include "StdAfx.h" +#include "Build.h" #include "../xrLC_Light/xrLC_GlobalData.h" -#include "../xrLC_Light/xrface.h" +#include "../xrLC_Light/xrFace.h" //#define VPUSH(a) ((a).x), ((a).y), ((a).z) IC float SqrDistance2Segment(const Fvector& P, const Fvector& A, const Fvector& B) diff --git a/src/utils/xrLC_Light/ETextureParams.cpp b/src/utils/xrLC_Light/ETextureParams.cpp index eb8d698828..031fcafd38 100644 --- a/src/utils/xrLC_Light/ETextureParams.cpp +++ b/src/utils/xrLC_Light/ETextureParams.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "etextureparams.h" +#include "ETextureParams.h" /* // texture part diff --git a/src/utils/xrLC_Light/Lightmap.cpp b/src/utils/xrLC_Light/Lightmap.cpp index f62e9ce408..21f802fcad 100644 --- a/src/utils/xrLC_Light/Lightmap.cpp +++ b/src/utils/xrLC_Light/Lightmap.cpp @@ -8,7 +8,7 @@ #include "xrDeflector.h" #include "xrDXTC.h" #include "xrImage_Filter.h" -#include "xrface.h" +#include "xrFace.h" #include "ETextureParams.h" #include diff --git a/src/utils/xrLC_Light/MeshStaic.cpp b/src/utils/xrLC_Light/MeshStaic.cpp index 6dc28b1220..c101573c45 100644 --- a/src/utils/xrLC_Light/MeshStaic.cpp +++ b/src/utils/xrLC_Light/MeshStaic.cpp @@ -3,7 +3,7 @@ #include "xrLC_GlobalData.h" -#include "xrface.h" +#include "xrFace.h" #include "vector_clear.h" typedef poolSS poolVertices; diff --git a/src/utils/xrLC_Light/b_build_texture.h b/src/utils/xrLC_Light/b_build_texture.h index f05fb851db..45a4af8818 100644 --- a/src/utils/xrLC_Light/b_build_texture.h +++ b/src/utils/xrLC_Light/b_build_texture.h @@ -1,5 +1,5 @@ #pragma once -#include "Etextureparams.h" +#include "ETextureParams.h" struct b_BuildTexture : public b_texture { STextureParams THM; diff --git a/src/utils/xrLC_Light/base_lighting.h b/src/utils/xrLC_Light/base_lighting.h index 4046e4bead..d12df9b352 100644 --- a/src/utils/xrLC_Light/base_lighting.h +++ b/src/utils/xrLC_Light/base_lighting.h @@ -1,6 +1,6 @@ #pragma once -#include "r_light.h" +#include "R_light.h" #pragma pack(push,4) class XRLC_LIGHT_API base_lighting diff --git a/src/utils/xrLC_Light/compiler.cpp b/src/utils/xrLC_Light/compiler.cpp index 1bcf5fdd25..49f92dd3fa 100644 --- a/src/utils/xrLC_Light/compiler.cpp +++ b/src/utils/xrLC_Light/compiler.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" -#include "../../xrEngine/xrlevel.h" +#include "../../xrEngine/xrLevel.h" #include "../xrForms/xrThread.h" #include "global_calculation_data.h" -#include "lightthread.h" +#include "LightThread.h" #define NUM_THREADS CPU::ID.n_threads - 1 diff --git a/src/utils/xrLC_Light/detail_slot_calculate.cpp b/src/utils/xrLC_Light/detail_slot_calculate.cpp index ad8fe29ac9..91ab02d7a7 100644 --- a/src/utils/xrLC_Light/detail_slot_calculate.cpp +++ b/src/utils/xrLC_Light/detail_slot_calculate.cpp @@ -10,7 +10,7 @@ #include "cl_intersect.h" #include "base_lighting.h" #include "global_calculation_data.h" -#include "../shader_xrlc.h" +#include "../Shader_xrLC.h" #undef LP_DEFAULT enum diff --git a/src/utils/xrLC_Light/global_calculation_data.cpp b/src/utils/xrLC_Light/global_calculation_data.cpp index 7505427f0a..c4876b3fac 100644 --- a/src/utils/xrLC_Light/global_calculation_data.cpp +++ b/src/utils/xrLC_Light/global_calculation_data.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "global_calculation_data.h" -#include "../shader_xrlc.h" +#include "../Shader_xrLC.h" global_claculation_data gl_data; diff --git a/src/utils/xrLC_Light/global_calculation_data.h b/src/utils/xrLC_Light/global_calculation_data.h index 74619fc1c8..6a2a59ea52 100644 --- a/src/utils/xrLC_Light/global_calculation_data.h +++ b/src/utils/xrLC_Light/global_calculation_data.h @@ -6,7 +6,7 @@ #include "global_slots_data.h" #include "b_build_texture.h" #include "global_slots_data.h" -#include "../../xrcdb/xrcdb.h" +#include "../../xrCDB/xrCDB.h" class Shader_xrLC_LIB; //----------------------------------------------------------------- diff --git a/src/utils/xrLC_Light/global_slots_data.h b/src/utils/xrLC_Light/global_slots_data.h index f87e9176da..38f1543b59 100644 --- a/src/utils/xrLC_Light/global_slots_data.h +++ b/src/utils/xrLC_Light/global_slots_data.h @@ -1,7 +1,7 @@ #ifndef __GLOBAL_SLOTS_DATA_H__ #define __GLOBAL_SLOTS_DATA_H__ -#include "detailformat.h" +#include "DetailFormat.h" #include "recalculation.h" diff --git a/src/utils/xrLC_Light/light_execute.cpp b/src/utils/xrLC_Light/light_execute.cpp index 1e306158f2..88569d486b 100644 --- a/src/utils/xrLC_Light/light_execute.cpp +++ b/src/utils/xrLC_Light/light_execute.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "light_execute.h" -#include "xrdeflector.h" +#include "xrDeflector.h" void light_execute::run( CDeflector& D ) { diff --git a/src/utils/xrLC_Light/light_execute.h b/src/utils/xrLC_Light/light_execute.h index f968f8d128..4c78e6cf36 100644 --- a/src/utils/xrLC_Light/light_execute.h +++ b/src/utils/xrLC_Light/light_execute.h @@ -1,8 +1,8 @@ #pragma once -#include "xrdeflectordefs.h" +#include "xrDeflectorDefs.h" #include "base_lighting.h" -#include "../../xrcdb/xrcdb.h" +#include "../../xrCDB/xrCDB.h" diff --git a/src/utils/xrLC_Light/mu_model_face.cpp b/src/utils/xrLC_Light/mu_model_face.cpp index f9d75b9b54..60371d49ec 100644 --- a/src/utils/xrLC_Light/mu_model_face.cpp +++ b/src/utils/xrLC_Light/mu_model_face.cpp @@ -3,7 +3,7 @@ #include "mu_model_face.h" -#include "../../xrcore/xrPool.h" +#include "../../xrCore/xrPool.h" poolSS<_vertex,8*1024> &mu_vertices_pool(); diff --git a/src/utils/xrLC_Light/mu_model_face.h b/src/utils/xrLC_Light/mu_model_face.h index 861c506e63..33ce223417 100644 --- a/src/utils/xrLC_Light/mu_model_face.h +++ b/src/utils/xrLC_Light/mu_model_face.h @@ -3,7 +3,7 @@ #include "base_face.h" -#include "meshstructure.h" +#include "MeshStructure.h" #include "mu_model_face_defs.h" //#ifndef MESHSTRUCTURE_EXSPORTS_IMPORTS //#define MESHSTRUCTURE_EXSPORTS_IMPORTS diff --git a/src/utils/xrLC_Light/mu_model_light_threads.cpp b/src/utils/xrLC_Light/mu_model_light_threads.cpp index cccd6aa215..9965f3b623 100644 --- a/src/utils/xrLC_Light/mu_model_light_threads.cpp +++ b/src/utils/xrLC_Light/mu_model_light_threads.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" #include "mu_model_light_threads.h" -#include "xrface.h" +#include "xrFace.h" #include "xrMU_Model.h" #include "xrMU_Model_Reference.h" -#include "xrlc_globaldata.h" +#include "xrLC_GlobalData.h" #include "mu_model_light.h" #include "../xrForms/xrThread.h" -#include "../../xrcore/xrSyncronize.h" +#include "../../xrCore/xrSyncronize.h" diff --git a/src/utils/xrLC_Light/recalculation.h b/src/utils/xrLC_Light/recalculation.h index 43001a0bbd..906b17cb20 100644 --- a/src/utils/xrLC_Light/recalculation.h +++ b/src/utils/xrLC_Light/recalculation.h @@ -1,7 +1,7 @@ #ifndef __RECALCULATION_PARAMS_H__ #define __RECALCULATION_PARAMS_H__ -#include "detailformat.h" +#include "DetailFormat.h" class CVirtualFileRW; class recalculation diff --git a/src/utils/xrLC_Light/uv_tri.cpp b/src/utils/xrLC_Light/uv_tri.cpp index 860298e1f6..6d5055f952 100644 --- a/src/utils/xrLC_Light/uv_tri.cpp +++ b/src/utils/xrLC_Light/uv_tri.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "uv_tri.h" -#include "xrface.h" +#include "xrFace.h" bool UVtri::similar ( const UVtri &uv, float eps/*eps = EPS*/ ) const { diff --git a/src/utils/xrLC_Light/uv_tri.h b/src/utils/xrLC_Light/uv_tri.h index 40043431fd..f9a3dc94ee 100644 --- a/src/utils/xrLC_Light/uv_tri.h +++ b/src/utils/xrLC_Light/uv_tri.h @@ -1,6 +1,6 @@ -#include "xrfacedefs.h" +#include "xrFaceDefs.h" #include "tcf.h" diff --git a/src/utils/xrLC_Light/xrDeflectoL_Direct.cpp b/src/utils/xrLC_Light/xrDeflectoL_Direct.cpp index 36af63b350..b8dca2226e 100644 --- a/src/utils/xrLC_Light/xrDeflectoL_Direct.cpp +++ b/src/utils/xrLC_Light/xrDeflectoL_Direct.cpp @@ -2,10 +2,10 @@ //#include "build.h" //#include "std_classes.h" #include "../xrForms/xrThread.h" -#include "xrdeflector.h" -#include "xrlc_globaldata.h" +#include "xrDeflector.h" +#include "xrLC_GlobalData.h" #include "light_point.h" -#include "xrface.h" +#include "xrFace.h" extern void Jitter_Select (Fvector2* &Jitter, u32& Jcount); diff --git a/src/utils/xrLC_Light/xrDeflector.cpp b/src/utils/xrLC_Light/xrDeflector.cpp index 67317d6824..0ed5d12cf0 100644 --- a/src/utils/xrLC_Light/xrDeflector.cpp +++ b/src/utils/xrLC_Light/xrDeflector.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" -#include "xrdeflector.h" +#include "xrDeflector.h" #include "xrIsect.h" -#include "xrlc_globaldata.h" +#include "xrLC_GlobalData.h" #include "math.h" -#include "xrface.h" +#include "xrFace.h" XRLC_LIGHT_API u32 c_LMAP_size = 1024; diff --git a/src/utils/xrLC_Light/xrDeflector.h b/src/utils/xrLC_Light/xrDeflector.h index e02a224fbc..0148f19c6d 100644 --- a/src/utils/xrLC_Light/xrDeflector.h +++ b/src/utils/xrLC_Light/xrDeflector.h @@ -1,10 +1,10 @@ #pragma once -#include "xrfacedefs.h" +#include "xrFaceDefs.h" #include "base_color.h" #include "lm_layer.h" #include "uv_tri.h" -#include "../../xrcdb/xrCDB.h" -#include "xrdeflectordefs.h" +#include "../../xrCDB/xrCDB.h" +#include "xrDeflectorDefs.h" class base_lighting; diff --git a/src/utils/xrLC_Light/xrDeflectorLight.cpp b/src/utils/xrLC_Light/xrDeflectorLight.cpp index ac54cc62cb..da329e3eda 100644 --- a/src/utils/xrLC_Light/xrDeflectorLight.cpp +++ b/src/utils/xrLC_Light/xrDeflectorLight.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" -#include "xrdeflector.h" +#include "xrDeflector.h" #include "cl_intersect.h" -#include "xrlc_globaldata.h" +#include "xrLC_GlobalData.h" #include "light_point.h" -#include "xrface.h" +#include "xrFace.h" void Jitter_Select(Fvector2* &Jitter, u32& Jcount) { diff --git a/src/utils/xrLC_Light/xrFace.cpp b/src/utils/xrLC_Light/xrFace.cpp index 5dd77120e0..e2358862aa 100644 --- a/src/utils/xrLC_Light/xrFace.cpp +++ b/src/utils/xrLC_Light/xrFace.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" -#include "xrface.h" +#include "xrFace.h" //#include "build.h" -#include "xrdeflector.h" -#include "xrLC_globaldata.h" -#include "lightmap.h" +#include "xrDeflector.h" +#include "xrLC_GlobalData.h" +#include "Lightmap.h" volatile u32 dwInvalidFaces;//= 0; u32 InvalideFaces() diff --git a/src/utils/xrLC_Light/xrFace.h b/src/utils/xrLC_Light/xrFace.h index 601557628c..1e43cab398 100644 --- a/src/utils/xrLC_Light/xrFace.h +++ b/src/utils/xrLC_Light/xrFace.h @@ -1,7 +1,7 @@ #pragma once -#include "../shader_xrlc.h" +#include "../Shader_xrLC.h" //#include "r_light.h" #include "tcf.h" diff --git a/src/utils/xrLC_Light/xrLC_GlobalData.cpp b/src/utils/xrLC_Light/xrLC_GlobalData.cpp index 25e08a3d8b..74f1cc0855 100644 --- a/src/utils/xrLC_Light/xrLC_GlobalData.cpp +++ b/src/utils/xrLC_Light/xrLC_GlobalData.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" #include "xrLC_GlobalData.h" -#include "xrface.h" -#include "xrdeflector.h" -#include "lightmap.h" +#include "xrFace.h" +#include "xrDeflector.h" +#include "Lightmap.h" #include "mu_model_face.h" -#include "xrmu_model.h" -#include "xrmu_model_reference.h" -#include "../../xrcdb/xrcdb.h" +#include "xrMU_Model.h" +#include "xrMU_Model_Reference.h" +#include "../../xrCDB/xrCDB.h" bool g_using_smooth_groups = true; bool g_smooth_groups_by_faces = false; diff --git a/src/utils/xrLC_Light/xrLC_GlobalData.h b/src/utils/xrLC_Light/xrLC_GlobalData.h index 7b8cdfe486..9a0fca7dd4 100644 --- a/src/utils/xrLC_Light/xrLC_GlobalData.h +++ b/src/utils/xrLC_Light/xrLC_GlobalData.h @@ -1,10 +1,10 @@ #pragma once -#include "../shader_xrlc.h" -#include "../../xrcore/xrPool.h" +#include "../Shader_xrLC.h" +#include "../../xrCore/xrPool.h" //#include "xrface.h" -#include "xrfacedefs.h" -#include "xrdeflectordefs.h" +#include "xrFaceDefs.h" +#include "xrDeflectorDefs.h" #include "b_build_texture.h" #include "base_lighting.h" #include "../../Include/Editors/communicate.h" diff --git a/src/utils/xrLC_Light/xrLC_Light.cpp b/src/utils/xrLC_Light/xrLC_Light.cpp index 81b0f68d70..b3860c0163 100644 --- a/src/utils/xrLC_Light/xrLC_Light.cpp +++ b/src/utils/xrLC_Light/xrLC_Light.cpp @@ -1,7 +1,7 @@ // xrLC_Light.cpp : Defines the entry point for the DLL application. // #include "stdafx.h" -#include "xrLc_globaldata.h" +#include "xrLC_GlobalData.h" #ifdef _MANAGED #pragma managed(push, off) diff --git a/src/utils/xrLC_Light/xrLightVertex.cpp b/src/utils/xrLC_Light/xrLightVertex.cpp index 6160821e7e..3e32d64f21 100644 --- a/src/utils/xrLC_Light/xrLightVertex.cpp +++ b/src/utils/xrLC_Light/xrLightVertex.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "xrLightVertex.h" #include "../xrForms/xrThread.h" -#include "xrface.h" +#include "xrFace.h" #include "xrLC_GlobalData.h" #include "light_point.h" -#include "../../xrcdb/xrCDB.h" +#include "../../xrCDB/xrCDB.h" //----------------------------------------------------------------------- typedef xr_multimap mapVert; typedef mapVert::iterator mapVertIt; diff --git a/src/utils/xrLC_Light/xrLight_Implicit.cpp b/src/utils/xrLC_Light/xrLight_Implicit.cpp index ee9accb91d..2497d1124b 100644 --- a/src/utils/xrLC_Light/xrLight_Implicit.cpp +++ b/src/utils/xrLC_Light/xrLight_Implicit.cpp @@ -1,16 +1,16 @@ #include "stdafx.h" -#include "xrlight_implicit.h" +#include "xrLight_Implicit.h" #include "xrLight_ImplicitDeflector.h" -#include "xrlight_implicitrun.h" +#include "xrLight_ImplicitRun.h" #include "tga.h" #include "light_point.h" -#include "xrdeflector.h" +#include "xrDeflector.h" #include "xrLC_GlobalData.h" -#include "xrface.h" -#include "xrlight_implicitcalcglobs.h" +#include "xrFace.h" +#include "xrLight_ImplicitCalcGlobs.h" #include "../../xrCDB/xrCDB.h" diff --git a/src/utils/xrLC_Light/xrLight_ImplicitCalcGlobs.cpp b/src/utils/xrLC_Light/xrLight_ImplicitCalcGlobs.cpp index c6075eaa11..b7be239a64 100644 --- a/src/utils/xrLC_Light/xrLight_ImplicitCalcGlobs.cpp +++ b/src/utils/xrLC_Light/xrLight_ImplicitCalcGlobs.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "xrlight_implicitcalcglobs.h" -#include "xrLight_implicitdeflector.h" -#include "xrface.h" -#include "xrlc_globaldata.h" +#include "xrLight_ImplicitCalcGlobs.h" +#include "xrLight_ImplicitDeflector.h" +#include "xrFace.h" +#include "xrLC_GlobalData.h" void ImplicitCalcGlobs::Allocate() diff --git a/src/utils/xrLC_Light/xrLight_ImplicitCalcGlobs.h b/src/utils/xrLC_Light/xrLight_ImplicitCalcGlobs.h index 0c65a8bd86..59731d5488 100644 --- a/src/utils/xrLC_Light/xrLight_ImplicitCalcGlobs.h +++ b/src/utils/xrLC_Light/xrLight_ImplicitCalcGlobs.h @@ -1,7 +1,7 @@ #ifndef _XRLIGHT_IMPLICITCALCGLOBS_H_ #define _XRLIGHT_IMPLICITCALCGLOBS_H_ #include "xrFaceDefs.h" -#include "hash2d.h" +#include "hash2D.h" class ImplicitDeflector; typedef hash2D IHASH; class ImplicitCalcGlobs diff --git a/src/utils/xrLC_Light/xrLight_ImplicitDeflector.cpp b/src/utils/xrLC_Light/xrLight_ImplicitDeflector.cpp index b9cfbe5601..9a89c8e640 100644 --- a/src/utils/xrLC_Light/xrLight_ImplicitDeflector.cpp +++ b/src/utils/xrLC_Light/xrLight_ImplicitDeflector.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "xrlight_implicitdeflector.h" +#include "xrLight_ImplicitDeflector.h" #include "b_build_texture.h" -#include "xrface.h" +#include "xrFace.h" #include "xrLC_GlobalData.h" u32 ImplicitDeflector::Width () diff --git a/src/utils/xrLC_Light/xrLight_ImplicitDeflector.h b/src/utils/xrLC_Light/xrLight_ImplicitDeflector.h index 967a5e45ec..187893c27b 100644 --- a/src/utils/xrLC_Light/xrLight_ImplicitDeflector.h +++ b/src/utils/xrLC_Light/xrLight_ImplicitDeflector.h @@ -2,7 +2,7 @@ #define _XRLIGHT_IPLICIDDEFLECTOR #include "lm_layer.h" -#include "xrFacedefs.h" +#include "xrFaceDefs.h" struct b_BuildTexture; class ImplicitDeflector diff --git a/src/utils/xrLC_Light/xrLight_ImplicitThread.cpp b/src/utils/xrLC_Light/xrLight_ImplicitThread.cpp index 49ee9b39c7..a9b42212d9 100644 --- a/src/utils/xrLC_Light/xrLight_ImplicitThread.cpp +++ b/src/utils/xrLC_Light/xrLight_ImplicitThread.cpp @@ -1,4 +1,4 @@ #include "stdafx.h" -#include "xrlight_implicitrun.h" +#include "xrLight_ImplicitRun.h" #include "xrLight_Implicit.h" -#include "xrlight_implicitdeflector.h" +#include "xrLight_ImplicitDeflector.h" diff --git a/src/utils/xrLC_Light/xrMU_Model.cpp b/src/utils/xrLC_Light/xrMU_Model.cpp index 0fd4607f69..234c823747 100644 --- a/src/utils/xrLC_Light/xrMU_Model.cpp +++ b/src/utils/xrLC_Light/xrMU_Model.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "xrmu_model.h" +#include "xrMU_Model.h" #include "mu_model_face.h" #include "vector_clear.h" -#include "../../xrcore/xrPool.h" +#include "../../xrCore/xrPool.h" xrMU_Model::xrMU_Model() : m_lod_ID(u16(-1)) { diff --git a/src/utils/xrLC_Light/xrMU_Model_Calc_lighting.cpp b/src/utils/xrLC_Light/xrMU_Model_Calc_lighting.cpp index aa056315d1..0648b4f995 100644 --- a/src/utils/xrLC_Light/xrMU_Model_Calc_lighting.cpp +++ b/src/utils/xrLC_Light/xrMU_Model_Calc_lighting.cpp @@ -6,10 +6,10 @@ //#include "xrLC_GlobalData.h" #include "light_point.h" //#include "xrDeflector.h" -#include "../../xrcdb/xrcdb.h" -#include "../shader_xrlc.h" +#include "../../xrCDB/xrCDB.h" +#include "../Shader_xrLC.h" #include "mu_model_face.h" -#include "xrface.h" +#include "xrFace.h" #include "xrLC_GlobalData.h" void LightPoint(CDB::COLLIDER* DB, CDB::MODEL* MDL, base_color_c &C, Fvector &P, Fvector &N, base_lighting& lights, u32 flags, Face* skip); diff --git a/src/utils/xrLC_Light/xrMU_Model_Calc_materials.cpp b/src/utils/xrLC_Light/xrMU_Model_Calc_materials.cpp index 91c89657f6..47018a18a5 100644 --- a/src/utils/xrLC_Light/xrMU_Model_Calc_materials.cpp +++ b/src/utils/xrLC_Light/xrMU_Model_Calc_materials.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "xrMU_Model.h" -#include "../shader_xrlc.h" +#include "../Shader_xrLC.h" bool cmp_face_material (_face* f1, _face* f2) { diff --git a/src/utils/xrLC_Light/xrMU_Model_Calc_normals.cpp b/src/utils/xrLC_Light/xrMU_Model_Calc_normals.cpp index 1bd3766bba..67f1e46b56 100644 --- a/src/utils/xrLC_Light/xrMU_Model_Calc_normals.cpp +++ b/src/utils/xrLC_Light/xrMU_Model_Calc_normals.cpp @@ -4,7 +4,7 @@ #include "calculate_normals.h" #include "xrMU_Model.h" -#include "../../xrcore/xrPool.h" +#include "../../xrCore/xrPool.h" //#include "build.h" diff --git a/src/utils/xrLC_Light/xrMU_Model_Load.cpp b/src/utils/xrLC_Light/xrMU_Model_Load.cpp index 6cf8f8c91d..002f6c350d 100644 --- a/src/utils/xrLC_Light/xrMU_Model_Load.cpp +++ b/src/utils/xrLC_Light/xrMU_Model_Load.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "xrMU_Model.h" //#include "build.h" -#include "../../xrcore/xrPool.h" +#include "../../xrCore/xrPool.h" poolSS<_face,8*1024> &mu_faces_pool(); poolSS<_vertex,8*1024> &mu_vertices_pool(); //extern u32 version; diff --git a/src/utils/xrLC_Light/xrMU_Model_Reference.cpp b/src/utils/xrLC_Light/xrMU_Model_Reference.cpp index aa0ff383ff..281d6bf559 100644 --- a/src/utils/xrLC_Light/xrMU_Model_Reference.cpp +++ b/src/utils/xrLC_Light/xrMU_Model_Reference.cpp @@ -4,9 +4,9 @@ #include "xrLC_GlobalData.h" #include "xrMU_Model.h" -#include "../../xrcdb/xrcdb.h" -#include "../shader_xrlc.h" -#include "xrface.h" +#include "../../xrCDB/xrCDB.h" +#include "../Shader_xrLC.h" +#include "xrFace.h" void xrMU_Reference::Load( IReader& F, xr_vector& mu_models ) diff --git a/src/utils/xrLC_Light/xrMU_Model_Reference_Calc_Lighting.cpp b/src/utils/xrLC_Light/xrMU_Model_Reference_Calc_Lighting.cpp index 6cdc48d869..b03779df1f 100644 --- a/src/utils/xrLC_Light/xrMU_Model_Reference_Calc_Lighting.cpp +++ b/src/utils/xrLC_Light/xrMU_Model_Reference_Calc_Lighting.cpp @@ -5,7 +5,7 @@ #include "light_point.h" #include "fitter.h" -#include "xrface.h" +#include "xrFace.h" #include "xrLC_GlobalData.h" template T simple_optimize (xr_vector& A, xr_vector& B, T2& _scale, T2& _bias) diff --git a/src/utils/xrLC_Light/xrMU_Model_export_cform_rcast.cpp b/src/utils/xrLC_Light/xrMU_Model_export_cform_rcast.cpp index 73ef66f359..c74dd7d821 100644 --- a/src/utils/xrLC_Light/xrMU_Model_export_cform_rcast.cpp +++ b/src/utils/xrLC_Light/xrMU_Model_export_cform_rcast.cpp @@ -2,8 +2,8 @@ #include "xrMU_Model.h" #include "xrMU_Model_Reference.h" -#include "../../xrcdb/xrcdb.h" -#include "../shader_xrlc.h" +#include "../../xrCDB/xrCDB.h" +#include "../Shader_xrLC.h" u32 convert_nax(base_Face* F); diff --git a/src/utils/xrSE_Factory/xrUIXmlParser.h b/src/utils/xrSE_Factory/xrUIXmlParser.h index 9c2688f2d7..afa629ba86 100644 --- a/src/utils/xrSE_Factory/xrUIXmlParser.h +++ b/src/utils/xrSE_Factory/xrUIXmlParser.h @@ -1,6 +1,6 @@ #pragma once -#include "..\..\xrCore\XmlParser\xrXMLParser.h" +#include "../../xrCore/XmlParser/xrXMLParser.h" class CUIXml :public CXml { diff --git a/src/xrCore/FS_impl.h b/src/xrCore/FS_impl.h index a6f58d3913..9096b61ea3 100644 --- a/src/xrCore/FS_impl.h +++ b/src/xrCore/FS_impl.h @@ -173,7 +173,7 @@ IC u32 IReaderBase::find_chunk (u32 ID, BOOL* bCompressed) #ifdef FIND_CHUNK_VEC -#include "../xrCore/associative_vector.h" +#include "associative_vector.h" struct IReaderBase_Test { @@ -242,7 +242,7 @@ IC u32 IReaderBase::find_chunk (u32 ID, BOOL* bCompressed) #ifdef FIND_CHUNK_MAP -#include "../xrCore/associative_vector.h" +#include "associative_vector.h" struct IReaderBase_Test { diff --git a/src/xrEngine/Application.cpp b/src/xrEngine/Application.cpp index 6aecb2eb83..989cb903e7 100644 --- a/src/xrEngine/Application.cpp +++ b/src/xrEngine/Application.cpp @@ -3,9 +3,9 @@ #include "Application.h" #include "IGame_Level.h" #include "IGame_Persistent.h" -#include "xr_ioconsole.h" +#include "XR_IOConsole.h" #include "std_classes.h" -#include "../xrCDB/ispatial.h" +#include "../xrCDB/ISpatial.h" #include "ILoadingScreen.h" //--------------------------------------------------------------------- diff --git a/src/xrEngine/CameraBase.cpp b/src/xrEngine/CameraBase.cpp index af1118d2f2..773fa5722d 100644 --- a/src/xrEngine/CameraBase.cpp +++ b/src/xrEngine/CameraBase.cpp @@ -3,7 +3,7 @@ ////////////////////////////////////////////////////////////////////// #include "stdafx.h" -#include "igame_level.h" +#include "IGame_Level.h" #include "CameraBase.h" diff --git a/src/xrEngine/CameraManager.cpp b/src/xrEngine/CameraManager.cpp index f20327196e..a4f20f0b19 100644 --- a/src/xrEngine/CameraManager.cpp +++ b/src/xrEngine/CameraManager.cpp @@ -3,8 +3,8 @@ ////////////////////////////////////////////////////////////////////// #include "stdafx.h" -#include "igame_level.h" -#include "igame_persistent.h" +#include "IGame_Level.h" +#include "IGame_Persistent.h" #include "Environment.h" #include "CameraBase.h" @@ -13,8 +13,8 @@ #include "EffectorPP.h" #include "x_ray.h" -#include "gamefont.h" -#include "render.h" +#include "GameFont.h" +#include "Render.h" float psCamInert = 0.f; float psCamSlideInert = 0.25f; diff --git a/src/xrEngine/Device_create.cpp b/src/xrEngine/Device_create.cpp index 3de2313005..d3fdc4c542 100644 --- a/src/xrEngine/Device_create.cpp +++ b/src/xrEngine/Device_create.cpp @@ -3,8 +3,8 @@ //#include "resourcemanager.h" #include "../Include/xrRender/DrawUtils.h" //#include "xr_effgamma.h" -#include "render.h" -#include "../xrcdb/xrxrc.h" +#include "Render.h" +#include "../xrCDB/xrXRC.h" extern XRCDB_API BOOL *cdb_bDebug; diff --git a/src/xrEngine/Editor/XrEditorSceneInterface.h b/src/xrEngine/Editor/XrEditorSceneInterface.h index 85b72bcad8..289a32998a 100644 --- a/src/xrEngine/Editor/XrEditorSceneInterface.h +++ b/src/xrEngine/Editor/XrEditorSceneInterface.h @@ -1,5 +1,5 @@ #pragma once -#include "..\..\XrCDB\xrCDB.h" +#include "../../xrCDB/xrCDB.h" #include "game_graph.h" class CObjectSpace; class XrEditorSceneInterface diff --git a/src/xrEngine/Engine.h b/src/xrEngine/Engine.h index 0c2f4a1b51..98b16b6de4 100644 --- a/src/xrEngine/Engine.h +++ b/src/xrEngine/Engine.h @@ -4,7 +4,7 @@ #pragma once -#include "engineAPI.h" +#include "EngineAPI.h" #include "../xrCore/EventManager.h" #include "xrSheduler.h" diff --git a/src/xrEngine/EngineAPI.cpp b/src/xrEngine/EngineAPI.cpp index d83ace05e7..953924741c 100644 --- a/src/xrEngine/EngineAPI.cpp +++ b/src/xrEngine/EngineAPI.cpp @@ -4,7 +4,7 @@ #include "stdafx.h" #include "EngineAPI.h" -#include "../xrcdb/xrXRC.h" +#include "../xrCDB/xrXRC.h" #include diff --git a/src/xrEngine/Environment.cpp b/src/xrEngine/Environment.cpp index efe307752f..517f1c5984 100644 --- a/src/xrEngine/Environment.cpp +++ b/src/xrEngine/Environment.cpp @@ -2,12 +2,12 @@ #pragma hdrstop #ifndef _EDITOR - #include "render.h" +#include "Render.h" #endif #include "Environment.h" #include "xr_efflensflare.h" -#include "rain.h" +#include "Rain.h" #include "thunderbolt.h" #include "xrHemisphere.h" #include "perlin.h" @@ -21,7 +21,7 @@ #endif //#include "D3DUtils.h" -#include "../xrcore/xrCore.h" +#include "../xrCore/xrCore.h" #include "../Include/xrRender/EnvironmentRender.h" #include "../Include/xrRender/LensFlareRender.h" diff --git a/src/xrEngine/Environment_misc.cpp b/src/xrEngine/Environment_misc.cpp index 591205cc18..cdf752b550 100644 --- a/src/xrEngine/Environment_misc.cpp +++ b/src/xrEngine/Environment_misc.cpp @@ -4,7 +4,7 @@ #include "Environment.h" #include "xr_efflensflare.h" #include "thunderbolt.h" -#include "rain.h" +#include "Rain.h" #include "IGame_Level.h" #include "../xrServerEntities/object_broker.h" diff --git a/src/xrEngine/Environment_render.cpp b/src/xrEngine/Environment_render.cpp index a45897e9f4..a7efc8f7f2 100644 --- a/src/xrEngine/Environment_render.cpp +++ b/src/xrEngine/Environment_render.cpp @@ -3,10 +3,10 @@ #include "Environment.h" #ifndef _EDITOR - #include "render.h" +#include "Render.h" #endif #include "xr_efflensflare.h" -#include "rain.h" +#include "Rain.h" #include "thunderbolt.h" #ifndef _EDITOR diff --git a/src/xrEngine/FDemoPlay.cpp b/src/xrEngine/FDemoPlay.cpp index 241d300f53..03242c2648 100644 --- a/src/xrEngine/FDemoPlay.cpp +++ b/src/xrEngine/FDemoPlay.cpp @@ -3,9 +3,9 @@ ////////////////////////////////////////////////////////////////////// #include "stdafx.h" -#include "igame_level.h" -#include "fdemoplay.h" -#include "xr_ioconsole.h" +#include "IGame_Level.h" +#include "FDemoPlay.h" +#include "XR_IOConsole.h" #include "motion.h" #include "Render.h" #include "CameraManager.h" diff --git a/src/xrEngine/FDemoPlay.h b/src/xrEngine/FDemoPlay.h index d8ff1a7e46..6adf5eccae 100644 --- a/src/xrEngine/FDemoPlay.h +++ b/src/xrEngine/FDemoPlay.h @@ -4,7 +4,7 @@ #if !defined(AFX_FDEMOPLAY_H__9B07E6E0_FC3C_11D3_B4E3_4854E82A090D__INCLUDED_) #define AFX_FDEMOPLAY_H__9B07E6E0_FC3C_11D3_B4E3_4854E82A090D__INCLUDED_ -#include "effector.h" +#include "Effector.h" // refs class COMotion; diff --git a/src/xrEngine/FDemoRecord.cpp b/src/xrEngine/FDemoRecord.cpp index 0a3d10752e..76581db9e9 100644 --- a/src/xrEngine/FDemoRecord.cpp +++ b/src/xrEngine/FDemoRecord.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" -#include "igame_level.h" +#include "IGame_Level.h" #include "x_ray.h" -#include "gamefont.h" -#include "fDemoRecord.h" -#include "xr_ioconsole.h" +#include "GameFont.h" +#include "FDemoRecord.h" +#include "XR_IOConsole.h" #include "xr_input.h" #include "xr_object.h" -#include "render.h" +#include "Render.h" #include "CustomHUD.h" #include "CameraManager.h" diff --git a/src/xrEngine/FDemoRecord.h b/src/xrEngine/FDemoRecord.h index 209f9a589b..dfc3c5ccdf 100644 --- a/src/xrEngine/FDemoRecord.h +++ b/src/xrEngine/FDemoRecord.h @@ -3,8 +3,8 @@ #pragma once -#include "iinputreceiver.h" -#include "effector.h" +#include "IInputReceiver.h" +#include "Effector.h" class ENGINE_API CDemoRecord : public CEffectorCam, diff --git a/src/xrEngine/Feel_Touch.cpp b/src/xrEngine/Feel_Touch.cpp index 482110ff08..71b845e86e 100644 --- a/src/xrEngine/Feel_Touch.cpp +++ b/src/xrEngine/Feel_Touch.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "igame_level.h" -#include "feel_touch.h" +#include "IGame_Level.h" +#include "Feel_Touch.h" #include "xr_object.h" using namespace Feel; diff --git a/src/xrEngine/Feel_Vision.cpp b/src/xrEngine/Feel_Vision.cpp index a39829db81..2261ca526a 100644 --- a/src/xrEngine/Feel_Vision.cpp +++ b/src/xrEngine/Feel_Vision.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "IGame_Level.h" -#include "feel_vision.h" -#include "render.h" +#include "Feel_Vision.h" +#include "Render.h" #include "xr_object.h" #include "xr_collide_form.h" -#include "igame_level.h" +#include "IGame_Level.h" #include "cl_intersect.h" namespace Feel { diff --git a/src/xrEngine/Feel_Vision.h b/src/xrEngine/Feel_Vision.h index 5fb415720b..20c81af8ba 100644 --- a/src/xrEngine/Feel_Vision.h +++ b/src/xrEngine/Feel_Vision.h @@ -1,7 +1,7 @@ #pragma once -#include "../xrcdb/xr_collide_defs.h" -#include "render.h" +#include "../xrCDB/xr_collide_defs.h" +#include "Render.h" #include "pure_relcase.h" class IRender_Sector; diff --git a/src/xrEngine/GameMtlLib.h b/src/xrEngine/GameMtlLib.h index 8e6d765e3d..1ae9c81d94 100644 --- a/src/xrEngine/GameMtlLib.h +++ b/src/xrEngine/GameMtlLib.h @@ -370,7 +370,7 @@ extern MTL_EXPORT_API CGameMtlLibrary GMLib; //#ifdef _EDITOR //extern MTL_EXPORT_API CGameMtlLibrary* PGMLib; //#else -#include "../xrCore/API/xrapi.h" +#include "../xrCore/API/xrAPI.h" //#endif #endif diff --git a/src/xrEngine/GameMtlLib_Engine.cpp b/src/xrEngine/GameMtlLib_Engine.cpp index a554d433bf..2f7a91f5bc 100644 --- a/src/xrEngine/GameMtlLib_Engine.cpp +++ b/src/xrEngine/GameMtlLib_Engine.cpp @@ -2,7 +2,7 @@ #include "stdafx.h" #pragma hdrstop -#include "../xrEngine/GameMtlLib.h" +#include "GameMtlLib.h" void DestroySounds(SoundVec& lst) { diff --git a/src/xrEngine/ICollidable.cpp b/src/xrEngine/ICollidable.cpp index 9cee7eba48..09e0f47acf 100644 --- a/src/xrEngine/ICollidable.cpp +++ b/src/xrEngine/ICollidable.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "../xrcdb/ispatial.h" -#include "icollidable.h" +#include "../xrCDB/ISpatial.h" +#include "ICollidable.h" #include "xr_collide_form.h" ICollidable::ICollidable() diff --git a/src/xrEngine/IGame_Level.cpp b/src/xrEngine/IGame_Level.cpp index 413e1471ea..1bc2d528dd 100644 --- a/src/xrEngine/IGame_Level.cpp +++ b/src/xrEngine/IGame_Level.cpp @@ -1,16 +1,16 @@ #include "stdafx.h" -#include "igame_level.h" -#include "igame_persistent.h" +#include "IGame_Level.h" +#include "IGame_Persistent.h" #include "x_ray.h" #include "std_classes.h" -#include "customHUD.h" -#include "render.h" -#include "gamefont.h" +#include "CustomHUD.h" +#include "Render.h" +#include "GameFont.h" #include "xrLevel.h" #include "CameraManager.h" #include "xr_object.h" -#include "feel_sound.h" +#include "Feel_Sound.h" #include "FPSCounter.h" diff --git a/src/xrEngine/IGame_Level.h b/src/xrEngine/IGame_Level.h index ed2536b8e7..81fddecf73 100644 --- a/src/xrEngine/IGame_Level.h +++ b/src/xrEngine/IGame_Level.h @@ -3,10 +3,10 @@ #pragma once -#include "iinputreceiver.h" +#include "IInputReceiver.h" #include "xr_object_list.h" -#include "../xrcdb/xr_area.h" -#include "../xrEngine/IGame_Patrol.h" +#include "../xrCDB/xr_area.h" +#include "IGame_Patrol.h" // refs class ENGINE_API CCameraManager; diff --git a/src/xrEngine/IGame_Level_check_textures.cpp b/src/xrEngine/IGame_Level_check_textures.cpp index 851fa03cff..524d895721 100644 --- a/src/xrEngine/IGame_Level_check_textures.cpp +++ b/src/xrEngine/IGame_Level_check_textures.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" //#include "resourcemanager.h" -#include "igame_level.h" +#include "IGame_Level.h" void IGame_Level::LL_CheckTextures() { diff --git a/src/xrEngine/IGame_ObjectPool.cpp b/src/xrEngine/IGame_ObjectPool.cpp index 605475c879..3d91e1a8e6 100644 --- a/src/xrEngine/IGame_ObjectPool.cpp +++ b/src/xrEngine/IGame_ObjectPool.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "igame_level.h" +#include "IGame_Level.h" #include "IGame_Persistent.h" -#include "igame_objectpool.h" +#include "IGame_ObjectPool.h" #include "xr_object.h" IGame_ObjectPool::IGame_ObjectPool(void) diff --git a/src/xrEngine/IGame_Persistent.cpp b/src/xrEngine/IGame_Persistent.cpp index 5acb146fd1..36303344ba 100644 --- a/src/xrEngine/IGame_Persistent.cpp +++ b/src/xrEngine/IGame_Persistent.cpp @@ -4,7 +4,7 @@ #include "IGame_Persistent.h" #ifndef _EDITOR -#include "environment.h" +#include "Environment.h" # include "x_ray.h" # include "IGame_Level.h" # include "XR_IOConsole.h" diff --git a/src/xrEngine/IInputReceiver.cpp b/src/xrEngine/IInputReceiver.cpp index 32ca3fa384..822a13f3ec 100644 --- a/src/xrEngine/IInputReceiver.cpp +++ b/src/xrEngine/IInputReceiver.cpp @@ -2,7 +2,7 @@ #pragma hdrstop #include "xr_input.h" -#include "iinputreceiver.h" +#include "IInputReceiver.h" void IInputReceiver::IR_Capture (void) { diff --git a/src/xrEngine/IRenderable.cpp b/src/xrEngine/IRenderable.cpp index f9c58e87f4..231634989e 100644 --- a/src/xrEngine/IRenderable.cpp +++ b/src/xrEngine/IRenderable.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "../xrcdb/ispatial.h" -#include "irenderable.h" +#include "../xrCDB/ISpatial.h" +#include "IRenderable.h" IRenderable::IRenderable() { diff --git a/src/xrEngine/ObjectAnimator.cpp b/src/xrEngine/ObjectAnimator.cpp index 3970444512..be57ca2c24 100644 --- a/src/xrEngine/ObjectAnimator.cpp +++ b/src/xrEngine/ObjectAnimator.cpp @@ -126,8 +126,8 @@ float CObjectAnimator::GetLength () #ifdef _EDITOR -#include "../editors/xrECORE/stdafx.h" -#include "../editors/xrECORE/editor/d3dutils.h" +#include "../Editors/xrECore/stdafx.h" +#include "../Editors/xrECore/Editor/D3DUtils.h" #include "envelope.h" static FvectorVec path_points; diff --git a/src/xrEngine/ObjectDump.cpp b/src/xrEngine/ObjectDump.cpp index 1fd27e4510..937954aa58 100644 --- a/src/xrEngine/ObjectDump.cpp +++ b/src/xrEngine/ObjectDump.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "../xrengine/xr_object.h" +#include "xr_object.h" #ifdef DEBUG #include "ObjectDump.h" diff --git a/src/xrEngine/PS_instance.cpp b/src/xrEngine/PS_instance.cpp index 038c8a9afd..5d07448440 100644 --- a/src/xrEngine/PS_instance.cpp +++ b/src/xrEngine/PS_instance.cpp @@ -4,7 +4,7 @@ #include "stdafx.h" #pragma hdrstop -#include "ps_instance.h" +#include "PS_instance.h" #include "IGame_Persistent.h" CPS_Instance::CPS_Instance (bool destroy_on_game_load) : diff --git a/src/xrEngine/Rain.cpp b/src/xrEngine/Rain.cpp index 781e50849f..7ad67d9d13 100644 --- a/src/xrEngine/Rain.cpp +++ b/src/xrEngine/Rain.cpp @@ -2,16 +2,16 @@ #pragma once #include "Rain.h" -#include "igame_persistent.h" -#include "environment.h" +#include "IGame_Persistent.h" +#include "Environment.h" #include "Editor/XrEditorSceneInterface.h" #ifdef _EDITOR #include "ui_toolscustom.h" #else - #include "render.h" - #include "igame_level.h" - #include "../xrcdb/xr_area.h" +#include "Render.h" +#include "IGame_Level.h" +#include "../xrCDB/xr_area.h" #include "xr_object.h" #endif diff --git a/src/xrEngine/Rain.h b/src/xrEngine/Rain.h index ea016268e7..63e12a0acd 100644 --- a/src/xrEngine/Rain.h +++ b/src/xrEngine/Rain.h @@ -6,7 +6,7 @@ #define RainH #pragma once -#include "../xrcdb/xr_collide_defs.h" +#include "../xrCDB/xr_collide_defs.h" //refs class ENGINE_API IRender_DetailModel; diff --git a/src/xrEngine/Render.cpp b/src/xrEngine/Render.cpp index 39fa0ae612..a081fab338 100644 --- a/src/xrEngine/Render.cpp +++ b/src/xrEngine/Render.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "render.h" +#include "Render.h" //ENGINE_API IRender_interface* Render = nullptr; diff --git a/src/xrEngine/SkeletonMotions.h b/src/xrEngine/SkeletonMotions.h index 429d29411b..18e3c28564 100644 --- a/src/xrEngine/SkeletonMotions.h +++ b/src/xrEngine/SkeletonMotions.h @@ -4,7 +4,7 @@ //#include "skeletoncustom.h" #include "bone.h" -#include "skeletonmotiondefs.h" +#include "SkeletonMotionDefs.h" // refs class CKinematicsAnimated; diff --git a/src/xrEngine/Stats.cpp b/src/xrEngine/Stats.cpp index 51dc410962..0cef1012de 100644 --- a/src/xrEngine/Stats.cpp +++ b/src/xrEngine/Stats.cpp @@ -2,9 +2,9 @@ #include "GameFont.h" #pragma hdrstop -#include "../xrcdb/ISpatial.h" +#include "../xrCDB/ISpatial.h" #include "IGame_Persistent.h" -#include "render.h" +#include "Render.h" #include "xr_object.h" #include "../Include/xrRender/DrawUtils.h" diff --git a/src/xrEngine/XR_IOConsole.cpp b/src/xrEngine/XR_IOConsole.cpp index 9e27ad45d3..13aa61d732 100644 --- a/src/xrEngine/XR_IOConsole.cpp +++ b/src/xrEngine/XR_IOConsole.cpp @@ -8,8 +8,8 @@ #include "XR_IOConsole.h" #include "line_editor.h" -#include "igame_level.h" -#include "igame_persistent.h" +#include "IGame_Level.h" +#include "IGame_Persistent.h" #include "x_ray.h" #include "xr_input.h" diff --git a/src/xrEngine/bone.cpp b/src/xrEngine/bone.cpp index be52636ae0..9ef2d6e9d4 100644 --- a/src/xrEngine/bone.cpp +++ b/src/xrEngine/bone.cpp @@ -2,7 +2,7 @@ #pragma hdrstop #include "bone.h" -#include "gamemtllib.h" +#include "GameMtlLib.h" u16 CBone::get_game_mtl_idx ( ) const diff --git a/src/xrEngine/cf_dynamic_mesh.cpp b/src/xrEngine/cf_dynamic_mesh.cpp index 065f8e6a23..88516d604a 100644 --- a/src/xrEngine/cf_dynamic_mesh.cpp +++ b/src/xrEngine/cf_dynamic_mesh.cpp @@ -8,7 +8,7 @@ #include "../Include/xrRender/Kinematics.h" #ifdef DEBUG -#include "iphdebug.h" +#include "IPHdebug.h" #endif BOOL CCF_DynamicMesh::_RayQuery( const collide::ray_defs& Q, collide::rq_results& R) diff --git a/src/xrEngine/device.cpp b/src/xrEngine/device.cpp index d1d24d25fd..f66b39736f 100644 --- a/src/xrEngine/device.cpp +++ b/src/xrEngine/device.cpp @@ -2,7 +2,7 @@ using namespace DirectX; -#include "../xrCDB/frustum.h" +#include "../xrCDB/Frustum.h" #include "../xrCore/discord/discord.h" #pragma warning(disable:4995) @@ -16,12 +16,12 @@ using namespace DirectX; #pragma warning(default:4995) #include "x_ray.h" -#include "render.h" +#include "Render.h" // must be defined before include of FS_impl.h #define INCLUDE_FROM_ENGINE #include "../xrCore/FS_impl.h" -#include "igame_persistent.h" +#include "IGame_Persistent.h" ENGINE_API CRenderDevice* DevicePtr = nullptr; #ifndef _EDITOR @@ -180,7 +180,7 @@ static void mt_Thread(void* ptr) Device.mt_bMustExit = FALSE; // Important!!! } -#include "igame_level.h" +#include "IGame_Level.h" #endif void CRenderDevice::PreCache (u32 amount, bool b_draw_loadscreen, bool b_wait_user_input) { diff --git a/src/xrEngine/fmesh.cpp b/src/xrEngine/fmesh.cpp index d2a3f79ccf..3f5e998636 100644 --- a/src/xrEngine/fmesh.cpp +++ b/src/xrEngine/fmesh.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include "fmesh.h" +#include "Fmesh.h" //BOOL ValidateIndices(u32 vCount, u32 iCount, u16* pIndices) //{ diff --git a/src/xrEngine/phdebug.cpp b/src/xrEngine/phdebug.cpp index 732bf13a29..eb11c89545 100644 --- a/src/xrEngine/phdebug.cpp +++ b/src/xrEngine/phdebug.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "iphdebug.h" +#include "IPHdebug.h" IPhDebugRender* ph_debug_render = 0; \ No newline at end of file diff --git a/src/xrEngine/stdafx.h b/src/xrEngine/stdafx.h index 5f53736c16..503a5d799d 100644 --- a/src/xrEngine/stdafx.h +++ b/src/xrEngine/stdafx.h @@ -29,17 +29,17 @@ // Our headers #include "EngineExternal.h" -#include "engine.h" +#include "Engine.h" #include "defines.h" #ifndef NO_XRLOG -#include "../xrcore/log.h" +#include "../xrCore/log.h" #endif #include "device.h" -#include "../xrcore/fs.h" +#include "../xrCore/FS.h" -#include "../xrcdb/xrXRC.h" +#include "../xrCDB/xrXRC.h" -#include "../xrSound/sound.h" +#include "../xrSound/Sound.h" #include "bone.h" extern ENGINE_API CInifile *pGameIni; diff --git a/src/xrEngine/thunderbolt.cpp b/src/xrEngine/thunderbolt.cpp index 8186db23a8..0dcd81d848 100644 --- a/src/xrEngine/thunderbolt.cpp +++ b/src/xrEngine/thunderbolt.cpp @@ -2,17 +2,17 @@ #pragma once #ifndef _EDITOR - #include "render.h" +#include "Render.h" #endif -#include "Thunderbolt.h" -#include "igame_persistent.h" +#include "thunderbolt.h" +#include "IGame_Persistent.h" #include "LightAnimLibrary.h" #ifdef _EDITOR #include "ui_toolscustom.h" #else - #include "igame_level.h" - #include "../xrcdb/xr_area.h" +#include "IGame_Level.h" +#include "../xrCDB/xr_area.h" #include "xr_object.h" #endif diff --git a/src/xrEngine/x_ray.cpp b/src/xrEngine/x_ray.cpp index 49b5645ced..145f092686 100644 --- a/src/xrEngine/x_ray.cpp +++ b/src/xrEngine/x_ray.cpp @@ -10,11 +10,11 @@ #include "../xrNetServer/NET_AuthCheck.h" #include "xr_input.h" -#include "xr_ioconsole.h" +#include "XR_IOConsole.h" #include "x_ray.h" #include "GameFont.h" #include "LightAnimLibrary.h" -#include "../xrCDB/ispatial.h" +#include "../xrCDB/ISpatial.h" #include #include #include "string_table.h" diff --git a/src/xrEngine/xrTheora_Stream.cpp b/src/xrEngine/xrTheora_Stream.cpp index 828298a147..57446589bd 100644 --- a/src/xrEngine/xrTheora_Stream.cpp +++ b/src/xrEngine/xrTheora_Stream.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "xrtheora_stream.h" +#include "xrTheora_Stream.h" CTheoraStream::CTheoraStream() { diff --git a/src/xrEngine/xrTheora_Stream.h b/src/xrEngine/xrTheora_Stream.h index 43a8a31bf7..731d2f05cb 100644 --- a/src/xrEngine/xrTheora_Stream.h +++ b/src/xrEngine/xrTheora_Stream.h @@ -3,7 +3,7 @@ #pragma once #include -#include "../xrCore/Stream_Reader.h" +#include "../xrCore/stream_reader.h" class ENGINE_API CTheoraStream{ friend class CTheoraSurface; diff --git a/src/xrEngine/xrTheora_Surface.cpp b/src/xrEngine/xrTheora_Surface.cpp index 6247b66521..35b038e03e 100644 --- a/src/xrEngine/xrTheora_Surface.cpp +++ b/src/xrEngine/xrTheora_Surface.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "xrtheora_surface.h" -#include "xrtheora_stream.h" +#include "xrTheora_Surface.h" +#include "xrTheora_Stream.h" CTheoraSurface::CTheoraSurface() { diff --git a/src/xrEngine/xr_efflensflare.cpp b/src/xrEngine/xr_efflensflare.cpp index 9ca4bc407a..347fef7fd4 100644 --- a/src/xrEngine/xr_efflensflare.cpp +++ b/src/xrEngine/xr_efflensflare.cpp @@ -3,7 +3,7 @@ #include "xr_efflensflare.h" -#include "igame_persistent.h" +#include "IGame_Persistent.h" #include "Environment.h" //#include "SkeletonCustom.h" // Instead of SkeletonCustom: @@ -18,7 +18,7 @@ #include "ui_main.h" #else #include "xr_object.h" - #include "igame_level.h" +#include "IGame_Level.h" #endif #define FAR_DIST g_pGamePersistent->Environment().CurrentEnv->far_plane diff --git a/src/xrEngine/xr_efflensflare.h b/src/xrEngine/xr_efflensflare.h index 9cc4b2dda6..c549cb0cd7 100644 --- a/src/xrEngine/xr_efflensflare.h +++ b/src/xrEngine/xr_efflensflare.h @@ -1,7 +1,7 @@ #ifndef xr_efflensflareH #define xr_efflensflareH -#include "../xrcdb/xr_collide_defs.h" +#include "../xrCDB/xr_collide_defs.h" #include "../Include/xrRender/FactoryPtr.h" #include "../Include/xrRender/LensFlareRender.h" diff --git a/src/xrEngine/xr_ioc_cmd.cpp b/src/xrEngine/xr_ioc_cmd.cpp index 5cafdb0a3e..b0c9fda737 100644 --- a/src/xrEngine/xr_ioc_cmd.cpp +++ b/src/xrEngine/xr_ioc_cmd.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" -#include "igame_level.h" +#include "IGame_Level.h" //#include "xr_effgamma.h" #include "x_ray.h" -#include "xr_ioconsole.h" +#include "XR_IOConsole.h" #include "xr_ioc_cmd.h" //#include "fbasicvisual.h" -#include "cameramanager.h" -#include "environment.h" +#include "CameraManager.h" +#include "Environment.h" #include "xr_input.h" #include "CustomHUD.h" diff --git a/src/xrEngine/xr_level_controller.cpp b/src/xrEngine/xr_level_controller.cpp index 437e0dddb2..cd0581f668 100644 --- a/src/xrEngine/xr_level_controller.cpp +++ b/src/xrEngine/xr_level_controller.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "xr_ioconsole.h" +#include "XR_IOConsole.h" #include "xr_input.h" #include "xr_ioc_cmd.h" #include "xr_level_controller.h" diff --git a/src/xrEngine/xr_object.cpp b/src/xrEngine/xr_object.cpp index 3ff143d94e..ae78938332 100644 --- a/src/xrEngine/xr_object.cpp +++ b/src/xrEngine/xr_object.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "igame_level.h" +#include "IGame_Level.h" #include "xr_object.h" -#include "../xrcdb/xr_area.h" -#include "render.h" +#include "../xrCDB/xr_area.h" +#include "Render.h" #include "xrLevel.h" //#include "fbasicvisual.h" #include "../Include/xrRender/RenderVisual.h" diff --git a/src/xrEngine/xr_object_list.cpp b/src/xrEngine/xr_object_list.cpp index b26552671e..fb0a82e83a 100644 --- a/src/xrEngine/xr_object_list.cpp +++ b/src/xrEngine/xr_object_list.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "igame_level.h" -#include "igame_persistent.h" +#include "IGame_Level.h" +#include "IGame_Persistent.h" #include "xrSheduler.h" #include "xr_object_list.h" diff --git a/src/xrGame/AI_PhraseDialogManager.cpp b/src/xrGame/AI_PhraseDialogManager.cpp index c605e023c0..b8c861d075 100644 --- a/src/xrGame/AI_PhraseDialogManager.cpp +++ b/src/xrGame/AI_PhraseDialogManager.cpp @@ -5,12 +5,12 @@ // /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "AI_PhraseDialogManager.h" #include "PhraseDialog.h" -#include "inventoryowner.h" +#include "InventoryOwner.h" #include "character_info.h" -#include "gameobject.h" +#include "GameObject.h" #include "relation_registry.h" CAI_PhraseDialogManager::CAI_PhraseDialogManager (void) @@ -27,9 +27,9 @@ void CAI_PhraseDialogManager::ReceivePhrase (DIALOG_SHARED_PTR& phrase_dialog) AnswerPhrase(phrase_dialog); CPhraseDialogManager::ReceivePhrase(phrase_dialog); } -#include "uigamesp.h" +#include "UIGameSP.h" #include "Level.h" -#include "ui/UItalkWnd.h" +#include "ui/UITalkWnd.h" void CAI_PhraseDialogManager::AnswerPhrase (DIALOG_SHARED_PTR& phrase_dialog) { diff --git a/src/xrGame/ActivatingCharCollisionDelay.cpp b/src/xrGame/ActivatingCharCollisionDelay.cpp index a111b6764b..895d2811ed 100644 --- a/src/xrGame/ActivatingCharCollisionDelay.cpp +++ b/src/xrGame/ActivatingCharCollisionDelay.cpp @@ -1,10 +1,10 @@ -#include "stdafx.h" +#include "StdAfx.h" -#include "activatingcharcollisiondelay.h" -#include "characterphysicssupport.h" -#include "phmovementcontrol.h" +#include "ActivatingCharCollisionDelay.h" +#include "CharacterPhysicsSupport.h" +#include "PHMovementControl.h" #ifdef DEBUG -#include "phdebug.h" +#include "PHDebug.h" #endif activating_character_delay::activating_character_delay(CCharacterPhysicsSupport *char_support_): char_support(*char_support_), diff --git a/src/xrGame/Actor.cpp b/src/xrGame/Actor.cpp index 5b82e7d1cd..d2b7dce405 100644 --- a/src/xrGame/Actor.cpp +++ b/src/xrGame/Actor.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "Actor_Flags.h" #include "HUDManager.h" @@ -11,16 +11,16 @@ #include "PHDestroyable.h" #include "Car.h" #include "xrServer_Objects_ALife_Monsters.h" -#include "CameraLook.h" +#include "cameralook.h" #include "CameraFirstEye.h" -#include "effectorfall.h" +#include "EffectorFall.h" #include "EffectorBobbing.h" #include "ActorEffector.h" #include "EffectorZoomInertion.h" #include "SleepEffector.h" #include "character_info.h" #include "CustomOutfit.h" -#include "actorcondition.h" +#include "ActorCondition.h" #include "UIGameCustom.h" #include "../xrPhysics/matrix_utils.h" #include "clsid_game.h" @@ -56,10 +56,10 @@ #include "../xrPhysics/IColisiondamageInfo.h" #include "ui/UIMainIngameWnd.h" #include "map_manager.h" -#include "GameTaskManager.h" +#include "GametaskManager.h" #include "actor_memory.h" #include "script_game_object.h" -#include "Game_Object_Space.h" +#include "game_object_space.h" #include "InventoryBox.h" #include "location_manager.h" #include "player_hud.h" @@ -71,7 +71,7 @@ #include "ui/UIMotionIcon.h" #include "ui/UIActorMenu.h" #include "ActorHelmet.h" -#include "UI/UIDragDropReferenceList.h" +#include "ui/UIDragDropReferenceList.h" #include "../../xrUI/UIFontDefines.h" #include "PickupManager.h" diff --git a/src/xrGame/Actor.h b/src/xrGame/Actor.h index e8e0d1ff49..0322c2265c 100644 --- a/src/xrGame/Actor.h +++ b/src/xrGame/Actor.h @@ -1,11 +1,11 @@ #pragma once -#include "../xrEngine/feel_touch.h" -#include "../xrEngine/feel_sound.h" +#include "../xrEngine/Feel_Touch.h" +#include "../xrEngine/Feel_Sound.h" #include "../xrEngine/IInputReceiver.h" #include "../xrEngine/IGame_Actor.h" #include "../Include/xrRender/KinematicsAnimated.h" -#include "actor_flags.h" +#include "Actor_Flags.h" #include "actor_defs.h" #include "fire_disp_controller.h" #include "entity_alive.h" diff --git a/src/xrGame/ActorAnimation.cpp b/src/xrGame/ActorAnimation.cpp index 2597d17e29..d3b2c9f1f0 100644 --- a/src/xrGame/ActorAnimation.cpp +++ b/src/xrGame/ActorAnimation.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Actor.h" #include "ActorAnimation.h" #include "actor_anim_defs.h" #include "Weapon.h" #include "WeaponKnife.h" #include "Inventory.h" -#include "missile.h" +#include "Missile.h" #include "Level.h" #ifdef DEBUG #include "PHDebug.h" diff --git a/src/xrGame/ActorCameras.cpp b/src/xrGame/ActorCameras.cpp index 326b7add43..e10698558c 100644 --- a/src/xrGame/ActorCameras.cpp +++ b/src/xrGame/ActorCameras.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Actor.h" #include "../xrEngine/CameraBase.h" #ifdef DEBUG @@ -21,8 +21,8 @@ #include "EffectorShot.h" #include "PHMovementControl.h" -#include "../xrPhysics/ielevatorstate.h" -#include "../xrPhysics/actorcameracollision.h" +#include "../xrPhysics/IElevatorState.h" +#include "../xrPhysics/ActorCameraCollision.h" #include "IKLimbsController.h" #include "GamePersistent.h" diff --git a/src/xrGame/ActorCondition.cpp b/src/xrGame/ActorCondition.cpp index 56b9f53156..0364ea0e33 100644 --- a/src/xrGame/ActorCondition.cpp +++ b/src/xrGame/ActorCondition.cpp @@ -1,14 +1,14 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "actorcondition.h" +#include "ActorCondition.h" #include "Actor.h" -#include "actorEffector.h" +#include "ActorEffector.h" #include "Inventory.h" #include "Level.h" -#include "sleepeffector.h" +#include "SleepEffector.h" #include "game_base_space.h" #include "autosave_manager.h" -#include "xrserver.h" +#include "xrServer.h" #include "ai_space.h" #include "script_game_object.h" #include "game_object_space.h" @@ -406,7 +406,7 @@ void CActorCondition::AffectDamage_InjuriousMaterialAndMonstersInfluence() }//while } -#include "characterphysicssupport.h" +#include "CharacterPhysicsSupport.h" float CActorCondition::GetInjuriousMaterialDamage() { u16 mat_injurios = m_object->character_physics_support()->movement()->injurious_material_idx(); diff --git a/src/xrGame/ActorEffector.cpp b/src/xrGame/ActorEffector.cpp index 824bf7f2e7..6516d09b6b 100644 --- a/src/xrGame/ActorEffector.cpp +++ b/src/xrGame/ActorEffector.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "ActorEffector.h" #include "PostprocessAnimator.h" -#include "../xrEngine/effectorPP.h" +#include "../xrEngine/EffectorPP.h" #include "../xrEngine/ObjectAnimator.h" #include "object_broker.h" #include "Actor.h" diff --git a/src/xrGame/ActorEffector_script.cpp b/src/xrGame/ActorEffector_script.cpp index 392a809c0c..e8aff675ad 100644 --- a/src/xrGame/ActorEffector_script.cpp +++ b/src/xrGame/ActorEffector_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "ai_space.h" #include "../xrScripts/script_engine.h" diff --git a/src/xrGame/ActorHelmet.cpp b/src/xrGame/ActorHelmet.cpp index 4cccf094c1..bcd99f3cf4 100644 --- a/src/xrGame/ActorHelmet.cpp +++ b/src/xrGame/ActorHelmet.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "ActorHelmet.h" #include "Actor.h" #include "Inventory.h" diff --git a/src/xrGame/ActorInput.cpp b/src/xrGame/ActorInput.cpp index 9d0c4d0d99..4274897709 100644 --- a/src/xrGame/ActorInput.cpp +++ b/src/xrGame/ActorInput.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Actor.h" #include "Torch.h" #include "trade.h" @@ -17,12 +17,12 @@ #include "game_cl_base.h" #include "../xrEngine/xr_level_controller.h" #include "UsableScriptObject.h" -#include "actorcondition.h" +#include "ActorCondition.h" #include "actor_input_handler.h" #include "../xrEngine/string_table.h" #include "../../xrUI/Widgets/UIStatic.h" -#include "UI/UIActorMenu.h" -#include "UI/UIDragDropReferenceList.h" +#include "ui/UIActorMenu.h" +#include "ui/UIDragDropReferenceList.h" #include "CharacterPhysicsSupport.h" #include "InventoryBox.h" #include "player_hud.h" diff --git a/src/xrGame/ActorMountedWeapon.cpp b/src/xrGame/ActorMountedWeapon.cpp index a54da4720b..e01d4eab51 100644 --- a/src/xrGame/ActorMountedWeapon.cpp +++ b/src/xrGame/ActorMountedWeapon.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop -#include "actor.h" +#include "Actor.h" #include "../xrEngine/CameraBase.h" #include "ActorEffector.h" #include "CharacterPhysicsSupport.h" diff --git a/src/xrGame/ActorVehicle.cpp b/src/xrGame/ActorVehicle.cpp index c3448471f1..a8bbc6979a 100644 --- a/src/xrGame/ActorVehicle.cpp +++ b/src/xrGame/ActorVehicle.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop #include "Actor.h" @@ -18,7 +18,7 @@ #include "actor_anim_defs.h" #include "game_object_space.h" -#include "characterphysicssupport.h" +#include "CharacterPhysicsSupport.h" #include "Inventory.h" #include "pch_script.h" diff --git a/src/xrGame/Actor_Events.cpp b/src/xrGame/Actor_Events.cpp index c57875b83a..c83011dba1 100644 --- a/src/xrGame/Actor_Events.cpp +++ b/src/xrGame/Actor_Events.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Actor.h" #include "CustomDetector.h" #include "Weapon.h" #include "Artefact.h" #include "Scope.h" #include "Silencer.h" -#include "grenadelauncher.h" +#include "GrenadeLauncher.h" #include "Inventory.h" #include "Level.h" #include "../xrEngine/xr_level_controller.h" @@ -13,7 +13,7 @@ #include "ActorCondition.h" #include "Grenade.h" -#include "CameraLook.h" +#include "cameralook.h" #include "CameraFirstEye.h" #include "holder_custom.h" //.#include "ui/uiinventoryWnd.h" diff --git a/src/xrGame/Actor_Feel.cpp b/src/xrGame/Actor_Feel.cpp index 036bec22fc..2c250a04c6 100644 --- a/src/xrGame/Actor_Feel.cpp +++ b/src/xrGame/Actor_Feel.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Actor.h" #include "Weapon.h" #include "MercuryBall.h" @@ -7,7 +7,7 @@ #include "../xrEngine/xr_level_controller.h" #include "UsableScriptObject.h" #include "CustomZone.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" #include "ui/UIMainIngameWnd.h" #include "UIGameCustom.h" #include "Grenade.h" diff --git a/src/xrGame/Actor_Movement.cpp b/src/xrGame/Actor_Movement.cpp index a69f12b0c9..4f47005e52 100644 --- a/src/xrGame/Actor_Movement.cpp +++ b/src/xrGame/Actor_Movement.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Actor.h" #include "Inventory.h" @@ -8,15 +8,15 @@ #include "Level.h" #include "UIGameCustom.h" -#include "actorcondition.h" +#include "ActorCondition.h" #include "game_cl_base.h" #include "WeaponMagazined.h" #include "CharacterPhysicsSupport.h" -#include "actoreffector.h" +#include "ActorEffector.h" #include "player_hud.h" #ifdef DEBUG -#include "phdebug.h" +#include "PHDebug.h" #endif static const float s_fLandingTime1 = 0.1f;// через сколько снять флаг Landing1 (т.е. включить следующую анимацию) static const float s_fLandingTime2 = 0.3f;// через сколько снять флаг Landing2 (т.е. включить следующую анимацию) diff --git a/src/xrGame/Actor_Network.cpp b/src/xrGame/Actor_Network.cpp index 6f15aafa4a..ecb973e6ed 100644 --- a/src/xrGame/Actor_Network.cpp +++ b/src/xrGame/Actor_Network.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "Actor.h" #include "HUDManager.h" @@ -7,16 +7,16 @@ #include "xrServer_Objects_ALife_Monsters.h" #include "xrServer.h" #include "../xrEngine/CustomHUD.h" -#include "CameraLook.h" +#include "cameralook.h" #include "CameraFirstEye.h" #include "ActorEffector.h" -#include "../xrPhysics/iPHWorld.h" -#include "../xrPhysics/actorcameracollision.h" +#include "../xrPhysics/IPHWorld.h" +#include "../xrPhysics/ActorCameraCollision.h" #include "Level.h" #include "game_cl_base.h" -#include "infoportion.h" +#include "InfoPortion.h" #include "alife_registry_wrappers.h" #include "../Include/xrRender/Kinematics.h" #include "client_spawn_manager.h" @@ -36,16 +36,16 @@ #include "map_manager.h" #include "ui/UIMainIngameWnd.h" -#include "gamepersistent.h" +#include "GamePersistent.h" #include "game_object_space.h" -#include "GameTaskManager.h" +#include "GametaskManager.h" #include "game_base_kill_type.h" #include "holder_custom.h" #include "actor_memory.h" #include "actor_statistic_mgr.h" -#include "characterphysicssupport.h" +#include "CharacterPhysicsSupport.h" #include "game_cl_base_weapon_usage_statistic.h" -#include "../xrengine/xr_collide_form.h" +#include "../xrEngine/xr_collide_form.h" #include "actor_mp_client.h" #ifdef DEBUG # include "debug_renderer.h" diff --git a/src/xrGame/Actor_Sleep.cpp b/src/xrGame/Actor_Sleep.cpp index 1577c4e3bc..e717491dfa 100644 --- a/src/xrGame/Actor_Sleep.cpp +++ b/src/xrGame/Actor_Sleep.cpp @@ -1 +1 @@ -#include "stdafx.h" \ No newline at end of file +#include "StdAfx.h" diff --git a/src/xrGame/Actor_Weapon.cpp b/src/xrGame/Actor_Weapon.cpp index 60dc76ac7a..ebdfc47e1a 100644 --- a/src/xrGame/Actor_Weapon.cpp +++ b/src/xrGame/Actor_Weapon.cpp @@ -1,10 +1,10 @@ // Actor_Weapon.cpp: для работы с оружием ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "Actor.h" -#include "actoreffector.h" +#include "ActorEffector.h" #include "Missile.h" #include "Inventory.h" #include "Weapon.h" diff --git a/src/xrGame/AdvancedDetector.cpp b/src/xrGame/AdvancedDetector.cpp index a0494c6fc2..ca9ea594bc 100644 --- a/src/xrGame/AdvancedDetector.cpp +++ b/src/xrGame/AdvancedDetector.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "AdvancedDetector.h" #include "ui/ArtefactDetectorUI.h" #include "../Include/xrRender/Kinematics.h" diff --git a/src/xrGame/AmebaZone.cpp b/src/xrGame/AmebaZone.cpp index d7dfb7ae43..5875f7a4a4 100644 --- a/src/xrGame/AmebaZone.cpp +++ b/src/xrGame/AmebaZone.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "AmebaZone.h" #include "ZoneVisual.h" #include "CustomZone.h" -#include "../xrengine/xr_collide_form.h" +#include "../xrEngine/xr_collide_form.h" #include "../Include/xrRender/Kinematics.h" #include "PhysicsShellHolder.h" #include "PHMovementControl.h" diff --git a/src/xrGame/Artefact.cpp b/src/xrGame/Artefact.cpp index 240cc22ab4..12d1fb63a7 100644 --- a/src/xrGame/Artefact.cpp +++ b/src/xrGame/Artefact.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Artefact.h" #include "../xrPhysics/PhysicsShell.h" #include "PhysicsShellHolder.h" @@ -11,7 +11,7 @@ #include "Level.h" #include "ai_object_location.h" #include "xrServer_Objects_ALife_Monsters.h" -#include "../xrPhysics/iphworld.h" +#include "../xrPhysics/IPHWorld.h" #include "restriction_space.h" #include "../xrEngine/IGame_Persistent.h" @@ -370,8 +370,8 @@ void CArtefact::MoveTo(Fvector const & position) } -#include "inventoryOwner.h" -#include "Entity_alive.h" +#include "InventoryOwner.h" +#include "entity_alive.h" void CArtefact::UpdateXForm() { if (Device.dwFrame!=dwXF_Frame) diff --git a/src/xrGame/BastArtifact.cpp b/src/xrGame/BastArtifact.cpp index 0d09f54d42..dc80b28e09 100644 --- a/src/xrGame/BastArtifact.cpp +++ b/src/xrGame/BastArtifact.cpp @@ -3,10 +3,10 @@ // BastArtefact - артефакт мочалка /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "BastArtifact.h" #include "../xrPhysics/PhysicsShell.h" -#include "../xrPhysics/extendedgeom.h" +#include "../xrPhysics/ExtendedGeom.h" CBastArtefact::CBastArtefact(void) { diff --git a/src/xrGame/BastArtifact.h b/src/xrGame/BastArtifact.h index bb37463513..256735ea73 100644 --- a/src/xrGame/BastArtifact.h +++ b/src/xrGame/BastArtifact.h @@ -5,7 +5,7 @@ #pragma once #include "Artefact.h" -#include "../xrEngine/feel_touch.h" +#include "../xrEngine/Feel_Touch.h" #include "entity_alive.h" diff --git a/src/xrGame/BlackDrops.cpp b/src/xrGame/BlackDrops.cpp index ed979b63ea..da4deafbbd 100644 --- a/src/xrGame/BlackDrops.cpp +++ b/src/xrGame/BlackDrops.cpp @@ -3,7 +3,7 @@ // BlackDrops - черные капли /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "BlackDrops.h" #include "../xrPhysics/PhysicsShell.h" diff --git a/src/xrGame/BlackGraviArtifact.cpp b/src/xrGame/BlackGraviArtifact.cpp index 5e0245f522..547fc58f2d 100644 --- a/src/xrGame/BlackGraviArtifact.cpp +++ b/src/xrGame/BlackGraviArtifact.cpp @@ -4,14 +4,14 @@ // такой же как и обычный, но при получении хита /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "BlackGraviArtifact.h" #include "../xrPhysics/PhysicsShell.h" #include "entity_alive.h" -#include "phmovementcontrol.h" +#include "PHMovementControl.h" #include "xrMessages.h" -#include "physicsshellholder.h" -#include "explosive.h" +#include "PhysicsShellHolder.h" +#include "Explosive.h" #include "../xrPhysics/IPHWorld.h" #include "CharacterPhysicsSupport.h" //extern CPHWorld* ph_world; diff --git a/src/xrGame/BlackGraviArtifact.h b/src/xrGame/BlackGraviArtifact.h index c1bf00c452..60ca471a13 100644 --- a/src/xrGame/BlackGraviArtifact.h +++ b/src/xrGame/BlackGraviArtifact.h @@ -6,7 +6,7 @@ #pragma once #include "GraviArtifact.h" -#include "../xrEngine/feel_touch.h" +#include "../xrEngine/Feel_Touch.h" #include "PhysicsShellHolder.h" using GAME_OBJECT_LIST = xr_vector; diff --git a/src/xrGame/Bolt.cpp b/src/xrGame/Bolt.cpp index 66b1d70493..f81717b8bd 100644 --- a/src/xrGame/Bolt.cpp +++ b/src/xrGame/Bolt.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "bolt.h" +#include "StdAfx.h" +#include "Bolt.h" #include "../xrPhysics/PhysicsShell.h" #include "../xrEngine/xr_level_controller.h" diff --git a/src/xrGame/Bolt.h b/src/xrGame/Bolt.h index e68d674e4d..f9ae245f98 100644 --- a/src/xrGame/Bolt.h +++ b/src/xrGame/Bolt.h @@ -1,5 +1,5 @@ #pragma once -#include "missile.h" +#include "Missile.h" #include "../xrPhysics/DamageSource.h" class CBolt : public CMissile, diff --git a/src/xrGame/BoneProtections.cpp b/src/xrGame/BoneProtections.cpp index c302e89f8d..08f2120773 100644 --- a/src/xrGame/BoneProtections.cpp +++ b/src/xrGame/BoneProtections.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "BoneProtections.h" #include "../Include/xrRender/Kinematics.h" #include "../xrEngine/bone.h" diff --git a/src/xrGame/BottleItem.cpp b/src/xrGame/BottleItem.cpp index 6f19ccb5c7..5ae991873c 100644 --- a/src/xrGame/BottleItem.cpp +++ b/src/xrGame/BottleItem.cpp @@ -3,7 +3,7 @@ // BottleItem - бутылка с напитком, которую можно разбить /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "BottleItem.h" #include "xrMessages.h" #include "entity_alive.h" diff --git a/src/xrGame/BottleItem.h b/src/xrGame/BottleItem.h index b5688d028a..3d14338afb 100644 --- a/src/xrGame/BottleItem.h +++ b/src/xrGame/BottleItem.h @@ -6,7 +6,7 @@ #pragma once -#include "fooditem.h" +#include "FoodItem.h" class CBottleItem: public CFoodItem diff --git a/src/xrGame/BreakableObject.cpp b/src/xrGame/BreakableObject.cpp index c0eb711d62..644f91b70d 100644 --- a/src/xrGame/BreakableObject.cpp +++ b/src/xrGame/BreakableObject.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "BreakableObject.h" #include "xrServer_Objects_ALife.h" #include "../xrPhysics/IPHStaticGeomShell.h" diff --git a/src/xrGame/BreakableObject.h b/src/xrGame/BreakableObject.h index 5f80cd71f6..50d57fa298 100644 --- a/src/xrGame/BreakableObject.h +++ b/src/xrGame/BreakableObject.h @@ -7,7 +7,7 @@ #pragma once -#include "physicsshellholder.h" +#include "PhysicsShellHolder.h" #include "../xrPhysics/icollisiondamagereceiver.h" class IPHStaticGeomShell; diff --git a/src/xrGame/CameraEffector.cpp b/src/xrGame/CameraEffector.cpp index a27b824da7..9b13c1ca1b 100644 --- a/src/xrGame/CameraEffector.cpp +++ b/src/xrGame/CameraEffector.cpp @@ -1 +1 @@ -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/xrGame/CameraEffector.h b/src/xrGame/CameraEffector.h index 29bc429820..51656d00e1 100644 --- a/src/xrGame/CameraEffector.h +++ b/src/xrGame/CameraEffector.h @@ -1,8 +1,8 @@ #pragma once #include "../xrEngine/CameraManager.h" -#include "../xrEngine/effector.h" -#include "../xrEngine/effectorPP.h" +#include "../xrEngine/Effector.h" +#include "../xrEngine/EffectorPP.h" #define eStartEffectorID 50 diff --git a/src/xrGame/CameraFirstEye.cpp b/src/xrGame/CameraFirstEye.cpp index aeab898a03..b813a75a74 100644 --- a/src/xrGame/CameraFirstEye.cpp +++ b/src/xrGame/CameraFirstEye.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop #include "CameraFirstEye.h" diff --git a/src/xrGame/CaptureBoneCallback.h b/src/xrGame/CaptureBoneCallback.h index f325c9df20..1235284d22 100644 --- a/src/xrGame/CaptureBoneCallback.h +++ b/src/xrGame/CaptureBoneCallback.h @@ -1,7 +1,7 @@ #pragma once -#include "../xrPhysics/physicsshell.h" +#include "../xrPhysics/PhysicsShell.h" struct CPHCaptureBoneCallback : public NearestToPointCallback diff --git a/src/xrGame/Car.cpp b/src/xrGame/Car.cpp index 549dc7866a..fb7d60547b 100644 --- a/src/xrGame/Car.cpp +++ b/src/xrGame/Car.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "car.h" +#include "StdAfx.h" +#include "Car.h" #ifdef DEBUG # include "../xrEngine/StatGraph.h" @@ -10,7 +10,7 @@ #include "PHDestroyable.h" #include "cameralook.h" -#include "camerafirsteye.h" +#include "CameraFirstEye.h" #include "Actor.h" #include "ActorEffector.h" #include "math.h" diff --git a/src/xrGame/Car.h b/src/xrGame/Car.h index 9b750811dc..a8ee9a5dca 100644 --- a/src/xrGame/Car.h +++ b/src/xrGame/Car.h @@ -1,14 +1,14 @@ #pragma once #include "Entity.h" #include "../xrPhysics/PhysicsShell.h" -#include "../xrPhysics/phupdateobject.h" +#include "../xrPhysics/PHUpdateObject.h" #include "script_entity.h" #include "CarLights.h" #include "InventoryOwner.h" #include "holder_custom.h" #include "PHSkeleton.h" #include "DamagableItem.h" -#include "phcollisiondamagereceiver.h" +#include "PHCollisionDamageReceiver.h" #include "CarDamageParticles.h" #include "xrServer_Objects_ALife.h" #include "CarDamageParticles.h" diff --git a/src/xrGame/CarCameras.cpp b/src/xrGame/CarCameras.cpp index 8422035208..26bbeffe06 100644 --- a/src/xrGame/CarCameras.cpp +++ b/src/xrGame/CarCameras.cpp @@ -1,19 +1,19 @@ -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop #ifdef DEBUG #include "PHDebug.h" -#include "../xrPhysics/iphworld.h" +#include "../xrPhysics/IPHWorld.h" #endif #include "alife_space.h" #include "Hit.h" #include "PHDestroyable.h" -#include "car.h" +#include "Car.h" #include "Actor.h" #include "cameralook.h" -#include "camerafirsteye.h" +#include "CameraFirstEye.h" #include "Level.h" -#include "../xrEngine/cameramanager.h" +#include "../xrEngine/CameraManager.h" bool CCar::HUDView() const { diff --git a/src/xrGame/CarDamageParticles.cpp b/src/xrGame/CarDamageParticles.cpp index 799a2ba6dc..24aa73a88d 100644 --- a/src/xrGame/CarDamageParticles.cpp +++ b/src/xrGame/CarDamageParticles.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "cardamageparticles.h" +#include "StdAfx.h" +#include "CarDamageParticles.h" #ifdef DEBUG #include "PHDebug.h" diff --git a/src/xrGame/CarDoors.cpp b/src/xrGame/CarDoors.cpp index 7d323f8f10..d589099ce3 100644 --- a/src/xrGame/CarDoors.cpp +++ b/src/xrGame/CarDoors.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #ifdef DEBUG #include "PHDebug.h" #endif diff --git a/src/xrGame/CarExhaust.cpp b/src/xrGame/CarExhaust.cpp index d7c631d18c..007047b1ab 100644 --- a/src/xrGame/CarExhaust.cpp +++ b/src/xrGame/CarExhaust.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #ifdef DEBUG #include "PHDebug.h" @@ -6,7 +6,7 @@ #include "alife_space.h" #include "Hit.h" #include "PHDestroyable.h" -#include "car.h" +#include "Car.h" #include "../Include/xrRender/Kinematics.h" #include "../xrPhysics/IPHWorld.h" //#include "PHWorld.h" diff --git a/src/xrGame/CarInput.cpp b/src/xrGame/CarInput.cpp index ad6b6dc33a..bbc61387f9 100644 --- a/src/xrGame/CarInput.cpp +++ b/src/xrGame/CarInput.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop #ifdef DEBUG @@ -6,11 +6,11 @@ #endif #include "alife_space.h" #include "Hit.h" -#include "phdestroyable.h" -#include "car.h" +#include "PHDestroyable.h" +#include "Car.h" #include "Actor.h" #include "cameralook.h" -#include "camerafirsteye.h" +#include "CameraFirstEye.h" #include "script_entity_action.h" #include "../xrEngine/xr_level_controller.h" #include "../Include/xrRender/Kinematics.h" diff --git a/src/xrGame/CarLights.cpp b/src/xrGame/CarLights.cpp index cb17d31138..a506a4d1d7 100644 --- a/src/xrGame/CarLights.cpp +++ b/src/xrGame/CarLights.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "CarLights.h" #ifdef DEBUG diff --git a/src/xrGame/CarScript.cpp b/src/xrGame/CarScript.cpp index 5304ac3873..a56287ffdb 100644 --- a/src/xrGame/CarScript.cpp +++ b/src/xrGame/CarScript.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "alife_space.h" #include "Car.h" diff --git a/src/xrGame/CarSound.cpp b/src/xrGame/CarSound.cpp index 16ac2a6929..28e4d20090 100644 --- a/src/xrGame/CarSound.cpp +++ b/src/xrGame/CarSound.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" +#include "StdAfx.h" #ifdef DEBUG #include "PHDebug.h" #endif #include "alife_space.h" #include "Hit.h" #include "PHDestroyable.h" -#include "car.h" +#include "Car.h" #include "../Include/xrRender/Kinematics.h" //#include "PHWorld.h" //extern CPHWorld* ph_world; diff --git a/src/xrGame/CarWeapon.cpp b/src/xrGame/CarWeapon.cpp index f863dd8cd0..7df98d4d9b 100644 --- a/src/xrGame/CarWeapon.cpp +++ b/src/xrGame/CarWeapon.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "CarWeapon.h" #include "../xrPhysics/PhysicsShell.h" #include "PhysicsShellHolder.h" #include "../Include/xrRender/Kinematics.h" #include "object_broker.h" #include "../xrSound/ai_sounds.h" -#include "weaponAmmo.h" +#include "WeaponAmmo.h" #include "../xrEngine/xr_level_controller.h" #include "../xrEngine/bone.h" #include "game_object_space.h" diff --git a/src/xrGame/CarWheels.cpp b/src/xrGame/CarWheels.cpp index 1d96af05be..6f89247ace 100644 --- a/src/xrGame/CarWheels.cpp +++ b/src/xrGame/CarWheels.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #ifdef DEBUG #include "PHDebug.h" @@ -6,7 +6,7 @@ #include "alife_space.h" #include "Hit.h" #include "PHDestroyable.h" -#include "car.h" +#include "Car.h" #include "../Include/xrRender/Kinematics.h" #include "../xrPhysics/ExtendedGeom.h" diff --git a/src/xrGame/CharacterPhysicsSupport.cpp b/src/xrGame/CharacterPhysicsSupport.cpp index 6bd4de731d..18d3a6172b 100644 --- a/src/xrGame/CharacterPhysicsSupport.cpp +++ b/src/xrGame/CharacterPhysicsSupport.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "CharacterPhysicsSupport.h" #include "alife_space.h" @@ -14,9 +14,9 @@ #include "../xrPhysics/PhysicsShell.h" -#include "../xrPhysics/iActivationShape.h" +#include "../xrPhysics/IActivationShape.h" //#include "../xrPhysics/Extendedgeom.h" -#include "../xrPhysics/geometry.h" +#include "../xrPhysics/Geometry.h" //#include "../xrPhysics/phdynamicdata.h" #include "../xrPhysics/IPHCapture.h" //#include "../xrPhysics/ICollideValidator.h" @@ -34,9 +34,9 @@ #include "xrServer_Object_Base.h" #include "interactive_animation.h" #include "stalker_animation_manager.h" -#include "inventoryowner.h" +#include "InventoryOwner.h" #include "Inventory.h" -#include "activatingcharcollisiondelay.h" +#include "ActivatingCharCollisionDelay.h" #include "stalker_movement_manager_smart_cover.h" //const float default_hinge_friction = 5.f;//gray_wolf comment diff --git a/src/xrGame/CharacterPhysicsSupport.h b/src/xrGame/CharacterPhysicsSupport.h index 7ed5aaa409..5579d60f7f 100644 --- a/src/xrGame/CharacterPhysicsSupport.h +++ b/src/xrGame/CharacterPhysicsSupport.h @@ -4,9 +4,9 @@ #include "alife_space.h" #include "PHSkeleton.h" -#include "Entity_Alive.h" +#include "entity_alive.h" #include "PHSoundPlayer.h" -#include "Phdestroyable.h" +#include "PHDestroyable.h" #include "character_hit_animations.h" #include "death_anims.h" #include "character_shell_control.h" diff --git a/src/xrGame/ClimableObject.cpp b/src/xrGame/ClimableObject.cpp index e924d772b9..1eb6a08ae5 100644 --- a/src/xrGame/ClimableObject.cpp +++ b/src/xrGame/ClimableObject.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" -#include "climableobject.h " +#include "StdAfx.h" +#include "ClimableObject.h" #include "../xrPhysics/IPHStaticGeomShell.h" #include "xrServer_Objects_ALife.h" #include "../xrPhysics/PHCharacter.h" #include "../xrPhysics/MathUtils.h" -#include "../xrPhysics/extendedgeom.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrPhysics/ExtendedGeom.h" +#include "../xrEngine/GameMtlLib.h" #ifdef DEBUG_DRAW # include "debug_renderer.h" diff --git a/src/xrGame/ClimableObject.h b/src/xrGame/ClimableObject.h index 2d1fb3b4da..bd91c328b3 100644 --- a/src/xrGame/ClimableObject.h +++ b/src/xrGame/ClimableObject.h @@ -1,5 +1,5 @@ #pragma once -#include "physicsshellholder.h" +#include "PhysicsShellHolder.h" #include "../xrPhysics/iclimableobject.h" class IPHStaticGeomShell; class CPHCharacter; diff --git a/src/xrGame/Compass.cpp b/src/xrGame/Compass.cpp index 73f4653109..1c7b45a838 100644 --- a/src/xrGame/Compass.cpp +++ b/src/xrGame/Compass.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Compass.h" #include "../Include/xrRender/Kinematics.h" #include "player_hud.h" diff --git a/src/xrGame/ContextMenu.cpp b/src/xrGame/ContextMenu.cpp index 627e71cb20..5272302622 100644 --- a/src/xrGame/ContextMenu.cpp +++ b/src/xrGame/ContextMenu.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" -#include "contextmenu.h" -#include "../xrEngine/gamefont.h" +#include "StdAfx.h" +#include "ContextMenu.h" +#include "../xrEngine/GameFont.h" const float fade_speed = 8.0f; diff --git a/src/xrGame/CustomDetector.cpp b/src/xrGame/CustomDetector.cpp index d5b34f5b16..2987240802 100644 --- a/src/xrGame/CustomDetector.cpp +++ b/src/xrGame/CustomDetector.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "CustomDetector.h" #include "ui/ArtefactDetectorUI.h" #include "HUDManager.h" diff --git a/src/xrGame/CustomDetector.h b/src/xrGame/CustomDetector.h index 4814d78771..a5c5833aac 100644 --- a/src/xrGame/CustomDetector.h +++ b/src/xrGame/CustomDetector.h @@ -1,6 +1,6 @@ #pragma once #include "inventory_item_object.h" -#include "hudsound.h" +#include "HudSound.h" #include "CustomZone.h" #include "Artefact.h" #include "../xrSound/ai_sounds.h" diff --git a/src/xrGame/CustomDetectorZones.h b/src/xrGame/CustomDetectorZones.h index 0e39667799..445af2bde8 100644 --- a/src/xrGame/CustomDetectorZones.h +++ b/src/xrGame/CustomDetectorZones.h @@ -1,5 +1,5 @@ #pragma once -#include "../xrEngine/feel_touch.h" +#include "../xrEngine/Feel_Touch.h" #include "HudSound.h" #include "../xrParticles/stdafx.h" #include "../xrParticles/ParticlesObject.h" diff --git a/src/xrGame/CustomMonster.cpp b/src/xrGame/CustomMonster.cpp index 55427a844c..b2dda97982 100644 --- a/src/xrGame/CustomMonster.cpp +++ b/src/xrGame/CustomMonster.cpp @@ -2,14 +2,14 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "ai_debug.h" #include "CustomMonster.h" #include "ai_space.h" -#include "ai/monsters/BaseMonster/base_monster.h" +#include "ai/monsters/basemonster/base_monster.h" #include "xrServer_Objects_ALife_Monsters.h" -#include "xrserver.h" +#include "xrServer.h" #include "seniority_hierarchy_holder.h" #include "team_hierarchy_holder.h" #include "squad_hierarchy_holder.h" @@ -27,7 +27,7 @@ #include "level_graph.h" #include "game_graph.h" #include "movement_manager.h" -#include "entitycondition.h" +#include "EntityCondition.h" #include "sound_player.h" #include "Level.h" #include "level_debug.h" @@ -36,7 +36,7 @@ #include "mt_config.h" #include "PHMovementControl.h" #include "../xrEngine/date_time.h" -#include "characterphysicssupport.h" +#include "CharacterPhysicsSupport.h" #include "ai/monsters/snork/snork.h" #include "ai/monsters/burer/burer.h" #include "GamePersistent.h" diff --git a/src/xrGame/CustomMonster.h b/src/xrGame/CustomMonster.h index 63bd10ce8b..2902516c9e 100644 --- a/src/xrGame/CustomMonster.h +++ b/src/xrGame/CustomMonster.h @@ -6,9 +6,9 @@ #include "entity_alive.h" #include "script_entity.h" -#include "../xrEngine/feel_vision.h" -#include "../xrEngine/feel_sound.h" -#include "../xrEngine/feel_touch.h" +#include "../xrEngine/Feel_Vision.h" +#include "../xrEngine/Feel_Sound.h" +#include "../xrEngine/Feel_Touch.h" #include "../Include/xrRender/Kinematics.h" #include "../xrCore/associative_vector.h" #include "trajectories.h" @@ -343,4 +343,4 @@ class CCustomMonster : #endif // #ifdef DEBUG }; -#include "custommonster_inline.h" \ No newline at end of file +#include "CustomMonster_inline.h" diff --git a/src/xrGame/CustomMonster_VCPU.cpp b/src/xrGame/CustomMonster_VCPU.cpp index bceabf2134..0f4deb4a51 100644 --- a/src/xrGame/CustomMonster_VCPU.cpp +++ b/src/xrGame/CustomMonster_VCPU.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "custommonster.h" +#include "StdAfx.h" +#include "CustomMonster.h" #include "movement_manager.h" void CCustomMonster::mk_rotation (Fvector &dir, SRotation &R) diff --git a/src/xrGame/CustomOutfit.cpp b/src/xrGame/CustomOutfit.cpp index db6849ebe8..bde99c3332 100644 --- a/src/xrGame/CustomOutfit.cpp +++ b/src/xrGame/CustomOutfit.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" -#include "customoutfit.h" +#include "CustomOutfit.h" #include "../xrPhysics/PhysicsShell.h" #include "inventory_space.h" #include "Inventory.h" @@ -207,7 +207,7 @@ BOOL CCustomOutfit::BonePassBullet (int boneID) return m_boneProtection->getBonePassBullet(s16(boneID)); } -#include "torch.h" +#include "Torch.h" void CCustomOutfit::OnMoveToSlot (const SInvItemPlace& prev) { if ( m_pInventory ) diff --git a/src/xrGame/CustomRocket.cpp b/src/xrGame/CustomRocket.cpp index 8c5ddec941..dea5394360 100644 --- a/src/xrGame/CustomRocket.cpp +++ b/src/xrGame/CustomRocket.cpp @@ -3,18 +3,18 @@ // (умеет лететь, светиться и отыгрывать партиклы) ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" -#include "customrocket.h" +#include "StdAfx.h" +#include "CustomRocket.h" #include "../xrParticles/stdafx.h" #include "../xrParticles/ParticlesObject.h" #include "../xrPhysics/PhysicsShell.h" -#include "../xrPhysics/extendedgeom.h" -#include "../xrPhysics/calculatetriangle.h" -#include "../xrPhysics/tri-colliderknoopc/dctriangle.h" +#include "../xrPhysics/ExtendedGeom.h" +#include "../xrPhysics/CalculateTriangle.h" +#include "../xrPhysics/tri-colliderknoopc/dcTriangle.h" #include "Level.h" #include "xrMessages.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" //#include "tri-colliderknoopc/dTriList.h" #include "../Include/xrRender/RenderVisual.h" //#include "CalculateTriangle.h" diff --git a/src/xrGame/CustomZone.cpp b/src/xrGame/CustomZone.cpp index 51c0929c3f..c76d1ce7aa 100644 --- a/src/xrGame/CustomZone.cpp +++ b/src/xrGame/CustomZone.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "../xrEngine/xr_ioconsole.h" +#include "StdAfx.h" +#include "../xrEngine/XR_IOConsole.h" #include "CustomZone.h" #include "Hit.h" #include "PHDestroyable.h" @@ -8,13 +8,13 @@ #include "../xrEngine/LightAnimLibrary.h" #include "Level.h" #include "game_cl_base.h" -#include "../xrEngine/igame_persistent.h" -#include "../xrengine/xr_collide_form.h" +#include "../xrEngine/IGame_Persistent.h" +#include "../xrEngine/xr_collide_form.h" #include "Artefact.h" #include "ai_object_location.h" #include "../Include/xrRender/Kinematics.h" #include "zone_effector.h" -#include "breakableobject.h" +#include "BreakableObject.h" #include "GamePersistent.h" #define WIND_RADIUS (4*Radius()) //расстояние до актера, когда появляется ветер @@ -783,7 +783,7 @@ void CCustomZone::PlayHitParticles(CGameObject* pObject) } } } -#include "bolt.h" +#include "Bolt.h" void CCustomZone::PlayEntranceParticles(CGameObject* pObject) { m_entrance_sound.play_at_pos (0, pObject->Position()); diff --git a/src/xrGame/CustomZone.h b/src/xrGame/CustomZone.h index dd7f6560b9..148d513b93 100644 --- a/src/xrGame/CustomZone.h +++ b/src/xrGame/CustomZone.h @@ -1,7 +1,7 @@ #pragma once #include "space_restrictor.h" -#include "../xrEngine/feel_touch.h" +#include "../xrEngine/Feel_Touch.h" class CActor; class CLAItem; diff --git a/src/xrGame/DBG_Car.cpp b/src/xrGame/DBG_Car.cpp index 452458d6a2..d90dd87fff 100644 --- a/src/xrGame/DBG_Car.cpp +++ b/src/xrGame/DBG_Car.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #ifdef DEBUG #include "PHDebug.h" #include "alife_space.h" diff --git a/src/xrGame/DamagableItem.cpp b/src/xrGame/DamagableItem.cpp index d47383cd78..171a357592 100644 --- a/src/xrGame/DamagableItem.cpp +++ b/src/xrGame/DamagableItem.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "DamagableItem.h" CDamagableItem::CDamagableItem() diff --git a/src/xrGame/DelayedActionFuse.cpp b/src/xrGame/DelayedActionFuse.cpp index 8f2f816bb7..fbc212d158 100644 --- a/src/xrGame/DelayedActionFuse.cpp +++ b/src/xrGame/DelayedActionFuse.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "DelayedActionFuse.h" CDelayedActionFuse::CDelayedActionFuse() diff --git a/src/xrGame/DemoInfo.cpp b/src/xrGame/DemoInfo.cpp index 4465c80a55..bc37b65969 100644 --- a/src/xrGame/DemoInfo.cpp +++ b/src/xrGame/DemoInfo.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_sv_mp.h" #include "game_cl_mp.h" #include "Level.h" diff --git a/src/xrGame/DemoInfo_Loader.cpp b/src/xrGame/DemoInfo_Loader.cpp index 3400f0f5ab..82e4becb88 100644 --- a/src/xrGame/DemoInfo_Loader.cpp +++ b/src/xrGame/DemoInfo_Loader.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "DemoInfo_Loader.h" #include "../xrCore/stream_reader.h" #include "Level.h" diff --git a/src/xrGame/DemoPLay_Control.cpp b/src/xrGame/DemoPLay_Control.cpp index b778e64566..68891e8bf5 100644 --- a/src/xrGame/DemoPLay_Control.cpp +++ b/src/xrGame/DemoPLay_Control.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "DemoPlay_Control.h" #include "Level.h" #include "game_cl_base.h" diff --git a/src/xrGame/DestroyablePhysicsObject.cpp b/src/xrGame/DestroyablePhysicsObject.cpp index f125091d02..a172cb8bb6 100644 --- a/src/xrGame/DestroyablePhysicsObject.cpp +++ b/src/xrGame/DestroyablePhysicsObject.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "PHCollisionDamageReceiver.h" #include "PhysicObject.h" diff --git a/src/xrGame/DummyArtifact.cpp b/src/xrGame/DummyArtifact.cpp index 2cd5437edc..2ea9b982f0 100644 --- a/src/xrGame/DummyArtifact.cpp +++ b/src/xrGame/DummyArtifact.cpp @@ -3,7 +3,7 @@ // DummyArtefact - артефакт пустышка /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "DummyArtifact.h" #include "../xrPhysics/PhysicsShell.h" diff --git a/src/xrGame/DynamicHeightMap.cpp b/src/xrGame/DynamicHeightMap.cpp index 16a7a67bba..0bec4d53fc 100644 --- a/src/xrGame/DynamicHeightMap.cpp +++ b/src/xrGame/DynamicHeightMap.cpp @@ -2,7 +2,7 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "DynamicHeightMap.h" #include "../xrEngine/cl_intersect.h" diff --git a/src/xrGame/EditorLevel.cpp b/src/xrGame/EditorLevel.cpp index c04b023181..02d4685efe 100644 --- a/src/xrGame/EditorLevel.cpp +++ b/src/xrGame/EditorLevel.cpp @@ -2,15 +2,15 @@ #include "EditorLevel.h" #include "../xrPhysics/IPHWorld.h" -#include "phcommander.h" +#include "PHCommander.h" #include "physics_game.h" #include "game_cl_base.h" #include "NET_Queue.h" #include "file_transfer.h" -#include "hudmanager.h" +#include "HUDManager.h" #include "Level_Bullet_Manager.h" #include "UIGameCustom.h" -#include "../xrEngine/xr_ioconsole.h" +#include "../xrEngine/XR_IOConsole.h" #include "xrServer_Objects_ALife_Monsters.h" CLevelEditor::CLevelEditor() diff --git a/src/xrGame/EffectorBobbing.cpp b/src/xrGame/EffectorBobbing.cpp index 8c02d7a12e..7e21234ac7 100644 --- a/src/xrGame/EffectorBobbing.cpp +++ b/src/xrGame/EffectorBobbing.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "EffectorBobbing.h" diff --git a/src/xrGame/EffectorBobbing.h b/src/xrGame/EffectorBobbing.h index 7569e7dee7..5b005421c8 100644 --- a/src/xrGame/EffectorBobbing.h +++ b/src/xrGame/EffectorBobbing.h @@ -3,7 +3,7 @@ #pragma once #include "CameraEffector.h" -#include "../xrEngine/cameramanager.h" +#include "../xrEngine/CameraManager.h" class CEffectorBobbing : public CEffectorCam { diff --git a/src/xrGame/EffectorFall.cpp b/src/xrGame/EffectorFall.cpp index f80162dde5..0dda5be1e1 100644 --- a/src/xrGame/EffectorFall.cpp +++ b/src/xrGame/EffectorFall.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "EffectorFall.h" #include "CameraEffector.h" #include "GamePersistent.h" diff --git a/src/xrGame/EffectorShot.cpp b/src/xrGame/EffectorShot.cpp index ef8ef2a042..242e0eef5c 100644 --- a/src/xrGame/EffectorShot.cpp +++ b/src/xrGame/EffectorShot.cpp @@ -2,7 +2,7 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "EffectorShot.h" #include "Weapon.h" diff --git a/src/xrGame/EffectorShot.h b/src/xrGame/EffectorShot.h index 005b578e46..6a04777460 100644 --- a/src/xrGame/EffectorShot.h +++ b/src/xrGame/EffectorShot.h @@ -5,7 +5,7 @@ #pragma once #include "CameraEffector.h" -#include "../xrEngine/cameramanager.h" +#include "../xrEngine/CameraManager.h" #include "Actor.h" #include "CameraRecoil.h" diff --git a/src/xrGame/EffectorShotX.cpp b/src/xrGame/EffectorShotX.cpp index 4a37ca6832..aef7ab0453 100644 --- a/src/xrGame/EffectorShotX.cpp +++ b/src/xrGame/EffectorShotX.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "EffectorShotX.h" #include "../xrEngine/CameraBase.h" diff --git a/src/xrGame/EffectorZoomInertion.cpp b/src/xrGame/EffectorZoomInertion.cpp index 3dfcbad658..0ea010b995 100644 --- a/src/xrGame/EffectorZoomInertion.cpp +++ b/src/xrGame/EffectorZoomInertion.cpp @@ -2,7 +2,7 @@ // приближения ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "EffectorZoomInertion.h" diff --git a/src/xrGame/EffectorZoomInertion.h b/src/xrGame/EffectorZoomInertion.h index 8e651e09fd..1ee06e24a3 100644 --- a/src/xrGame/EffectorZoomInertion.h +++ b/src/xrGame/EffectorZoomInertion.h @@ -1,7 +1,7 @@ #pragma once #include "CameraEffector.h" -#include "../xrEngine/cameramanager.h" +#include "../xrEngine/CameraManager.h" #include "WeaponMagazined.h" class CEffectorZoomInertion : public CEffectorCam diff --git a/src/xrGame/ElectricBall.cpp b/src/xrGame/ElectricBall.cpp index a8457f8cde..23aa5053d2 100644 --- a/src/xrGame/ElectricBall.cpp +++ b/src/xrGame/ElectricBall.cpp @@ -3,7 +3,7 @@ // ElectricBall - артефакт электрический шар /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ElectricBall.h" #include "../xrPhysics/PhysicsShell.h" diff --git a/src/xrGame/EliteDetector.cpp b/src/xrGame/EliteDetector.cpp index 1822a483b0..7e5c591fba 100644 --- a/src/xrGame/EliteDetector.cpp +++ b/src/xrGame/EliteDetector.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "EliteDetector.h" #include "player_hud.h" #include "../Include/xrRender/UIRender.h" #include "../../xrUI/UIXmlInit.h" #include "../../xrUI/xrUIXmlParser.h" #include "../../xrUI/Widgets/UIStatic.h" -#include "UI/ArtefactDetectorUI.h" +#include "ui/ArtefactDetectorUI.h" CEliteDetector::CEliteDetector() { diff --git a/src/xrGame/Entity.cpp b/src/xrGame/Entity.cpp index b2f695d248..f00e188366 100644 --- a/src/xrGame/Entity.cpp +++ b/src/xrGame/Entity.cpp @@ -2,11 +2,11 @@ ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "Entity.h" #include "Actor.h" #include "xrServer_Objects_ALife_Monsters.h" -#include "entity.h" +#include "Entity.h" #include "Level.h" #include "seniority_hierarchy_holder.h" #include "team_hierarchy_holder.h" diff --git a/src/xrGame/Entity.h b/src/xrGame/Entity.h index e87ac806e8..d35939d22e 100644 --- a/src/xrGame/Entity.h +++ b/src/xrGame/Entity.h @@ -1,9 +1,9 @@ #pragma once -#include "physicsshellholder.h" +#include "PhysicsShellHolder.h" #include "damage_manager.h" -#include "entitycondition.h" +#include "EntityCondition.h" // refs class ENGINE_API CCameraBase; class ENGINE_API C3DSound; diff --git a/src/xrGame/EntityCondition.cpp b/src/xrGame/EntityCondition.cpp index 137d7c5971..5125c5fc27 100644 --- a/src/xrGame/EntityCondition.cpp +++ b/src/xrGame/EntityCondition.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" -#include "entitycondition.h" -#include "inventoryowner.h" -#include "customoutfit.h" +#include "StdAfx.h" +#include "EntityCondition.h" +#include "InventoryOwner.h" +#include "CustomOutfit.h" #include "Inventory.h" -#include "wound.h" +#include "Wound.h" #include "Level.h" #include "game_cl_base.h" #include "entity_alive.h" diff --git a/src/xrGame/ExoOutfit.cpp b/src/xrGame/ExoOutfit.cpp index 27db00d77d..a9c90b9dfc 100644 --- a/src/xrGame/ExoOutfit.cpp +++ b/src/xrGame/ExoOutfit.cpp @@ -5,8 +5,8 @@ #pragma once -#include "stdafx.h" -#include "exooutfit.h" +#include "StdAfx.h" +#include "ExoOutfit.h" CExoOutfit::CExoOutfit() { diff --git a/src/xrGame/ExoOutfit.h b/src/xrGame/ExoOutfit.h index fac680d511..5ce11d7325 100644 --- a/src/xrGame/ExoOutfit.h +++ b/src/xrGame/ExoOutfit.h @@ -6,7 +6,7 @@ #pragma once -#include "customoutfit.h" +#include "CustomOutfit.h" class CExoOutfit: public CCustomOutfit { diff --git a/src/xrGame/Explosive.cpp b/src/xrGame/Explosive.cpp index f893ea3934..50383e5ad0 100644 --- a/src/xrGame/Explosive.cpp +++ b/src/xrGame/Explosive.cpp @@ -2,12 +2,12 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" -#include "explosive.h" +#include "Explosive.h" #include "../xrPhysics/PhysicsShell.h" -#include "entity.h" +#include "Entity.h" #include "../xrParticles/stdafx.h" #include "../xrParticles/ParticlesObject.h" @@ -15,11 +15,11 @@ #include "Weapon.h" #include "Actor.h" -#include "actoreffector.h" +#include "ActorEffector.h" #include "Level.h" -#include "level_bullet_manager.h" +#include "Level_Bullet_Manager.h" #include "xrMessages.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" #ifdef DEBUG # include "../xrEngine/StatGraph.h" @@ -27,8 +27,8 @@ #endif #include "../xrPhysics/MathUtils.h" -#include "../xrPhysics/iActivationShape.h" -#include "../xrPhysics/iphworld.h" +#include "../xrPhysics/IActivationShape.h" +#include "../xrPhysics/IPHWorld.h" #include "game_base_space.h" #include "../Include/xrRender/Kinematics.h" diff --git a/src/xrGame/Explosive.h b/src/xrGame/Explosive.h index 773ab1f56c..dbaff5b443 100644 --- a/src/xrGame/Explosive.h +++ b/src/xrGame/Explosive.h @@ -5,13 +5,13 @@ #pragma once #include "../xrEngine/Render.h" -#include "../xrEngine/feel_touch.h" +#include "../xrEngine/Feel_Touch.h" #include "inventory_item.h" #include "../xrSound/ai_sounds.h" #include "../xrScripts/script_export_space.h" #include "../xrPhysics/DamageSource.h" #include "wallmark_manager.h" -#include "hudsound.h" +#include "HudSound.h" #include "../xrParticles/stdafx.h" #include "../xrParticles/ParticlesObject.h" diff --git a/src/xrGame/ExplosiveItem.cpp b/src/xrGame/ExplosiveItem.cpp index 69e1096240..ae874d9646 100644 --- a/src/xrGame/ExplosiveItem.cpp +++ b/src/xrGame/ExplosiveItem.cpp @@ -4,7 +4,7 @@ // балоны с газом и т.д.) ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ExplosiveItem.h" diff --git a/src/xrGame/ExplosiveRocket.cpp b/src/xrGame/ExplosiveRocket.cpp index 5134af6a81..711d9d9227 100644 --- a/src/xrGame/ExplosiveRocket.cpp +++ b/src/xrGame/ExplosiveRocket.cpp @@ -3,11 +3,11 @@ // взрывается при столкновении ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "../Include/xrRender/Kinematics.h" #include "ExplosiveRocket.h" -#include "physicsshellholder.h" -#include "../xrPhysics/physicsshell.h" +#include "PhysicsShellHolder.h" +#include "../xrPhysics/PhysicsShell.h" CExplosiveRocket::CExplosiveRocket() diff --git a/src/xrGame/ExplosiveScript.cpp b/src/xrGame/ExplosiveScript.cpp index e92982ee0f..12b7bd279f 100644 --- a/src/xrGame/ExplosiveScript.cpp +++ b/src/xrGame/ExplosiveScript.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "Explosive.h" diff --git a/src/xrGame/F1.cpp b/src/xrGame/F1.cpp index 31c9aaebab..b219ea4fe3 100644 --- a/src/xrGame/F1.cpp +++ b/src/xrGame/F1.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "f1.h" +#include "F1.h" #include "WeaponAmmo.h" -#include "Medkit.h" -#include "Antirad.h" +#include "medkit.h" +#include "antirad.h" #include "FoodItem.h" #include "BottleItem.h" #include "ExplosiveItem.h" diff --git a/src/xrGame/F1.h b/src/xrGame/F1.h index 27099af3af..27a565ec92 100644 --- a/src/xrGame/F1.h +++ b/src/xrGame/F1.h @@ -1,6 +1,6 @@ #pragma once -#include "grenade.h" +#include "Grenade.h" #include "../xrScripts/script_export_space.h" class CF1 : diff --git a/src/xrGame/FRbmkAgentManagerPlanner.cpp b/src/xrGame/FRbmkAgentManagerPlanner.cpp index b351dfb9f3..febb05b179 100644 --- a/src/xrGame/FRbmkAgentManagerPlanner.cpp +++ b/src/xrGame/FRbmkAgentManagerPlanner.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "FRbmkAgentManagerPlanner.h" diff --git a/src/xrGame/FadedBall.cpp b/src/xrGame/FadedBall.cpp index 4a5f7283d1..6d1b6ac150 100644 --- a/src/xrGame/FadedBall.cpp +++ b/src/xrGame/FadedBall.cpp @@ -3,7 +3,7 @@ // FadedBall - артефакт блеклый шар /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "FadedBall.h" #include "../xrPhysics/PhysicsShell.h" diff --git a/src/xrGame/FoodItem.cpp b/src/xrGame/FoodItem.cpp index 04c1f44d12..51ca86ad66 100644 --- a/src/xrGame/FoodItem.cpp +++ b/src/xrGame/FoodItem.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "FoodItem.h" CFoodItem::CFoodItem() diff --git a/src/xrGame/FryupZone.cpp b/src/xrGame/FryupZone.cpp index d9b138cfc1..ef5757bb74 100644 --- a/src/xrGame/FryupZone.cpp +++ b/src/xrGame/FryupZone.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "FryupZone.h" CFryupZone::CFryupZone() diff --git a/src/xrGame/GalantineArtifact.cpp b/src/xrGame/GalantineArtifact.cpp index bfa550e095..d2c863a857 100644 --- a/src/xrGame/GalantineArtifact.cpp +++ b/src/xrGame/GalantineArtifact.cpp @@ -3,7 +3,7 @@ // GalantineArtefact - артефакт ведбмин студень /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "GalantineArtifact.h" diff --git a/src/xrGame/GameFactoryPtr.cpp b/src/xrGame/GameFactoryPtr.cpp index 82abfb65cd..07c1c502e1 100644 --- a/src/xrGame/GameFactoryPtr.cpp +++ b/src/xrGame/GameFactoryPtr.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "../Include/xrRender/FactoryPtr.h" diff --git a/src/xrGame/GameObject.cpp b/src/xrGame/GameObject.cpp index 02eba774ec..469532251d 100644 --- a/src/xrGame/GameObject.cpp +++ b/src/xrGame/GameObject.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "GameObject.h" #include "../Include/xrRender/RenderVisual.h" #include "../xrPhysics/PhysicsShell.h" #include "ai_space.h" #include "CustomMonster.h" -#include "physicobject.h" +#include "PhysicObject.h" #include "HangingLamp.h" #include "../xrPhysics/PhysicsShell.h" #include "game_sv_single.h" @@ -708,7 +708,7 @@ void CGameObject::u_EventSend(NET_Packet& P, u32 dwFlags ) Level().Send(P, dwFlags); } -#include "bolt.h" +#include "Bolt.h" void CGameObject::OnH_B_Chield() { inherited::OnH_B_Chield(); diff --git a/src/xrGame/GamePersistent.cpp b/src/xrGame/GamePersistent.cpp index 883b4032fc..23353067e6 100644 --- a/src/xrGame/GamePersistent.cpp +++ b/src/xrGame/GamePersistent.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "gamepersistent.h" -#include "../xrEngine/fmesh.h" -#include "../xrEngine/xr_ioconsole.h" -#include "../xrEngine/gamemtllib.h" +#include "GamePersistent.h" +#include "../xrEngine/Fmesh.h" +#include "../xrEngine/XR_IOConsole.h" +#include "../xrEngine/GameMtlLib.h" #include "../Include/xrRender/Kinematics.h" #include "MainMenu.h" #include "../../xrUI/UICursor.h" @@ -15,7 +15,7 @@ #include "ActorEffector.h" #include "Actor.h" -#include "spectator.h" +#include "Spectator.h" #include "../../xrUI/UItextureMaster.h" @@ -26,7 +26,7 @@ #include "game_cl_base.h" #include "xrServer_Objects_ALife_Monsters.h" #include "../xrServerEntities/xrServer_Object_Base.h" -#include "UI/UIGameTutorial.h" +#include "ui/UIGameTutorial.h" #include "../xrEngine/Application.h" #include "ui/UILoadingScreen.h" @@ -931,7 +931,7 @@ void CGamePersistent::UpdateDof() (m_dof[0].z < m_dof[2].z) ? clamp(m_dof[1].z, m_dof[0].z, m_dof[2].z) : clamp(m_dof[1].z, m_dof[2].z, m_dof[0].z); } -#include "ui\uimainingamewnd.h" +#include "ui/UIMainIngameWnd.h" void CGamePersistent::OnSectorChanged(int sector) { if(CurrentGameUI()) diff --git a/src/xrGame/GameTask.cpp b/src/xrGame/GameTask.cpp index 915410cdda..1e6cc23f40 100644 --- a/src/xrGame/GameTask.cpp +++ b/src/xrGame/GameTask.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "GameTask.h" #include "../../xrUI/xrUIXmlParser.h" diff --git a/src/xrGame/GameTask_script.cpp b/src/xrGame/GameTask_script.cpp index aee316c1b1..f9573ed8dd 100644 --- a/src/xrGame/GameTask_script.cpp +++ b/src/xrGame/GameTask_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "GameTask.h" diff --git a/src/xrGame/GametaskManager.cpp b/src/xrGame/GametaskManager.cpp index 063b8051d4..ea6c14a80e 100644 --- a/src/xrGame/GametaskManager.cpp +++ b/src/xrGame/GametaskManager.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "GameTaskManager.h" +#include "GametaskManager.h" #include "alife_registry_wrappers.h" #include "../../xrUI/xrUIXmlParser.h" #include "GameTask.h" @@ -9,7 +9,7 @@ #include "map_location.h" #include "Actor.h" #include "UIGameSP.h" -#include "ui/UIPDAWnd.h" +#include "ui/UIPdaWnd.h" #include "encyclopedia_article.h" #include "ui/UIMapWnd.h" diff --git a/src/xrGame/GlobalFeelTouch.cpp b/src/xrGame/GlobalFeelTouch.cpp index 710579b990..51ca34931a 100644 --- a/src/xrGame/GlobalFeelTouch.cpp +++ b/src/xrGame/GlobalFeelTouch.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "GlobalFeelTouch.hpp" #include diff --git a/src/xrGame/GraviArtifact.cpp b/src/xrGame/GraviArtifact.cpp index 2eebb8c6a6..64f408b046 100644 --- a/src/xrGame/GraviArtifact.cpp +++ b/src/xrGame/GraviArtifact.cpp @@ -4,7 +4,7 @@ // и неустойчиво парит над землей /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "GraviArtifact.h" #include "../xrPhysics/PhysicsShell.h" #include "Level.h" diff --git a/src/xrGame/GraviZone.cpp b/src/xrGame/GraviZone.cpp index f5d7d2b18b..fb7996cb27 100644 --- a/src/xrGame/GraviZone.cpp +++ b/src/xrGame/GraviZone.cpp @@ -1,10 +1,10 @@ -#include "stdafx.h" +#include "StdAfx.h" -#include "gravizone.h" +#include "GraviZone.h" #include "../xrPhysics/PhysicsShell.h" #include "entity_alive.h" -#include "phmovementcontrol.h" +#include "PHMovementControl.h" #include "xrMessages.h" #include "PhysicsShellHolder.h" #include "Level.h" diff --git a/src/xrGame/Grenade.cpp b/src/xrGame/Grenade.cpp index 7c6e675b1c..be3f657abd 100644 --- a/src/xrGame/Grenade.cpp +++ b/src/xrGame/Grenade.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" -#include "grenade.h" +#include "StdAfx.h" +#include "Grenade.h" #include "../xrPhysics/PhysicsShell.h" //.#include "WeaponHUD.h" -#include "entity.h" +#include "Entity.h" #include "Actor.h" #include "Inventory.h" #include "Level.h" diff --git a/src/xrGame/Grenade.h b/src/xrGame/Grenade.h index 356a5a0340..f6aa87595f 100644 --- a/src/xrGame/Grenade.h +++ b/src/xrGame/Grenade.h @@ -1,7 +1,7 @@ #pragma once -#include "missile.h" -#include "explosive.h" -#include "../xrEngine/feel_touch.h" +#include "Missile.h" +#include "Explosive.h" +#include "../xrEngine/Feel_Touch.h" class CGrenade : public CMissile, diff --git a/src/xrGame/GrenadeLauncher.cpp b/src/xrGame/GrenadeLauncher.cpp index c84bef51e7..e882d71a2a 100644 --- a/src/xrGame/GrenadeLauncher.cpp +++ b/src/xrGame/GrenadeLauncher.cpp @@ -3,9 +3,9 @@ // GrenadeLauncher - апгрейд оружия поствольный гранатомет /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" -#include "grenadelauncher.h" +#include "GrenadeLauncher.h" //#include "PhysicsShell.h" CGrenadeLauncher::CGrenadeLauncher() diff --git a/src/xrGame/HUDCrosshair.cpp b/src/xrGame/HUDCrosshair.cpp index 7c52c59c61..1eb357e3dc 100644 --- a/src/xrGame/HUDCrosshair.cpp +++ b/src/xrGame/HUDCrosshair.cpp @@ -2,7 +2,7 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "HUDCrosshair.h" //.#include "UIStaticItem.h" diff --git a/src/xrGame/HUDManager.cpp b/src/xrGame/HUDManager.cpp index 96084e229a..d5783d1937 100644 --- a/src/xrGame/HUDManager.cpp +++ b/src/xrGame/HUDManager.cpp @@ -1,20 +1,20 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "HUDManager.h" -#include "hudtarget.h" +#include "HUDTarget.h" #include "Actor.h" -#include "../xrEngine/igame_level.h" +#include "../xrEngine/IGame_Level.h" #include "../xrEngine/xr_input.h" #include "GamePersistent.h" #include "MainMenu.h" -#include "grenade.h" -#include "spectator.h" +#include "Grenade.h" +#include "Spectator.h" #include "Car.h" #include "UIGameCustom.h" #include "../../xrUI/UICursor.h" #include "../xrEngine/string_table.h" #include "game_cl_base.h" #ifdef DEBUG -#include "phdebug.h" +#include "PHDebug.h" #endif #include "../../xrUI/UIFontDefines.h" @@ -215,7 +215,7 @@ void CHUDManager::SetGrenadeMarkType( LPCSTR tex_name ) // ------------------------------------------------------------------------------------ -#include "ui/UIMainInGameWnd.h" +#include "ui/UIMainIngameWnd.h" extern CUIXml* pWpnScopeXml; void CHUDManager::Load() diff --git a/src/xrGame/HUDTarget.cpp b/src/xrGame/HUDTarget.cpp index d5f212072a..894d2fb37a 100644 --- a/src/xrGame/HUDTarget.cpp +++ b/src/xrGame/HUDTarget.cpp @@ -1,13 +1,13 @@ -#include "stdafx.h" -#include "hudtarget.h" -#include "../xrEngine/gamemtllib.h" +#include "StdAfx.h" +#include "HUDTarget.h" +#include "../xrEngine/GameMtlLib.h" #include "../xrEngine/Environment.h" #include "../xrEngine/CustomHUD.h" #include "Entity.h" #include "Level.h" #include "game_cl_base.h" -#include "../xrEngine/igame_persistent.h" +#include "../xrEngine/IGame_Persistent.h" #include "../../xrUI/ui_base.h" #include "InventoryOwner.h" diff --git a/src/xrGame/HUDTarget.h b/src/xrGame/HUDTarget.h index fcdcb1d83e..d90a9ff1da 100644 --- a/src/xrGame/HUDTarget.h +++ b/src/xrGame/HUDTarget.h @@ -1,7 +1,7 @@ #pragma once #include "HUDCrosshair.h" -#include "../xrcdb/xr_collide_defs.h" +#include "../xrCDB/xr_collide_defs.h" class CHUDManager; diff --git a/src/xrGame/HairsZone.cpp b/src/xrGame/HairsZone.cpp index 171da286bb..2e7d53bcba 100644 --- a/src/xrGame/HairsZone.cpp +++ b/src/xrGame/HairsZone.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "HairsZone.h" #include "Level.h" @@ -6,7 +6,7 @@ #include "entity_alive.h" #include "PHMovementControl.h" #include "CharacterPhysicsSupport.h" -#include "../xrengine/xr_collide_form.h" +#include "../xrEngine/xr_collide_form.h" bool CHairsZone::BlowoutState() { bool result = inherited::BlowoutState(); diff --git a/src/xrGame/HairsZone_script.cpp b/src/xrGame/HairsZone_script.cpp index 2dd1d4de28..b812e5b630 100644 --- a/src/xrGame/HairsZone_script.cpp +++ b/src/xrGame/HairsZone_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "HairsZone.h" diff --git a/src/xrGame/HangingLamp.cpp b/src/xrGame/HangingLamp.cpp index 2816f276a3..ba735eac39 100644 --- a/src/xrGame/HangingLamp.cpp +++ b/src/xrGame/HangingLamp.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "HangingLamp.h" #include "../xrEngine/LightAnimLibrary.h" diff --git a/src/xrGame/HangingLamp.h b/src/xrGame/HangingLamp.h index 4b4e8c10da..851a7bfedd 100644 --- a/src/xrGame/HangingLamp.h +++ b/src/xrGame/HangingLamp.h @@ -6,8 +6,8 @@ #define HangingLampH #pragma once -#include "gameobject.h" -#include "physicsshellholder.h" +#include "GameObject.h" +#include "PhysicsShellHolder.h" #include "PHSkeleton.h" #include "../xrScripts/script_export_space.h" // refs diff --git a/src/xrGame/Helicopter.cpp b/src/xrGame/Helicopter.cpp index 582d971d88..7cc00060d6 100644 --- a/src/xrGame/Helicopter.cpp +++ b/src/xrGame/Helicopter.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "helicopter.h" #include "xrServer_Objects_ALife.h" diff --git a/src/xrGame/Helicopter2.cpp b/src/xrGame/Helicopter2.cpp index de2346f433..f3c200c17f 100644 --- a/src/xrGame/Helicopter2.cpp +++ b/src/xrGame/Helicopter2.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "helicopter.h" #include "script_game_object.h" @@ -260,7 +260,7 @@ void CHelicopter::PHHit(SHit &H) #include "team_hierarchy_holder.h" #include "squad_hierarchy_holder.h" -#include "../xrPhysics/extendedgeom.h" +#include "../xrPhysics/ExtendedGeom.h" void CollisionCallbackDead(bool& do_colide,bool bo1,dContact& c,SGameMtl* material_1,SGameMtl* material_2) { do_colide=true; diff --git a/src/xrGame/HelicopterMovementManager.cpp b/src/xrGame/HelicopterMovementManager.cpp index c4cd81eee3..a68f442cf5 100644 --- a/src/xrGame/HelicopterMovementManager.cpp +++ b/src/xrGame/HelicopterMovementManager.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "Helicopter.h" +#include "helicopter.h" #include "Level.h" #include "patrol_path.h" #include "patrol_path_storage.h" diff --git a/src/xrGame/HelicopterWeapon.cpp b/src/xrGame/HelicopterWeapon.cpp index 3af109aac7..a91746249d 100644 --- a/src/xrGame/HelicopterWeapon.cpp +++ b/src/xrGame/HelicopterWeapon.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "helicopter.h" #include "ExplosiveRocket.h" #include "xrMessages.h" diff --git a/src/xrGame/Hit.cpp b/src/xrGame/Hit.cpp index 49410e7e2f..128a8d9f7e 100644 --- a/src/xrGame/Hit.cpp +++ b/src/xrGame/Hit.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "alife_space.h" #include "Hit.h" //#include "ode_include.h" #include "../xrEngine/bone.h" #include "xrMessages.h" #include "Level.h" -#include "../xrPhysics/mathutils.h" +#include "../xrPhysics/MathUtils.h" SHit::SHit(float powerA, Fvector &dirA, CObject *whoA, u16 elementA, Fvector p_in_bone_spaceA,\ float impulseA, ALife::EHitType hit_typeA, float armor_piercingA, bool AimBullet) { diff --git a/src/xrGame/HitMarker.cpp b/src/xrGame/HitMarker.cpp index 2b0b7b3c29..19cc664a54 100644 --- a/src/xrGame/HitMarker.cpp +++ b/src/xrGame/HitMarker.cpp @@ -1,11 +1,11 @@ // exxZERO Time Stamp AddIn. Document modified at : Thursday, March 07, 2002 14:12:50 , by user : Oles , from computer : OLES -#include "stdafx.h" +#include "StdAfx.h" #include "HitMarker.h" -#include "../xrEngine/render.h" +#include "../xrEngine/Render.h" #include "../xrEngine/LightAnimLibrary.h" #include "../../xrUI/Widgets/UIStaticItem.h" -#include "grenade.h" +#include "Grenade.h" #include "../Include/xrRender/UIRender.h" #include "../Include/xrRender/UIShader.h" diff --git a/src/xrGame/HudItem.cpp b/src/xrGame/HudItem.cpp index 2de5c56f32..e149965c02 100644 --- a/src/xrGame/HudItem.cpp +++ b/src/xrGame/HudItem.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "script_game_object.h" #include "HudItem.h" #include "physic_item.h" #include "Actor.h" -#include "actoreffector.h" +#include "ActorEffector.h" #include "Missile.h" #include "xrMessages.h" #include "Level.h" diff --git a/src/xrGame/HudItem.h b/src/xrGame/HudItem.h index 034026903a..fea942af4b 100644 --- a/src/xrGame/HudItem.h +++ b/src/xrGame/HudItem.h @@ -8,7 +8,7 @@ class CMotionDef; #include "actor_defs.h" #include "inventory_space.h" -#include "hudsound.h" +#include "HudSound.h" #include "InertionData.h" struct attachable_hud_item; diff --git a/src/xrGame/HudSound.cpp b/src/xrGame/HudSound.cpp index d64c82fd96..5067fbd560 100644 --- a/src/xrGame/HudSound.cpp +++ b/src/xrGame/HudSound.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "HudSound.h" diff --git a/src/xrGame/IKFoot.cpp b/src/xrGame/IKFoot.cpp index 2d368ee458..7fc4fdc3c9 100644 --- a/src/xrGame/IKFoot.cpp +++ b/src/xrGame/IKFoot.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" -#include "ikfoot.h" +#include "IKFoot.h" #include "ik_collide_data.h" #include "GameObject.h" @@ -8,9 +8,9 @@ //#include "ode_include.h" #include "../xrPhysics/MathUtils.h" -#include "../include/xrrender/Kinematics.h" +#include "../Include/xrRender/Kinematics.h" #include "../xrEngine/bone.h" -#include "../xrEngine/ennumerateVertices.h" +#include "../xrEngine/EnnumerateVertices.h" #ifdef DEBUG diff --git a/src/xrGame/IKLimbsController.cpp b/src/xrGame/IKLimbsController.cpp index a4ad2f880f..bce66beef5 100644 --- a/src/xrGame/IKLimbsController.cpp +++ b/src/xrGame/IKLimbsController.cpp @@ -1,16 +1,16 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "IKLimbsController.h" -#include "IK/IKLimb.h" -#include "physicsshellholder.h" +#include "ik/IKLimb.h" +#include "PhysicsShellHolder.h" #include "ik_anim_state.h" -#include "../xrPhysics/mathutils.h" +#include "../xrPhysics/MathUtils.h" #include "../Include/xrRender/RenderVisual.h" #include "../Include/xrRender/Kinematics.h" //#include "ode_include.h" -#include "characterphysicssupport.h" +#include "CharacterPhysicsSupport.h" #include "../xrEngine/motion.h" #ifdef DEBUG # include "PHDebug.h" diff --git a/src/xrGame/IKLimbsController.h b/src/xrGame/IKLimbsController.h index 5d030ca053..75475c0c11 100644 --- a/src/xrGame/IKLimbsController.h +++ b/src/xrGame/IKLimbsController.h @@ -1,7 +1,7 @@ #pragma once -#include "IK/IKLimb.h" +#include "ik/IKLimb.h" #include "pose_extrapolation.h" #include "ik_object_shift.h" class IKinematicsAnimated; diff --git a/src/xrGame/InfoDocument.cpp b/src/xrGame/InfoDocument.cpp index dc19f577c4..fedf90f036 100644 --- a/src/xrGame/InfoDocument.cpp +++ b/src/xrGame/InfoDocument.cpp @@ -2,11 +2,11 @@ // InfoDocument.cpp // InfoDocument - документ, содержащий сюжетную информацию /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "InfoDocument.h" #include "../xrPhysics/PhysicsShell.h" #include "PDA.h" -#include "inventoryowner.h" +#include "InventoryOwner.h" #include "xrServer_Objects_ALife_Items.h" CInfoDocument::CInfoDocument(void) diff --git a/src/xrGame/InfoPortion.cpp b/src/xrGame/InfoPortion.cpp index 912612d1c9..c33dfd3f2a 100644 --- a/src/xrGame/InfoPortion.cpp +++ b/src/xrGame/InfoPortion.cpp @@ -1,12 +1,12 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "xml_str_id_loader.h" #include "object_broker.h" /* #include "InfoPortion.h" -#include "gameobject.h" +#include "GameObject.h" #include "encyclopedia_article.h" -#include "gametask.h" +#include "GameTask.h" #include "ai_space.h" #include "alife_simulator.h" #include "alife_story_registry.h" diff --git a/src/xrGame/Inventory.cpp b/src/xrGame/Inventory.cpp index c3b1c47a11..5389e30d0d 100644 --- a/src/xrGame/Inventory.cpp +++ b/src/xrGame/Inventory.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "Inventory.h" #include "Actor.h" @@ -15,13 +15,13 @@ #include "../xrEngine/xr_level_controller.h" #include "Level.h" #include "ai_space.h" -#include "entitycondition.h" +#include "EntityCondition.h" #include "game_base_space.h" -#include "uigamecustom.h" +#include "UIGameCustom.h" #include "clsid_game.h" #include "player_hud.h" #include "ai/stalker/ai_stalker.h" -#include "weaponmagazined.h" +#include "WeaponMagazined.h" #include "Car.h" using namespace InventoryUtilities; diff --git a/src/xrGame/InventoryBox.cpp b/src/xrGame/InventoryBox.cpp index bffcf6ea27..a334a4cb42 100644 --- a/src/xrGame/InventoryBox.cpp +++ b/src/xrGame/InventoryBox.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "InventoryBox.h" #include "Level.h" @@ -7,7 +7,7 @@ #include "script_game_object.h" #include "ui/UIActorMenu.h" -#include "uigamecustom.h" +#include "UIGameCustom.h" #include "inventory_item.h" CInventoryBox::CInventoryBox() @@ -92,7 +92,7 @@ void CInventoryBox::net_Destroy() { inherited::net_Destroy (); } -#include "../xrServerEntities/xrServer_Objects_Alife.h" +#include "../xrServerEntities/xrServer_Objects_ALife.h" BOOL CInventoryBox::net_Spawn(CSE_Abstract* DC) { inherited::net_Spawn (DC); diff --git a/src/xrGame/InventoryOwner.cpp b/src/xrGame/InventoryOwner.cpp index cc547c82f6..a5edef83d4 100644 --- a/src/xrGame/InventoryOwner.cpp +++ b/src/xrGame/InventoryOwner.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "InventoryOwner.h" #include "entity_alive.h" -#include "pda.h" +#include "PDA.h" #include "Actor.h" #include "trade.h" #include "Inventory.h" @@ -14,13 +14,13 @@ #include "Level.h" #include "game_base_space.h" #include "PhraseDialog.h" -#include "xrserver.h" +#include "xrServer.h" #include "xrServer_Objects_ALife_Monsters.h" #include "alife_registry_wrappers.h" #include "relation_registry.h" #include "ai_object_location.h" #include "game_object_space.h" -#include "AI/Monsters/BaseMonster/base_monster.h" +#include "ai/monsters/basemonster/base_monster.h" #include "trade_parameters.h" #include "purchase_list.h" #include "alife_object_registry.h" diff --git a/src/xrGame/Level.cpp b/src/xrGame/Level.cpp index afa7621c2a..5bb11b98f1 100644 --- a/src/xrGame/Level.cpp +++ b/src/xrGame/Level.cpp @@ -1,15 +1,15 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "../xrEngine/fdemorecord.h" -#include "../xrEngine/fdemoplay.h" -#include "../xrEngine/environment.h" -#include "../xrEngine/igame_persistent.h" +#include "../xrEngine/FDemoRecord.h" +#include "../xrEngine/FDemoPlay.h" +#include "../xrEngine/Environment.h" +#include "../xrEngine/IGame_Persistent.h" #include "../xrParticles/stdafx.h" #include "../xrParticles/ParticlesObject.h" #include "Level.h" #include "HUDManager.h" #include "xrServer.h" -#include "net_queue.h" +#include "NET_Queue.h" #include "game_cl_base.h" #include "entity_alive.h" #include "ai_space.h" @@ -17,13 +17,13 @@ //#include "PHdynamicdata.h" //#include "Physics.h" #include "ShootingObject.h" -#include "GameTaskManager.h" +#include "GametaskManager.h" #include "Level_Bullet_Manager.h" #include "../xrScripts/script_process.h" #include "../xrScripts/script_engine.h" #include "../xrScripts/script_engine_space.h" #include "team_base_zone.h" -#include "infoportion.h" +#include "InfoPortion.h" #include "patrol_path_storage.h" #include "../xrEngine/date_time.h" #include "space_restriction_manager.h" @@ -34,25 +34,25 @@ #include "ClimableObject.h" #include "level_graph.h" #include "mt_config.h" -#include "phcommander.h" +#include "PHCommander.h" #include "map_manager.h" #include "../xrEngine/CameraManager.h" #include "level_sounds.h" -#include "car.h" +#include "Car.h" #include "trade_parameters.h" #include "game_cl_base_weapon_usage_statistic.h" #include "MainMenu.h" #include "../xrEngine/XR_IOConsole.h" #include "Actor.h" #include "player_hud.h" -#include "UI/UIGameTutorial.h" +#include "ui/UIGameTutorial.h" #include "file_transfer.h" -#include "message_filter.h" -#include "demoplay_control.h" -#include "demoinfo.h" +#include "Message_Filter.h" +#include "DemoPlay_Control.h" +#include "DemoInfo.h" #include "CustomDetector.h" -#include "../xrPhysics/iphworld.h" +#include "../xrPhysics/IPHWorld.h" #include "../xrPhysics/console_vars.h" #ifdef DEBUG_DRAW # include "level_debug.h" diff --git a/src/xrGame/Level.h b/src/xrGame/Level.h index d221eecc22..9e221d5643 100644 --- a/src/xrGame/Level.h +++ b/src/xrGame/Level.h @@ -1,13 +1,13 @@ #pragma once -#include "../xrEngine/igame_level.h" +#include "../xrEngine/IGame_Level.h" #include "../xrEngine/IGame_Persistent.h" -#include "../xrNetServer/net_client.h" +#include "../xrNetServer/NET_Client.h" #include "../xrScripts/script_export_space.h" #include "../xrEngine/StatGraph.h" #include "xrMessages.h" #include "alife_space.h" -#include "../xrcore/xrDebug.h" +#include "../xrCore/xrDebug.h" #include "xrServer.h" #include "GlobalFeelTouch.hpp" diff --git a/src/xrGame/LevelFogOfWar.cpp b/src/xrGame/LevelFogOfWar.cpp index 8f17463828..d12b144fbf 100644 --- a/src/xrGame/LevelFogOfWar.cpp +++ b/src/xrGame/LevelFogOfWar.cpp @@ -2,9 +2,9 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "LevelFogOfWar.h" -#include "level.h" +#include "Level.h" #include "alife_registry_wrappers.h" #include "ui/UIMap.h" #include "game_base_space.h" diff --git a/src/xrGame/Level_Bullet_Manager.cpp b/src/xrGame/Level_Bullet_Manager.cpp index bff90adf4e..b38e02a650 100644 --- a/src/xrGame/Level_Bullet_Manager.cpp +++ b/src/xrGame/Level_Bullet_Manager.cpp @@ -2,12 +2,12 @@ // все пули и осколки передаются сюда ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "Level.h" #include "Level_Bullet_Manager.h" #include "game_cl_base.h" #include "Actor.h" -#include "gamepersistent.h" +#include "GamePersistent.h" #include "mt_config.h" #include "game_cl_base_weapon_usage_statistic.h" #include "game_cl_mp.h" diff --git a/src/xrGame/Level_Bullet_Manager.h b/src/xrGame/Level_Bullet_Manager.h index a3a89cb9c7..cada99dd41 100644 --- a/src/xrGame/Level_Bullet_Manager.h +++ b/src/xrGame/Level_Bullet_Manager.h @@ -5,8 +5,8 @@ #pragma once -#include "weaponammo.h" -#include "tracer.h" +#include "WeaponAmmo.h" +#include "Tracer.h" //коэфициенты и параметры патрона struct SBullet_Hit diff --git a/src/xrGame/Level_GameSpy_Funcs.cpp b/src/xrGame/Level_GameSpy_Funcs.cpp index 48a924e3be..64317d4357 100644 --- a/src/xrGame/Level_GameSpy_Funcs.cpp +++ b/src/xrGame/Level_GameSpy_Funcs.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Level.h" #include "xrMessages.h" #include "../xrEngine/x_ray.h" -#include "GameSpy/GameSpy_GCD_Client.h" +#include "gamespy/GameSpy_GCD_Client.h" -#include "../xrEngine/igame_persistent.h" +#include "../xrEngine/IGame_Persistent.h" void CLevel::OnGameSpyChallenge (NET_Packet* P) { #ifndef MASTER_GOLD diff --git a/src/xrGame/Level_SLS_Default.cpp b/src/xrGame/Level_SLS_Default.cpp index 6a6398474a..6660f72354 100644 --- a/src/xrGame/Level_SLS_Default.cpp +++ b/src/xrGame/Level_SLS_Default.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Level.h" -#include "xrserver.h" +#include "xrServer.h" void CLevel::SLS_Default () // Default/Editor Load { diff --git a/src/xrGame/Level_SLS_Load.cpp b/src/xrGame/Level_SLS_Load.cpp index e563d9415f..ad261cf2f7 100644 --- a/src/xrGame/Level_SLS_Load.cpp +++ b/src/xrGame/Level_SLS_Load.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Level.h" void CLevel::net_Load (LPCSTR name) // Game Load diff --git a/src/xrGame/Level_SLS_Save.cpp b/src/xrGame/Level_SLS_Save.cpp index d028d3103f..596e5b5827 100644 --- a/src/xrGame/Level_SLS_Save.cpp +++ b/src/xrGame/Level_SLS_Save.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "../xrEngine/xrLevel.h" #include "Level.h" -#include "xrserver.h" +#include "xrServer.h" void CLevel::net_Save (LPCSTR name) // Game Save { diff --git a/src/xrGame/Level_bullet_manager_firetrace.cpp b/src/xrGame/Level_bullet_manager_firetrace.cpp index b22e697e4d..78244e3e33 100644 --- a/src/xrGame/Level_bullet_manager_firetrace.cpp +++ b/src/xrGame/Level_bullet_manager_firetrace.cpp @@ -3,21 +3,21 @@ // (для просчета столкновений и их визуализации) ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "Level_Bullet_Manager.h" -#include "entity.h" -#include "../xrEngine/gamemtllib.h" +#include "Entity.h" +#include "../xrEngine/GameMtlLib.h" #include "Level.h" -#include "gamepersistent.h" +#include "GamePersistent.h" #include "game_cl_base.h" #include "xrMessages.h" #include "../Include/xrRender/Kinematics.h" #include "Actor.h" -#include "AI/Stalker/ai_stalker.h" +#include "ai/stalker/ai_stalker.h" #include "character_info.h" #include "game_cl_base_weapon_usage_statistic.h" -#include "../xrcdb/xr_collide_defs.h" -#include "../xrengine/xr_collide_form.h" +#include "../xrCDB/xr_collide_defs.h" +#include "../xrEngine/xr_collide_form.h" #include "Weapon.h" #include "ik/math3d.h" #include "Actor.h" diff --git a/src/xrGame/Level_input.cpp b/src/xrGame/Level_input.cpp index 333b08356f..7da83c0119 100644 --- a/src/xrGame/Level_input.cpp +++ b/src/xrGame/Level_input.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" -#include "../xrEngine/xr_ioconsole.h" +#include "StdAfx.h" +#include "../xrEngine/XR_IOConsole.h" #include "entity_alive.h" #include "game_sv_single.h" #include "alife_simulator.h" #include "alife_simulator_header.h" #include "level_graph.h" -#include "../xrEngine/fdemorecord.h" +#include "../xrEngine/FDemoRecord.h" #include "Level.h" #include "../xrEngine/xr_level_controller.h" #include "game_cl_base.h" @@ -15,7 +15,7 @@ #include "autosave_manager.h" #include "Actor.h" -#include "huditem.h" +#include "HudItem.h" #include "UIGameCustom.h" #include "../../xrUI/Widgets/UIDialogWnd.h" #include "../xrEngine/xr_input.h" diff --git a/src/xrGame/Level_load.cpp b/src/xrGame/Level_load.cpp index 44cdf59f2d..50a342f9dc 100644 --- a/src/xrGame/Level_load.cpp +++ b/src/xrGame/Level_load.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "LevelGameDef.h" #include "ai_space.h" #include "../xrScripts/script_process.h" @@ -7,7 +7,7 @@ #include "Level.h" #include "game_cl_base.h" #include "../xrEngine/x_ray.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" #include "../xrPhysics/PhysicsCommon.h" #include "level_sounds.h" #include "GamePersistent.h" diff --git a/src/xrGame/Level_network.cpp b/src/xrGame/Level_network.cpp index 9c5e065031..ac6b9621f7 100644 --- a/src/xrGame/Level_network.cpp +++ b/src/xrGame/Level_network.cpp @@ -1,12 +1,12 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "Level.h" #include "Level_Bullet_Manager.h" -#include "xrserver.h" +#include "xrServer.h" #include "xrMessages.h" #include "game_cl_base.h" #include "PHCommander.h" -#include "net_queue.h" +#include "NET_Queue.h" #include "MainMenu.h" #include "space_restriction_manager.h" #include "ai_space.h" @@ -17,11 +17,11 @@ #include "UIGameCustom.h" #include "../xrEngine/string_table.h" #include "file_transfer.h" -#include "UI/UIGameTutorial.h" +#include "ui/UIGameTutorial.h" #include "ui/UIPdaWnd.h" #include "../xrNetServer/NET_AuthCheck.h" -#include "../xrPhysics/physicscommon.h" +#include "../xrPhysics/PhysicsCommon.h" ENGINE_API bool g_dedicated_server; const int max_objects_size = 2*1024; diff --git a/src/xrGame/Level_network_Demo.cpp b/src/xrGame/Level_network_Demo.cpp index 4cee6a8742..d25d031574 100644 --- a/src/xrGame/Level_network_Demo.cpp +++ b/src/xrGame/Level_network_Demo.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Level.h" #include "UIGameDM.h" #include "xrServer.h" #include "game_sv_mp.h" -#include "spectator.h" +#include "Spectator.h" #include "Actor.h" #include "game_cl_base.h" #include "game_cl_mp.h" diff --git a/src/xrGame/Level_network_compressed_updates.cpp b/src/xrGame/Level_network_compressed_updates.cpp index af9e992aab..9f5d67abe6 100644 --- a/src/xrGame/Level_network_compressed_updates.cpp +++ b/src/xrGame/Level_network_compressed_updates.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Level.h" #include "../xrCore/ppmd_compressor.h" -#include "../xrPhysics/iphworld.h" +#include "../xrPhysics/IPHWorld.h" #include "xrServer_updates_compressor.h" void CLevel::ProcessCompressedUpdate(NET_Packet& P, u8 const compress_type) diff --git a/src/xrGame/Level_network_digest_computer.cpp b/src/xrGame/Level_network_digest_computer.cpp index eecece6a80..98515d70e0 100644 --- a/src/xrGame/Level_network_digest_computer.cpp +++ b/src/xrGame/Level_network_digest_computer.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Level.h" #include "../xrGameSpy/gamespy/md5.h" diff --git a/src/xrGame/Level_network_map_sync.cpp b/src/xrGame/Level_network_map_sync.cpp index 46c0354062..fba591574f 100644 --- a/src/xrGame/Level_network_map_sync.cpp +++ b/src/xrGame/Level_network_map_sync.cpp @@ -1,10 +1,10 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Level.h" #include "xrServerMapSync.h" #include "../xrCore/stream_reader.h" #include "MainMenu.h" #include "../xrEngine/string_table.h" -#include "../xrEngine/xr_ioconsole.h" +#include "../xrEngine/XR_IOConsole.h" static const u32 r_buffer_size = 131072; //128 Kb void CLevel::CalculateLevelCrc32() diff --git a/src/xrGame/Level_network_messages.cpp b/src/xrGame/Level_network_messages.cpp index c688f7c246..1153d8e067 100644 --- a/src/xrGame/Level_network_messages.cpp +++ b/src/xrGame/Level_network_messages.cpp @@ -1,10 +1,10 @@ -#include "stdafx.h" -#include "entity.h" +#include "StdAfx.h" +#include "Entity.h" #include "xrserver_objects.h" #include "Level.h" #include "xrMessages.h" #include "game_cl_base.h" -#include "net_queue.h" +#include "NET_Queue.h" //#include "Physics.h" #include "xrServer.h" #include "Actor.h" @@ -14,8 +14,8 @@ #include "saved_game_wrapper.h" #include "level_graph.h" #include "file_transfer.h" -#include "message_filter.h" -#include "../xrPhysics/iphworld.h" +#include "Message_Filter.h" +#include "../xrPhysics/IPHWorld.h" extern LPCSTR map_ver_string; LPSTR remove_version_option(LPCSTR opt_str, LPSTR new_opt_str, u32 new_opt_str_size) diff --git a/src/xrGame/Level_network_spawn.cpp b/src/xrGame/Level_network_spawn.cpp index 15c627bd9b..d373cbe453 100644 --- a/src/xrGame/Level_network_spawn.cpp +++ b/src/xrGame/Level_network_spawn.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "xrServer_Objects_ALife_All.h" #include "Level.h" #include "game_cl_base.h" -#include "net_queue.h" +#include "NET_Queue.h" #include "ai_space.h" #include "game_level_cross_table.h" #include "level_graph.h" diff --git a/src/xrGame/Level_network_start_client.cpp b/src/xrGame/Level_network_start_client.cpp index 06c1fe2430..e313867d0a 100644 --- a/src/xrGame/Level_network_start_client.cpp +++ b/src/xrGame/Level_network_start_client.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" //#include "PHdynamicdata.h" //#include "Physics.h" #include "Level.h" #include "../xrEngine/x_ray.h" -#include "../xrEngine/igame_persistent.h" +#include "../xrEngine/IGame_Persistent.h" #include "ai_space.h" #include "game_cl_base.h" @@ -11,10 +11,10 @@ #include "file_transfer.h" #include "HUDManager.h" -#include "../xrPhysics/iphworld.h" +#include "../xrPhysics/IPHWorld.h" -#include "phcommander.h" +#include "PHCommander.h" #include "physics_game.h" extern pureFrame* g_pNetProcessor; diff --git a/src/xrGame/Level_secure_messaging.cpp b/src/xrGame/Level_secure_messaging.cpp index 578cc3adb6..91f3b7d163 100644 --- a/src/xrGame/Level_secure_messaging.cpp +++ b/src/xrGame/Level_secure_messaging.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Level.h" #include "NET_Queue.h" diff --git a/src/xrGame/Level_start.cpp b/src/xrGame/Level_start.cpp index f68ba3df93..b0ec1a679e 100644 --- a/src/xrGame/Level_start.cpp +++ b/src/xrGame/Level_start.cpp @@ -1,14 +1,14 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Level.h" #include "Level_Bullet_Manager.h" -#include "xrserver.h" +#include "xrServer.h" #include "game_cl_base.h" #include "xrMessages.h" #include "xrGameSpyServer.h" #include "../xrEngine/x_ray.h" #include "../xrEngine/device.h" #include "../xrEngine/IGame_Persistent.h" -#include "../xrEngine/xr_ioconsole.h" +#include "../xrEngine/XR_IOConsole.h" #include "MainMenu.h" #include "../xrEngine/string_table.h" #include "UIGameCustom.h" diff --git a/src/xrGame/MPPlayersBag.cpp b/src/xrGame/MPPlayersBag.cpp index 84ee86977d..73412fd287 100644 --- a/src/xrGame/MPPlayersBag.cpp +++ b/src/xrGame/MPPlayersBag.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "MPPlayersBag.h" #include "Level.h" diff --git a/src/xrGame/MainMenu.cpp b/src/xrGame/MainMenu.cpp index b6c5ae1d08..faf3dc79ef 100644 --- a/src/xrGame/MainMenu.cpp +++ b/src/xrGame/MainMenu.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "MainMenu.h" #include "../../xrUI/Widgets/UIDialogWnd.h" #include "ui/UIMessageBoxEx.h" -#include "../xrEngine/xr_IOConsole.h" +#include "../xrEngine/XR_IOConsole.h" #include "../xrEngine/IGame_Level.h" #include "../xrEngine/CameraManager.h" -#include "../xrEngine/xr_Level_controller.h" +#include "../xrEngine/xr_level_controller.h" #include "../../xrUI/UITextureMaster.h" #include "../../xrUI/UIXmlInit.h" #include "../../xrUI/Widgets/UIBtnHint.h" diff --git a/src/xrGame/MercuryBall.cpp b/src/xrGame/MercuryBall.cpp index 0a18260dd7..d66ca436f6 100644 --- a/src/xrGame/MercuryBall.cpp +++ b/src/xrGame/MercuryBall.cpp @@ -4,7 +4,7 @@ // перекатывается с места на место /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "MercuryBall.h" #include "../xrPhysics/PhysicsShell.h" diff --git a/src/xrGame/MercuryBall.h b/src/xrGame/MercuryBall.h index 03a8dbe613..c22663d48d 100644 --- a/src/xrGame/MercuryBall.h +++ b/src/xrGame/MercuryBall.h @@ -32,7 +32,7 @@ class CMercuryBall : public CArtefact /* #pragma once -#include "gameobject.h" +#include "GameObject.h" #include "PhysicsShell.h" /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/xrGame/Message_Filter.cpp b/src/xrGame/Message_Filter.cpp index be7cb2fa95..b03b237c07 100644 --- a/src/xrGame/Message_Filter.cpp +++ b/src/xrGame/Message_Filter.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Message_Filter.h" #include "NET_Queue.h" diff --git a/src/xrGame/MilitaryOutfit.cpp b/src/xrGame/MilitaryOutfit.cpp index 264917bb07..1a1a92d82b 100644 --- a/src/xrGame/MilitaryOutfit.cpp +++ b/src/xrGame/MilitaryOutfit.cpp @@ -5,7 +5,7 @@ #pragma once -#include "stdafx.h" +#include "StdAfx.h" #include "MilitaryOutfit.h" CMilitaryOutfit::CMilitaryOutfit() diff --git a/src/xrGame/MilitaryOutfit.h b/src/xrGame/MilitaryOutfit.h index 1f0ebe784e..ea38968009 100644 --- a/src/xrGame/MilitaryOutfit.h +++ b/src/xrGame/MilitaryOutfit.h @@ -6,7 +6,7 @@ #pragma once -#include "customoutfit.h" +#include "CustomOutfit.h" class CMilitaryOutfit: public CCustomOutfit { diff --git a/src/xrGame/Mincer.cpp b/src/xrGame/Mincer.cpp index 17b8c8568f..62a46aa69d 100644 --- a/src/xrGame/Mincer.cpp +++ b/src/xrGame/Mincer.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "alife_space.h" #include "Hit.h" #include "PHDestroyable.h" -#include "mincer.h" +#include "Mincer.h" #include "xrMessages.h" #include "Level.h" #include "CustomZone.h" diff --git a/src/xrGame/Mincer.h b/src/xrGame/Mincer.h index 2a342a7296..0950333647 100644 --- a/src/xrGame/Mincer.h +++ b/src/xrGame/Mincer.h @@ -8,8 +8,8 @@ ///////////////////////////////////////////////////// #pragma once -#include "gravizone.h" -#include "telewhirlwind.h" +#include "GraviZone.h" +#include "TeleWhirlwind.h" #include "PhysicsShellHolder.h" #include "../xrScripts/script_export_space.h" #include "PHDestroyable.h" diff --git a/src/xrGame/Missile.cpp b/src/xrGame/Missile.cpp index b6d7c81ff5..8e67086237 100644 --- a/src/xrGame/Missile.cpp +++ b/src/xrGame/Missile.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "missile.h" +#include "StdAfx.h" +#include "Missile.h" //.#include "WeaponHUD.h" #include "../xrPhysics/PhysicsShell.h" #include "Actor.h" @@ -11,7 +11,7 @@ #include "ai_object_location.h" #include "../xrPhysics/ExtendedGeom.h" #include "../xrPhysics/MathUtils.h" -#include "characterphysicssupport.h" +#include "CharacterPhysicsSupport.h" #include "Inventory.h" #include "../xrEngine/IGame_Persistent.h" #ifdef DEBUG @@ -22,7 +22,7 @@ #include "../../xrUI/Widgets/UIProgressShape.h" #include "../../xrUI/UIXmlInit.h" -#include "physicsshellholder.h" +#include "PhysicsShellHolder.h" CUIProgressShape* g_MissileForceShape = nullptr; diff --git a/src/xrGame/MosquitoBald.cpp b/src/xrGame/MosquitoBald.cpp index 12d5aabc94..d557f3cb4f 100644 --- a/src/xrGame/MosquitoBald.cpp +++ b/src/xrGame/MosquitoBald.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" -#include "mosquitobald.h" +#include "StdAfx.h" +#include "MosquitoBald.h" #include "Level.h" -#include "physicsshellholder.h" -#include "../xrengine/xr_collide_form.h" +#include "PhysicsShellHolder.h" +#include "../xrEngine/xr_collide_form.h" CMosquitoBald::CMosquitoBald(void) { diff --git a/src/xrGame/MosquitoBald_script.cpp b/src/xrGame/MosquitoBald_script.cpp index 0288255b81..0d4d594d0e 100644 --- a/src/xrGame/MosquitoBald_script.cpp +++ b/src/xrGame/MosquitoBald_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "MosquitoBald.h" #include "ZoneCampfire.h" diff --git a/src/xrGame/Needles.cpp b/src/xrGame/Needles.cpp index 7ce763c279..0d6fde7e0a 100644 --- a/src/xrGame/Needles.cpp +++ b/src/xrGame/Needles.cpp @@ -8,7 +8,7 @@ // BlackDrops - черные капли /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "Needles.h" #include "../xrPhysics/PhysicsShell.h" diff --git a/src/xrGame/NoGravityZone.cpp b/src/xrGame/NoGravityZone.cpp index a2c2502c2a..eff65239a9 100644 --- a/src/xrGame/NoGravityZone.cpp +++ b/src/xrGame/NoGravityZone.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" -#include "nogravityzone.h" -#include "../xrPhysics/physicsshell.h" +#include "StdAfx.h" +#include "NoGravityZone.h" +#include "../xrPhysics/PhysicsShell.h" #include "entity_alive.h" #include "PHMovementControl.h" //#include "PhWorld.h" diff --git a/src/xrGame/PDA.cpp b/src/xrGame/PDA.cpp index bced955cc3..676114e2d8 100644 --- a/src/xrGame/PDA.cpp +++ b/src/xrGame/PDA.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "pda.h" +#include "PDA.h" #include "../xrPhysics/PhysicsShell.h" #include "Entity.h" #include "Actor.h" -#include "xrserver.h" +#include "xrServer.h" #include "xrServer_Objects_ALife_Items.h" #include "Level.h" diff --git a/src/xrGame/PDA.h b/src/xrGame/PDA.h index ae772bcc01..0412fb27ed 100644 --- a/src/xrGame/PDA.h +++ b/src/xrGame/PDA.h @@ -1,6 +1,6 @@ #pragma once -#include "../xrEngine/feel_touch.h" +#include "../xrEngine/Feel_Touch.h" #include "inventory_item_object.h" #include "InfoPortionDefs.h" diff --git a/src/xrGame/PHCollisionDamageReceiver.cpp b/src/xrGame/PHCollisionDamageReceiver.cpp index e287e1af61..be0c378abc 100644 --- a/src/xrGame/PHCollisionDamageReceiver.cpp +++ b/src/xrGame/PHCollisionDamageReceiver.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" -#include "phcollisiondamagereceiver.h" +#include "StdAfx.h" +#include "PHCollisionDamageReceiver.h" #include "../xrPhysics/IPhysicsShellHolder.h" -#include "../xrcore/xr_ini.h" +#include "../xrCore/xr_ini.h" #include "../Include/xrRender/Kinematics.h" -#include "../xrPhysics/geometry.h" +#include "../xrPhysics/Geometry.h" #include "../xrPhysics/PhysicsShell.h" //#include "../xrEngine/gamemtllib.h" //#include "Physics.h" diff --git a/src/xrGame/PHCommander.cpp b/src/xrGame/PHCommander.cpp index 4f3bf9c427..180f0470d2 100644 --- a/src/xrGame/PHCommander.cpp +++ b/src/xrGame/PHCommander.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "PHCommander.h" -#include "phsimplecalls.h" +#include "PHSimpleCalls.h" #ifdef DEBUG -#include "../xrphysics/IPHWorld.h" +#include "../xrPhysics/IPHWorld.h" #endif CPHCall::CPHCall(CPHCondition* condition,CPHAction* action) diff --git a/src/xrGame/PHDebug.cpp b/src/xrGame/PHDebug.cpp index a96033fe0f..25dcaf1962 100644 --- a/src/xrGame/PHDebug.cpp +++ b/src/xrGame/PHDebug.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #ifdef DEBUG_DRAW #include "PHDebug.h" @@ -143,19 +143,19 @@ void _cdecl DBG_OutText(LPCSTR s, ...) #include "../xrPhysics/MathUtils.h" //#include "PHObject.h" #include "../xrPhysics/ExtendedGeom.h" -#include "../xrPhysics/iphworld.h" -#include "../xrPhysics/physicsshell.h" +#include "../xrPhysics/IPHWorld.h" +#include "../xrPhysics/PhysicsShell.h" #include "Level.h" #include "debug_renderer.h" -#include "physicsshellholder.h" +#include "PhysicsShellHolder.h" #include "../Include/xrRender/Kinematics.h" #include "../Include/xrRender/KinematicsAnimated.h" #include "../xrEngine/bone.h" -#include "../xrEngine/iphdebug.h" +#include "../xrEngine/IPHdebug.h" //#include "phelement.h" Flags32 ph_dbg_draw_mask ; diff --git a/src/xrGame/PHDestroyable.cpp b/src/xrGame/PHDestroyable.cpp index 489cac4cd7..11845b8585 100644 --- a/src/xrGame/PHDestroyable.cpp +++ b/src/xrGame/PHDestroyable.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "alife_space.h" #include "Hit.h" -#include "phdestroyable.h" -#include "physicsshellholder.h" +#include "PHDestroyable.h" +#include "PhysicsShellHolder.h" #include "xrMessages.h" #include "object_factory.h" #include "xrServer_Objects_ALife.h" diff --git a/src/xrGame/PHDestroyableNotificate.cpp b/src/xrGame/PHDestroyableNotificate.cpp index 9d959a86a4..58bc09c953 100644 --- a/src/xrGame/PHDestroyableNotificate.cpp +++ b/src/xrGame/PHDestroyableNotificate.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "PHDestroyableNotificate.h" #include "alife_space.h" #include "Hit.h" diff --git a/src/xrGame/PHMovementControl.cpp b/src/xrGame/PHMovementControl.cpp index 60fd0e715c..480cae7c7b 100644 --- a/src/xrGame/PHMovementControl.cpp +++ b/src/xrGame/PHMovementControl.cpp @@ -1,25 +1,25 @@ -#include "stdafx.h" -#include "phmovementcontrol.h" +#include "StdAfx.h" +#include "PHMovementControl.h" #include "../xrEngine/cl_intersect.h" #include "../xrEngine/AI/alife_space.h" -#include "../xrPhysics/phCharacter.h" +#include "../xrPhysics/PHCharacter.h" #include "../xrPhysics/IPHCapture.h" -#include "../xrPhysics/iphysicsshellholder.h" +#include "../xrPhysics/IPhysicsShellHolder.h" #include "../xrPhysics/ElevatorState.h" #include "../xrPhysics/CalculateTriangle.h" -#include "../xrPhysics/Icolisiondamageinfo.h" +#include "../xrPhysics/IColisiondamageInfo.h" #include "../xrPhysics/phvalide.h" -#include "../xrPhysics/physicsshell.h" -#include "../xrPhysics/iphworld.h" +#include "../xrPhysics/PhysicsShell.h" +#include "../xrPhysics/IPHWorld.h" #include "detail_path_manager.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" #include "../xrEngine/xr_object.h" #include "CaptureBoneCallback.h" #include "Level.h" -#include "physicsshellholder.h" +#include "PhysicsShellHolder.h" #ifdef DEBUG -#include "phdebug.h" +#include "PHDebug.h" #endif #include "../Include/xrRender/Kinematics.h" diff --git a/src/xrGame/PHMovementControl.h b/src/xrGame/PHMovementControl.h index 40e6a61397..4014a342f6 100644 --- a/src/xrGame/PHMovementControl.h +++ b/src/xrGame/PHMovementControl.h @@ -4,9 +4,9 @@ //#include "../xrPhysics/PHCharacter.h" //#include "../xrPhysics/MathUtils.h" -#include "../xrPhysics/physicsexternalcommon.h" -#include "../xrPhysics/mathutils.h" -#include "../xrPhysics/movementboxdynamicactivate.h" +#include "../xrPhysics/PhysicsExternalCommon.h" +#include "../xrPhysics/MathUtils.h" +#include "../xrPhysics/MovementBoxDynamicActivate.h" namespace ALife { enum EHitType; }; diff --git a/src/xrGame/PHMovementDynamicActivate.cpp b/src/xrGame/PHMovementDynamicActivate.cpp index a18c9a2210..c66a54a5b8 100644 --- a/src/xrGame/PHMovementDynamicActivate.cpp +++ b/src/xrGame/PHMovementDynamicActivate.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" -#include "phmovementcontrol.h" +#include "PHMovementControl.h" //#include "ExtendedGeom.h" //#include "MathUtils.h" @@ -11,8 +11,8 @@ //#include "IPhysicsShellHolder.h" //#include "../xrPhysics/IPHWorld.h" //extern class CPHWorld *ph_world; -#include "../xrPhysics/phcharacter.h" -#include "../xrPhysics/iphysicsshellholder.h" +#include "../xrPhysics/PHCharacter.h" +#include "../xrPhysics/IPhysicsShellHolder.h" bool CPHMovementControl:: ActivateBoxDynamic(DWORD id,int num_it/*=8*/,int num_steps/*5*/,float resolve_depth/*=0.01f*/) { bool character_exist=CharacterExist(); diff --git a/src/xrGame/PHScriptCall.cpp b/src/xrGame/PHScriptCall.cpp index 074923a1e5..991b3b921f 100644 --- a/src/xrGame/PHScriptCall.cpp +++ b/src/xrGame/PHScriptCall.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" diff --git a/src/xrGame/PHScriptCall.h b/src/xrGame/PHScriptCall.h index 390774bc14..83703a57cf 100644 --- a/src/xrGame/PHScriptCall.h +++ b/src/xrGame/PHScriptCall.h @@ -1,6 +1,6 @@ #pragma once #include "PHReqComparer.h" -#include "phcommander.h" +#include "PHCommander.h" #include "../xrScripts/script_engine.h" #include "../xrScripts/script_space_forward.h" #include "../xrScripts/script_callback_ex.h" diff --git a/src/xrGame/PHShellCreator.cpp b/src/xrGame/PHShellCreator.cpp index b28c51c938..9911c1f819 100644 --- a/src/xrGame/PHShellCreator.cpp +++ b/src/xrGame/PHShellCreator.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "PHShellCreator.h" #include "../xrPhysics/PhysicsShell.h" -#include "gameobject.h" -#include "physicsshellholder.h" +#include "GameObject.h" +#include "PhysicsShellHolder.h" #include "../Include/xrRender/Kinematics.h" void CPHShellSimpleCreator::CreatePhysicsShell() diff --git a/src/xrGame/PHSimpleCalls.cpp b/src/xrGame/PHSimpleCalls.cpp index b0c29b2077..ab62f2769d 100644 --- a/src/xrGame/PHSimpleCalls.cpp +++ b/src/xrGame/PHSimpleCalls.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" -#include "../xrPhysics/physicsshell.h" -#include "phsimplecalls.h" +#include "StdAfx.h" +#include "../xrPhysics/PhysicsShell.h" +#include "PHSimpleCalls.h" //#include "phobject.h" //#include "PHWorld.h" //extern CPHWorld *ph_world; diff --git a/src/xrGame/PHSimpleCallsScript.cpp b/src/xrGame/PHSimpleCallsScript.cpp index 8c198743d9..d9bfb6ba25 100644 --- a/src/xrGame/PHSimpleCallsScript.cpp +++ b/src/xrGame/PHSimpleCallsScript.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "PHSimpleCalls.h" diff --git a/src/xrGame/PHSkeleton.cpp b/src/xrGame/PHSkeleton.cpp index 253855f119..2a8e45c10b 100644 --- a/src/xrGame/PHSkeleton.cpp +++ b/src/xrGame/PHSkeleton.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "PHSkeleton.h" #include "PhysicsShellHolder.h" #include "xrServer_Objects_ALife.h" diff --git a/src/xrGame/PHSoundPlayer.cpp b/src/xrGame/PHSoundPlayer.cpp index 18d53ede14..f8677d5af7 100644 --- a/src/xrGame/PHSoundPlayer.cpp +++ b/src/xrGame/PHSoundPlayer.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "PHSoundPlayer.h" #include "PhysicsShellHolder.h" diff --git a/src/xrGame/PHSoundPlayer.h b/src/xrGame/PHSoundPlayer.h index 50c5907bde..da2549a6ef 100644 --- a/src/xrGame/PHSoundPlayer.h +++ b/src/xrGame/PHSoundPlayer.h @@ -1,5 +1,5 @@ #pragma once -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" class CPhysicsShellHolder; diff --git a/src/xrGame/ParticlesPlayer.cpp b/src/xrGame/ParticlesPlayer.cpp index 3b5a78d581..168ea64cdb 100644 --- a/src/xrGame/ParticlesPlayer.cpp +++ b/src/xrGame/ParticlesPlayer.cpp @@ -2,7 +2,7 @@ // ParticlesPlayer.cpp // интерфейс для проигрывания партиклов на объекте /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ParticlesPlayer.h" #include "../xrEngine/xr_object.h" #include "../Include/xrRender/Kinematics.h" diff --git a/src/xrGame/Phrase.cpp b/src/xrGame/Phrase.cpp index 452a6007fb..5b9886074c 100644 --- a/src/xrGame/Phrase.cpp +++ b/src/xrGame/Phrase.cpp @@ -3,11 +3,11 @@ // класс, описывающий фразу (элемент диалога) /////////////////////////////////////////////////////////////// -#include "stdafx.h" -#include "phrase.h" +#include "StdAfx.h" +#include "Phrase.h" #include "ai_space.h" -#include "gameobject.h" +#include "GameObject.h" #include "script_game_object.h" CPhrase::CPhrase() diff --git a/src/xrGame/PhraseDialog.cpp b/src/xrGame/PhraseDialog.cpp index 43420bef9d..2dea0425f4 100644 --- a/src/xrGame/PhraseDialog.cpp +++ b/src/xrGame/PhraseDialog.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "phrasedialog.h" -#include "phrasedialogmanager.h" -#include "gameobject.h" +#include "PhraseDialog.h" +#include "PhraseDialogManager.h" +#include "GameObject.h" #include "ai_debug.h" #include "ai_space.h" #include "../xrScripts/script_engine.h" diff --git a/src/xrGame/PhraseDialog.h b/src/xrGame/PhraseDialog.h index 06968eb0a2..e6dc97246c 100644 --- a/src/xrGame/PhraseDialog.h +++ b/src/xrGame/PhraseDialog.h @@ -1,7 +1,7 @@ #pragma once #include "shared_data.h" -#include "phrase.h" +#include "Phrase.h" #include "graph_abstract.h" #include "PhraseDialogDefs.h" #include "xml_str_id_loader.h" diff --git a/src/xrGame/PhraseDialogManager.cpp b/src/xrGame/PhraseDialogManager.cpp index dfd7a45676..4fd061d44b 100644 --- a/src/xrGame/PhraseDialogManager.cpp +++ b/src/xrGame/PhraseDialogManager.cpp @@ -4,13 +4,13 @@ // между собой /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "PhraseDialogManager.h" #include "PhraseDialog.h" #include "ai_space.h" #include "../xrScripts/script_engine.h" -#include "gameobject.h" +#include "GameObject.h" #include "script_game_object.h" CPhraseDialogManager::CPhraseDialogManager (void) diff --git a/src/xrGame/PhraseDialog_script.cpp b/src/xrGame/PhraseDialog_script.cpp index 4d10c90c1a..53cf803036 100644 --- a/src/xrGame/PhraseDialog_script.cpp +++ b/src/xrGame/PhraseDialog_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "PhraseDialog_script.h" #include "PhraseDialog.h" diff --git a/src/xrGame/PhraseScript.cpp b/src/xrGame/PhraseScript.cpp index 2a3ed795fd..8c9724672e 100644 --- a/src/xrGame/PhraseScript.cpp +++ b/src/xrGame/PhraseScript.cpp @@ -1,12 +1,12 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "PhraseScript.h" #include "../xrScripts/script_engine.h" #include "ai_space.h" -#include "gameobject.h" +#include "GameObject.h" #include "script_game_object.h" -#include "infoportion.h" -#include "inventoryowner.h" +#include "InfoPortion.h" +#include "InventoryOwner.h" #include "ai_debug.h" #include "../../xrUI/xrUIXmlParser.h" #include "Actor.h" diff --git a/src/xrGame/PhysicObject.cpp b/src/xrGame/PhysicObject.cpp index d6ddc8e3a5..6697740342 100644 --- a/src/xrGame/PhysicObject.cpp +++ b/src/xrGame/PhysicObject.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "physicobject.h" +#include "PhysicObject.h" #include "../xrPhysics/PhysicsShell.h" //#include "Physics.h" #include "xrServer_Objects_ALife.h" @@ -13,10 +13,10 @@ #include "game_object_space.h" //#include "../xrPhysics/PhysicsShellAnimator.h" #include "moving_bones_snd_player.h" -#include "../xrPhysics/extendedgeom.h" +#include "../xrPhysics/ExtendedGeom.h" #ifdef DEBUG -#include "phdebug.h" -#include "../xrengine/objectdump.h" +#include "PHDebug.h" +#include "../xrEngine/ObjectDump.h" #endif BOOL dbg_draw_doors = false; CPhysicObject::CPhysicObject(void): diff --git a/src/xrGame/PhysicObject.h b/src/xrGame/PhysicObject.h index 89d4fbade5..fad9e871b0 100644 --- a/src/xrGame/PhysicObject.h +++ b/src/xrGame/PhysicObject.h @@ -1,8 +1,8 @@ #pragma once -#include "gameobject.h" -#include "physicsshellholder.h" -#include "physicsskeletonobject.h" +#include "GameObject.h" +#include "PhysicsShellHolder.h" +#include "PhysicsSkeletonObject.h" #include "PHSkeleton.h" #include "../xrScripts/script_export_space.h" #include "animation_script_callback.h" diff --git a/src/xrGame/PhysicObject_script.cpp b/src/xrGame/PhysicObject_script.cpp index 94873a29b9..809824b80e 100644 --- a/src/xrGame/PhysicObject_script.cpp +++ b/src/xrGame/PhysicObject_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "PhysicObject.h" #include "PHCollisionDamageReceiver.h" diff --git a/src/xrGame/PhysicsGamePars.cpp b/src/xrGame/PhysicsGamePars.cpp index edcf571590..9c32e420da 100644 --- a/src/xrGame/PhysicsGamePars.cpp +++ b/src/xrGame/PhysicsGamePars.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "PhysicsGamePars.h" //float object_damage_factor = 1.f ; //times increace damage from object collision float collide_volume_max = 200.f ; //max collide sound level diff --git a/src/xrGame/PhysicsShellHolder.cpp b/src/xrGame/PhysicsShellHolder.cpp index 2c93c76195..f47d5da102 100644 --- a/src/xrGame/PhysicsShellHolder.cpp +++ b/src/xrGame/PhysicsShellHolder.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "PhysicsShellHolder.h" #include "../xrPhysics/PhysicsShell.h" @@ -13,16 +13,16 @@ #include "Grenade.h" //#include "phactivationshape.h" -#include "../xrPhysics/iphworld.h" -#include "../xrPhysics/iActivationShape.h" +#include "../xrPhysics/IPHWorld.h" +#include "../xrPhysics/IActivationShape.h" //#include "../xrPhysics/phvalide.h" -#include "characterphysicssupport.h" -#include "phmovementcontrol.h" +#include "CharacterPhysicsSupport.h" +#include "PHMovementControl.h" #include "physics_shell_animated.h" -#include "phcollisiondamagereceiver.h" -#include "../xrEngine/iphysicsshell.h" +#include "PHCollisionDamageReceiver.h" +#include "../xrEngine/IPhysicsShell.h" #ifdef DEBUG -#include "../xrengine/objectdump.h" +#include "../xrEngine/ObjectDump.h" #endif CPhysicsShellHolder::CPhysicsShellHolder() { diff --git a/src/xrGame/PhysicsShellHolder.h b/src/xrGame/PhysicsShellHolder.h index c37decb571..c9241ed3cf 100644 --- a/src/xrGame/PhysicsShellHolder.h +++ b/src/xrGame/PhysicsShellHolder.h @@ -3,8 +3,8 @@ #include "GameObject.h" #include "ParticlesPlayer.h" -#include "../xrEngine/iobjectphysicscollision.h" -#include "../xrPhysics/iphysicsshellholder.h" +#include "../xrEngine/IObjectPhysicsCollision.h" +#include "../xrPhysics/IPhysicsShellHolder.h" class CPHDestroyable; class CPHCollisionDamageReceiver; diff --git a/src/xrGame/PhysicsSkeletonObject.cpp b/src/xrGame/PhysicsSkeletonObject.cpp index 278c4a091a..7357ceffab 100644 --- a/src/xrGame/PhysicsSkeletonObject.cpp +++ b/src/xrGame/PhysicsSkeletonObject.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" -#include "physicsskeletonobject.h" +#include "StdAfx.h" +#include "PhysicsSkeletonObject.h" //#include "PhysicsShell.h" -#include "../xrPhysics/physicsshell.h" +#include "../xrPhysics/PhysicsShell.h" #include "phsynchronize.h" #include "xrServer_Objects_ALife.h" #include "../Include/xrRender/Kinematics.h" diff --git a/src/xrGame/PhysicsSkeletonObject.h b/src/xrGame/PhysicsSkeletonObject.h index fa55fa2495..d3f35506fe 100644 --- a/src/xrGame/PhysicsSkeletonObject.h +++ b/src/xrGame/PhysicsSkeletonObject.h @@ -1,6 +1,6 @@ #ifndef PHYSICS_SKELETON_OBJECT_H #define PHYSICS_SKELETON_OBJECT_H -#include "physicsshellholder.h" +#include "PhysicsShellHolder.h" #include "PHSkeleton.h" diff --git a/src/xrGame/PostprocessAnimator.cpp b/src/xrGame/PostprocessAnimator.cpp index 7ab6e4ac72..a8ea3105a2 100644 --- a/src/xrGame/PostprocessAnimator.cpp +++ b/src/xrGame/PostprocessAnimator.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop -#include "postprocessanimator.h" +#include "PostprocessAnimator.h" #ifndef _PP_EDITOR_ #include "ActorEffector.h" #endif diff --git a/src/xrGame/PostprocessAnimator.h b/src/xrGame/PostprocessAnimator.h index c2a2f2df7f..ced65d8bf5 100644 --- a/src/xrGame/PostprocessAnimator.h +++ b/src/xrGame/PostprocessAnimator.h @@ -4,7 +4,7 @@ #include "../xrEngine/envelope.h" #include "../xrEngine/EffectorPP.h" -#include "../xrEngine/cameramanager.h" +#include "../xrEngine/CameraManager.h" #ifndef _PP_EDITOR_ class CEffectorController; diff --git a/src/xrGame/RGD5.cpp b/src/xrGame/RGD5.cpp index 725bf3a263..a3a375df3e 100644 --- a/src/xrGame/RGD5.cpp +++ b/src/xrGame/RGD5.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "rgd5.h" +#include "RGD5.h" CRGD5::CRGD5(void) { diff --git a/src/xrGame/RGD5.h b/src/xrGame/RGD5.h index db4aff7aad..041afba3ce 100644 --- a/src/xrGame/RGD5.h +++ b/src/xrGame/RGD5.h @@ -1,6 +1,6 @@ #pragma once -#include "grenade.h" +#include "Grenade.h" #include "../xrScripts/script_export_space.h" class CRGD5 : diff --git a/src/xrGame/RadioactiveZone.cpp b/src/xrGame/RadioactiveZone.cpp index f75a00a064..2d8c757a20 100644 --- a/src/xrGame/RadioactiveZone.cpp +++ b/src/xrGame/RadioactiveZone.cpp @@ -1,12 +1,12 @@ -#include "stdafx.h" -#include "radioactivezone.h" +#include "StdAfx.h" +#include "RadioactiveZone.h" #include "Level.h" #include "xrMessages.h" #include "../xrEngine/bone.h" #include "Actor.h" #include "game_base_space.h" #include "Hit.h" -#include "../xrengine/xr_collide_form.h" +#include "../xrEngine/xr_collide_form.h" CRadioactiveZone::CRadioactiveZone(void) {} diff --git a/src/xrGame/RocketLauncher.cpp b/src/xrGame/RocketLauncher.cpp index e1e72fa3d1..4025af950d 100644 --- a/src/xrGame/RocketLauncher.cpp +++ b/src/xrGame/RocketLauncher.cpp @@ -3,7 +3,7 @@ // стрел€ющих гранатами и ракетами ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "RocketLauncher.h" #include "CustomRocket.h" #include "xrServer_Objects_ALife_Items.h" diff --git a/src/xrGame/RustyHairArtifact.cpp b/src/xrGame/RustyHairArtifact.cpp index e9ff3e95ee..e855d0d167 100644 --- a/src/xrGame/RustyHairArtifact.cpp +++ b/src/xrGame/RustyHairArtifact.cpp @@ -3,7 +3,7 @@ // RustyHairArtefact - артефакт ржавые волосы /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "RustyHairArtifact.h" diff --git a/src/xrGame/ScientificOutfit.cpp b/src/xrGame/ScientificOutfit.cpp index 2ddc3407d7..13e3ea5ba8 100644 --- a/src/xrGame/ScientificOutfit.cpp +++ b/src/xrGame/ScientificOutfit.cpp @@ -5,8 +5,8 @@ #pragma once -#include "stdafx.h" -#include "scientificoutfit.h" +#include "StdAfx.h" +#include "ScientificOutfit.h" CScientificOutfit::CScientificOutfit() { diff --git a/src/xrGame/ScientificOutfit.h b/src/xrGame/ScientificOutfit.h index 47177193c8..70c6de91c0 100644 --- a/src/xrGame/ScientificOutfit.h +++ b/src/xrGame/ScientificOutfit.h @@ -6,7 +6,7 @@ #pragma once -#include "customoutfit.h" +#include "CustomOutfit.h" class CScientificOutfit: public CCustomOutfit { diff --git a/src/xrGame/Scope.cpp b/src/xrGame/Scope.cpp index 6caf63435d..3ea2357423 100644 --- a/src/xrGame/Scope.cpp +++ b/src/xrGame/Scope.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "Scope.h" #include "Silencer.h" diff --git a/src/xrGame/ScriptXMLInit.cpp b/src/xrGame/ScriptXMLInit.cpp index 5d46ec399a..fac3bd3f4c 100644 --- a/src/xrGame/ScriptXMLInit.cpp +++ b/src/xrGame/ScriptXMLInit.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "ScriptXmlInit.h" +#include "ScriptXMLInit.h" #include "../../xrUI/UIXmlInit.h" #include "../../xrUI/UITextureMaster.h" #include "../../xrUI/Widgets/UICheckButton.h" @@ -9,7 +9,7 @@ #include "../../xrUI/Widgets/UIComboBox.h" #include "../../xrUI/Widgets/UITabControl.h" #include "../../xrUI/Widgets/UIFrameWindow.h" -#include "ui\ServerList.h" +#include "ui/ServerList.h" #include "ui/UIMapList.h" #include "ui/UIKeyBinding.h" #include "../../xrUI/Widgets/UIEditBox.h" diff --git a/src/xrGame/ShootingObject.cpp b/src/xrGame/ShootingObject.cpp index d1180fdb01..96d15a846b 100644 --- a/src/xrGame/ShootingObject.cpp +++ b/src/xrGame/ShootingObject.cpp @@ -3,16 +3,16 @@ // (оружие и осколочные гранаты) ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ShootingObject.h" #include "WeaponAmmo.h" #include "Actor.h" -#include "spectator.h" +#include "Spectator.h" #include "game_cl_base.h" #include "Level.h" -#include "level_bullet_manager.h" +#include "Level_Bullet_Manager.h" #include "game_cl_single.h" #define HIT_POWER_EPSILON 0.05f diff --git a/src/xrGame/ShootingObject.h b/src/xrGame/ShootingObject.h index 5a98f7316f..464db21587 100644 --- a/src/xrGame/ShootingObject.h +++ b/src/xrGame/ShootingObject.h @@ -7,7 +7,7 @@ #pragma once #include "alife_space.h" -#include "../xrEngine/render.h" +#include "../xrEngine/Render.h" #include "anticheat_dumpable_object.h" #include "../xrParticles/psystem.h" #include "../xrParticles/ParticlesObject.h" diff --git a/src/xrGame/Silencer.cpp b/src/xrGame/Silencer.cpp index 062c491430..75bef774c6 100644 --- a/src/xrGame/Silencer.cpp +++ b/src/xrGame/Silencer.cpp @@ -3,7 +3,7 @@ // Silencer - апгрейд оружия глушитель /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "Silencer.h" //#include "PhysicsShell.h" diff --git a/src/xrGame/SimpleDetector.cpp b/src/xrGame/SimpleDetector.cpp index 5421a0204a..678437c043 100644 --- a/src/xrGame/SimpleDetector.cpp +++ b/src/xrGame/SimpleDetector.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "simpledetector.h" +#include "StdAfx.h" +#include "SimpleDetector.h" #include "ui/ArtefactDetectorUI.h" #include "../Include/xrRender/Kinematics.h" #include "../xrEngine/LightAnimLibrary.h" diff --git a/src/xrGame/SleepEffector.cpp b/src/xrGame/SleepEffector.cpp index 1a12e9a025..25d48c3ef6 100644 --- a/src/xrGame/SleepEffector.cpp +++ b/src/xrGame/SleepEffector.cpp @@ -4,7 +4,7 @@ ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "SleepEffector.h" diff --git a/src/xrGame/SleepEffector.h b/src/xrGame/SleepEffector.h index bdda88fb1c..75ada05f42 100644 --- a/src/xrGame/SleepEffector.h +++ b/src/xrGame/SleepEffector.h @@ -6,9 +6,9 @@ #pragma once -#include "../xrEngine/effectorPP.h" -#include "../xrEngine/effector.h" -#include "../xrEngine/cameramanager.h" +#include "../xrEngine/EffectorPP.h" +#include "../xrEngine/Effector.h" +#include "../xrEngine/CameraManager.h" #define SLEEP_EFFECTOR_TYPE_ID 8 diff --git a/src/xrGame/Spectator.cpp b/src/xrGame/Spectator.cpp index 271453a431..697648c5f7 100644 --- a/src/xrGame/Spectator.cpp +++ b/src/xrGame/Spectator.cpp @@ -2,10 +2,10 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" -#include "spectator.h" -#include "effectorfall.h" -#include "CameraLook.h" +#include "StdAfx.h" +#include "Spectator.h" +#include "EffectorFall.h" +#include "cameralook.h" #include "spectator_camera_first_eye.h" #include "Actor.h" #include "xrServer_Objects.h" @@ -18,7 +18,7 @@ #include "group_hierarchy_holder.h" #include "../xrEngine/CameraManager.h" #include "Inventory.h" -#include "huditem.h" +#include "HudItem.h" #include "game_cl_mp.h" #include "../xrEngine/string_table.h" #include "map_manager.h" diff --git a/src/xrGame/Spectator.h b/src/xrGame/Spectator.h index 6f9e8ee355..dcce2a7f89 100644 --- a/src/xrGame/Spectator.h +++ b/src/xrGame/Spectator.h @@ -3,11 +3,11 @@ #pragma once -#include "../xrEngine/feel_touch.h" -#include "../xrEngine/iinputreceiver.h" +#include "../xrEngine/Feel_Touch.h" +#include "../xrEngine/IInputReceiver.h" -#include "entity.h" -#include "actor_flags.h" +#include "Entity.h" +#include "Actor_Flags.h" // refs class CActor; diff --git a/src/xrGame/StalkerOutfit.cpp b/src/xrGame/StalkerOutfit.cpp index 4bbfb5d831..2adbd85085 100644 --- a/src/xrGame/StalkerOutfit.cpp +++ b/src/xrGame/StalkerOutfit.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "StalkerOutfit.h" #include "ActorHelmet.h" diff --git a/src/xrGame/StalkerOutfit.h b/src/xrGame/StalkerOutfit.h index 65c3bb31b9..fbfda92145 100644 --- a/src/xrGame/StalkerOutfit.h +++ b/src/xrGame/StalkerOutfit.h @@ -6,7 +6,7 @@ #pragma once -#include "customoutfit.h" +#include "CustomOutfit.h" #include "../xrScripts/script_export_space.h" class CStalkerOutfit : diff --git a/src/xrGame/StdAfx.cpp b/src/xrGame/StdAfx.cpp index b7599703b5..c5200f0cc3 100644 --- a/src/xrGame/StdAfx.cpp +++ b/src/xrGame/StdAfx.cpp @@ -1,2 +1,2 @@ #pragma warning(disable:4503) -#include "stdafx.h" \ No newline at end of file +#include "StdAfx.h" diff --git a/src/xrGame/StdAfx.h b/src/xrGame/StdAfx.h index d82408a5b6..680abaf53c 100644 --- a/src/xrGame/StdAfx.h +++ b/src/xrGame/StdAfx.h @@ -20,10 +20,10 @@ #include "../xrScripts/stdafx.h" #pragma warning(default:4995) -#include "../xrEngine/gamefont.h" +#include "../xrEngine/GameFont.h" #include "../xrEngine/xr_object.h" -#include "../xrEngine/igame_level.h" -#include "../xrPhysics/xrphysics.h" +#include "../xrEngine/IGame_Level.h" +#include "../xrPhysics/xrPhysics.h" #include "smart_cast.h" #else #include "../Editors/ActorEditor/stdafx.h" diff --git a/src/xrGame/TeleWhirlwind.cpp b/src/xrGame/TeleWhirlwind.cpp index e62489a636..d11283f8d9 100644 --- a/src/xrGame/TeleWhirlwind.cpp +++ b/src/xrGame/TeleWhirlwind.cpp @@ -1,10 +1,10 @@ -#include "stdafx.h" -#include "telewhirlwind.h" +#include "StdAfx.h" +#include "TeleWhirlwind.h" #include "../xrPhysics/PhysicsShell.h" #include "PhysicsShellHolder.h" #include "Level.h" #include "Hit.h" -#include "phdestroyable.h" +#include "PHDestroyable.h" #include "xrMessages.h" #include "../Include/xrRender/Kinematics.h" #include "../Include/xrRender/KinematicsAnimated.h" diff --git a/src/xrGame/ThornArtifact.cpp b/src/xrGame/ThornArtifact.cpp index eac14418ea..7661298ac0 100644 --- a/src/xrGame/ThornArtifact.cpp +++ b/src/xrGame/ThornArtifact.cpp @@ -3,7 +3,7 @@ // ThornArtefact - артефакт колючка /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ThornArtifact.h" #include "../xrPhysics/PhysicsShell.h" diff --git a/src/xrGame/Torch.cpp b/src/xrGame/Torch.cpp index 9a4e1ca464..8854d30558 100644 --- a/src/xrGame/Torch.cpp +++ b/src/xrGame/Torch.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" -#include "torch.h" -#include "entity.h" +#include "StdAfx.h" +#include "Torch.h" +#include "Entity.h" #include "Actor.h" #include "../xrEngine/LightAnimLibrary.h" #include "../xrPhysics/PhysicsShell.h" @@ -9,13 +9,13 @@ #include "Level.h" #include "../Include/xrRender/Kinematics.h" -#include "../xrEngine/camerabase.h" -#include "../xrengine/xr_collide_form.h" +#include "../xrEngine/CameraBase.h" +#include "../xrEngine/xr_collide_form.h" #include "Inventory.h" #include "game_base_space.h" #include "UIGameCustom.h" -#include "actorEffector.h" +#include "ActorEffector.h" #include "CustomOutfit.h" #include "ActorHelmet.h" diff --git a/src/xrGame/Torch.h b/src/xrGame/Torch.h index 68b90b4ec5..4df4652098 100644 --- a/src/xrGame/Torch.h +++ b/src/xrGame/Torch.h @@ -1,7 +1,7 @@ #pragma once #include "inventory_item_object.h" -#include "hudsound.h" +#include "HudSound.h" #include "../xrScripts/script_export_space.h" class CLAItem; diff --git a/src/xrGame/TorridZone.cpp b/src/xrGame/TorridZone.cpp index 77afbd8445..e279b4fefa 100644 --- a/src/xrGame/TorridZone.cpp +++ b/src/xrGame/TorridZone.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" -#include "torridZone.h" -#include "../xrEngine/objectanimator.h" +#include "StdAfx.h" +#include "TorridZone.h" +#include "../xrEngine/ObjectAnimator.h" #include "xrServer_Objects_ALife_Monsters.h" CTorridZone::CTorridZone() diff --git a/src/xrGame/TorridZone.h b/src/xrGame/TorridZone.h index f715a09d9b..331bd0f421 100644 --- a/src/xrGame/TorridZone.h +++ b/src/xrGame/TorridZone.h @@ -1,5 +1,5 @@ #pragma once -#include "mosquitobald.h" +#include "MosquitoBald.h" class CObjectAnimator; diff --git a/src/xrGame/Tracer.cpp b/src/xrGame/Tracer.cpp index 6aab175005..b3068e3348 100644 --- a/src/xrGame/Tracer.cpp +++ b/src/xrGame/Tracer.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Tracer.h" -#include "../xrEngine/render.h" +#include "../xrEngine/Render.h" #include "../Include/xrRender/UIShader.h" #include "../Include/xrRender/UIRender.h" diff --git a/src/xrGame/UIAchivementsIndicator.cpp b/src/xrGame/UIAchivementsIndicator.cpp index 8b3dcf0be1..6a18de322a 100644 --- a/src/xrGame/UIAchivementsIndicator.cpp +++ b/src/xrGame/UIAchivementsIndicator.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "UIAchivementsIndicator.h" #include "../../xrUI/UIXmlInit.h" #include "ui/UIGameLog.h" diff --git a/src/xrGame/UIGameAHunt.cpp b/src/xrGame/UIGameAHunt.cpp index 85c2e02a06..1d523d15de 100644 --- a/src/xrGame/UIGameAHunt.cpp +++ b/src/xrGame/UIGameAHunt.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "UIGameAHunt.h" #include "team_base_zone.h" #include "Level.h" -#include "game_cl_ArtefactHunt.h" +#include "game_cl_artefacthunt.h" #include "../../xrUI/Widgets/UIStatic.h" #include "../../xrUI/UIXmlInit.h" #include "ui/UIMessageBoxEx.h" diff --git a/src/xrGame/UIGameCTA.cpp b/src/xrGame/UIGameCTA.cpp index a8c713d655..f38076ab74 100644 --- a/src/xrGame/UIGameCTA.cpp +++ b/src/xrGame/UIGameCTA.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "UIGameCTA.h" #include "UITeamPanels.h" @@ -18,7 +18,7 @@ #include "../xrEngine/xr_level_controller.h" #include "object_broker.h" -#include "weaponknife.h" +#include "WeaponKnife.h" #include "ui/UISkinSelector.h" #include "../xrEngine/string_table.h" diff --git a/src/xrGame/UIGameCustom.cpp b/src/xrGame/UIGameCustom.cpp index 9f09844004..6b885c648d 100644 --- a/src/xrGame/UIGameCustom.cpp +++ b/src/xrGame/UIGameCustom.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "UIGameCustom.h" #include "Level.h" diff --git a/src/xrGame/UIGameCustom_script.cpp b/src/xrGame/UIGameCustom_script.cpp index d320822159..a32e57da7b 100644 --- a/src/xrGame/UIGameCustom_script.cpp +++ b/src/xrGame/UIGameCustom_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "UIGameCustom.h" #include "Level.h" diff --git a/src/xrGame/UIGameDM.cpp b/src/xrGame/UIGameDM.cpp index 5612bc8aba..de70a547d8 100644 --- a/src/xrGame/UIGameDM.cpp +++ b/src/xrGame/UIGameDM.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "UIGameDM.h" @@ -13,7 +13,7 @@ #include "InventoryOwner.h" #include "xrServer_Objects_ALife_Items.h" #include "../../xrUI/xrUIXmlParser.h" -#include "game_cl_Deathmatch.h" +#include "game_cl_deathmatch.h" #include "ui/UIMoneyIndicator.h" #include "ui/UIRankIndicator.h" #include "ui/UIVoteStatusWnd.h" diff --git a/src/xrGame/UIGameMP.cpp b/src/xrGame/UIGameMP.cpp index ad8850c435..77cc37e063 100644 --- a/src/xrGame/UIGameMP.cpp +++ b/src/xrGame/UIGameMP.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "UIGameMP.h" #include "UIAchivementsIndicator.h" #include "ui/UIDemoPlayControl.h" diff --git a/src/xrGame/UIGameSP.cpp b/src/xrGame/UIGameSP.cpp index 7453b2f685..b95b777979 100644 --- a/src/xrGame/UIGameSP.cpp +++ b/src/xrGame/UIGameSP.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "uigamesp.h" +#include "UIGameSP.h" #include "Actor.h" #include "Level.h" #include "../xrEngine/xr_input.h" @@ -9,11 +9,11 @@ #include "attachable_item.h" #endif -#include "game_cl_Single.h" -#include "actorcondition.h" -#include "../xrEngine/xr_ioconsole.h" +#include "game_cl_single.h" +#include "ActorCondition.h" +#include "../xrEngine/XR_IOConsole.h" #include "object_broker.h" -#include "GameTaskManager.h" +#include "GametaskManager.h" #include "GameTask.h" #include "ui/UIActorMenu.h" diff --git a/src/xrGame/UIGameSP.h b/src/xrGame/UIGameSP.h index 8c3a764e5a..cdd60396a7 100644 --- a/src/xrGame/UIGameSP.h +++ b/src/xrGame/UIGameSP.h @@ -1,5 +1,5 @@ #pragma once -#include "uigamecustom.h" +#include "UIGameCustom.h" #include "../../xrUI/Widgets/UIDialogWnd.h" #include "game_graph_space.h" diff --git a/src/xrGame/UIGameTDM.cpp b/src/xrGame/UIGameTDM.cpp index 1019228089..1211b421f4 100644 --- a/src/xrGame/UIGameTDM.cpp +++ b/src/xrGame/UIGameTDM.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "UIGameTDM.h" #include "game_cl_base.h" -#include "game_cl_TeamDeathmatch.h" +#include "game_cl_teamdeathmatch.h" #include "ui/TeamInfo.h" diff --git a/src/xrGame/UIHelperGame.cpp b/src/xrGame/UIHelperGame.cpp index d1a306f5ab..d6ef33f918 100644 --- a/src/xrGame/UIHelperGame.cpp +++ b/src/xrGame/UIHelperGame.cpp @@ -9,7 +9,7 @@ #include "UIHelperGame.h" #include "../xrUI/UIXmlInit.h" -#include "UI/UIDragDropReferenceList.h" +#include "ui/UIDragDropReferenceList.h" CUIDragDropListEx* UIHelperGame::CreateDragDropListEx(CUIXml& xml, LPCSTR ui_path, CUIWindow* parent) { diff --git a/src/xrGame/UITeamHeader.cpp b/src/xrGame/UITeamHeader.cpp index daf2766521..562c5ba183 100644 --- a/src/xrGame/UITeamHeader.cpp +++ b/src/xrGame/UITeamHeader.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "UITeamHeader.h" #include "UITeamState.h" #include "../../xrUI/Widgets/UIStatic.h" diff --git a/src/xrGame/UIZoneMap.cpp b/src/xrGame/UIZoneMap.cpp index 636b0f8420..10ede5d694 100644 --- a/src/xrGame/UIZoneMap.cpp +++ b/src/xrGame/UIZoneMap.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" -#include "uizonemap.h" +#include "StdAfx.h" +#include "UIZoneMap.h" #include "InfoPortion.h" -#include "Pda.h" +#include "PDA.h" #include "Grenade.h" #include "Level.h" diff --git a/src/xrGame/UsableScriptObject.cpp b/src/xrGame/UsableScriptObject.cpp index 43cbd6a65a..dc9f721d9e 100644 --- a/src/xrGame/UsableScriptObject.cpp +++ b/src/xrGame/UsableScriptObject.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "UsableScriptObject.h" #include "GameObject.h" diff --git a/src/xrGame/VoiceChat.cpp b/src/xrGame/VoiceChat.cpp index 36988c6d99..e363921901 100644 --- a/src/xrGame/VoiceChat.cpp +++ b/src/xrGame/VoiceChat.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "VoiceChat.h" #include "Level.h" #include "../xrSound/Recorder/SoundVoiceChat.h" diff --git a/src/xrGame/VoiceSender.cpp b/src/xrGame/VoiceSender.cpp index 018631474a..e3b22b5450 100644 --- a/src/xrGame/VoiceSender.cpp +++ b/src/xrGame/VoiceSender.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "VoiceSender.h" #include "game_cl_mp.h" #include"game_sv_mp.h" diff --git a/src/xrGame/Weapon.cpp b/src/xrGame/Weapon.cpp index f0f1aa6b1f..4329a3f011 100644 --- a/src/xrGame/Weapon.cpp +++ b/src/xrGame/Weapon.cpp @@ -1,24 +1,24 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Weapon.h" #include "entity_alive.h" #include "inventory_item_impl.h" #include "Inventory.h" #include "xrServer_Objects_ALife_Items.h" #include "Actor.h" -#include "actoreffector.h" +#include "ActorEffector.h" #include "Level.h" #include "../xrEngine/xr_level_controller.h" #include "game_cl_base.h" #include "../Include/xrRender/Kinematics.h" #include "ai_object_location.h" -#include "../xrPhysics/mathutils.h" +#include "../xrPhysics/MathUtils.h" #include "object_broker.h" #include "player_hud.h" -#include "gamepersistent.h" -#include "effectorFall.h" +#include "GamePersistent.h" +#include "EffectorFall.h" #include "debug_renderer.h" #include "clsid_game.h" -#include "weaponBinocularsVision.h" +#include "WeaponBinocularsVision.h" #include "../../xrUI/Widgets/UIWindow.h" #include "../../xrUI/UIXmlInit.h" #include "Torch.h" diff --git a/src/xrGame/Weapon.h b/src/xrGame/Weapon.h index 9ea645a7fe..a37cfea8b4 100644 --- a/src/xrGame/Weapon.h +++ b/src/xrGame/Weapon.h @@ -1,7 +1,7 @@ #pragma once #include "../xrPhysics/PhysicsShell.h" -#include "weaponammo.h" +#include "WeaponAmmo.h" #include "PHShellCreator.h" #include "ShootingObject.h" diff --git a/src/xrGame/WeaponAK74.cpp b/src/xrGame/WeaponAK74.cpp index 217e1da388..50215ceef1 100644 --- a/src/xrGame/WeaponAK74.cpp +++ b/src/xrGame/WeaponAK74.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "WeaponAK74.h" diff --git a/src/xrGame/WeaponAmmo.cpp b/src/xrGame/WeaponAmmo.cpp index b3b9d27c4b..e5c1ac59f7 100644 --- a/src/xrGame/WeaponAmmo.cpp +++ b/src/xrGame/WeaponAmmo.cpp @@ -1,13 +1,13 @@ -#include "stdafx.h" -#include "weaponammo.h" +#include "StdAfx.h" +#include "WeaponAmmo.h" #include "../xrPhysics/PhysicsShell.h" #include "xrServer_Objects_ALife_Items.h" #include "Actor_Flags.h" #include "Inventory.h" #include "Weapon.h" -#include "level_bullet_manager.h" +#include "Level_Bullet_Manager.h" #include "ai_space.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" #include "Level.h" #include "../xrEngine/string_table.h" diff --git a/src/xrGame/WeaponAutomaticShotgun.cpp b/src/xrGame/WeaponAutomaticShotgun.cpp index fb056430e7..d656ca629d 100644 --- a/src/xrGame/WeaponAutomaticShotgun.cpp +++ b/src/xrGame/WeaponAutomaticShotgun.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "script_game_object.h" #include "WeaponAutomaticShotgun.h" -#include "entity.h" +#include "Entity.h" #include "../xrEngine/xr_level_controller.h" #include "Inventory.h" #include "Level.h" diff --git a/src/xrGame/WeaponBinoculars.cpp b/src/xrGame/WeaponBinoculars.cpp index 5f02121e4c..729619003a 100644 --- a/src/xrGame/WeaponBinoculars.cpp +++ b/src/xrGame/WeaponBinoculars.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "WeaponBinoculars.h" #include "../xrEngine/xr_level_controller.h" diff --git a/src/xrGame/WeaponBinocularsVision.cpp b/src/xrGame/WeaponBinocularsVision.cpp index a4bed64385..db6bae6d4f 100644 --- a/src/xrGame/WeaponBinocularsVision.cpp +++ b/src/xrGame/WeaponBinocularsVision.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "WeaponBinocularsVision.h" #include "WeaponBinoculars.h" #include "entity_alive.h" @@ -11,8 +11,8 @@ #include "game_base_space.h" #include "Level.h" #include "game_cl_base.h" -#include "AI/Monsters/BaseMonster/base_monster.h" -#include "../xrEngine/igame_persistent.h" +#include "ai/monsters/basemonster/base_monster.h" +#include "../xrEngine/IGame_Persistent.h" #define RECT_SIZE 11 diff --git a/src/xrGame/WeaponBinoculars_script.cpp b/src/xrGame/WeaponBinoculars_script.cpp index 5f33d6bd59..aa6a70550f 100644 --- a/src/xrGame/WeaponBinoculars_script.cpp +++ b/src/xrGame/WeaponBinoculars_script.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "weaponbinoculars.h" +#include "WeaponBinoculars.h" using namespace luabind; diff --git a/src/xrGame/WeaponCustomPistol.cpp b/src/xrGame/WeaponCustomPistol.cpp index fd485d766f..1e4069591e 100644 --- a/src/xrGame/WeaponCustomPistol.cpp +++ b/src/xrGame/WeaponCustomPistol.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Entity.h" #include "WeaponCustomPistol.h" diff --git a/src/xrGame/WeaponDispersion.cpp b/src/xrGame/WeaponDispersion.cpp index 4b63f78ae9..97597bf0ac 100644 --- a/src/xrGame/WeaponDispersion.cpp +++ b/src/xrGame/WeaponDispersion.cpp @@ -2,15 +2,15 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "Weapon.h" -#include "inventoryowner.h" +#include "InventoryOwner.h" #include "Actor.h" #include "inventory_item_impl.h" -#include "actoreffector.h" -#include "effectorshot.h" +#include "ActorEffector.h" +#include "EffectorShot.h" #include "EffectorShotX.h" diff --git a/src/xrGame/WeaponFN2000.cpp b/src/xrGame/WeaponFN2000.cpp index 288ec71e74..c238a40e33 100644 --- a/src/xrGame/WeaponFN2000.cpp +++ b/src/xrGame/WeaponFN2000.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "WeaponFN2000.h" diff --git a/src/xrGame/WeaponFORT.cpp b/src/xrGame/WeaponFORT.cpp index 335d593b37..c78206a14a 100644 --- a/src/xrGame/WeaponFORT.cpp +++ b/src/xrGame/WeaponFORT.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "WeaponFORT.h" diff --git a/src/xrGame/WeaponFire.cpp b/src/xrGame/WeaponFire.cpp index 1395cc84e1..70ebfe1540 100644 --- a/src/xrGame/WeaponFire.cpp +++ b/src/xrGame/WeaponFire.cpp @@ -2,15 +2,15 @@ // function responsible for firing with CWeapon ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "Weapon.h" -#include "entity.h" +#include "Entity.h" #include "Actor.h" -#include "actoreffector.h" -#include "effectorshot.h" +#include "ActorEffector.h" +#include "EffectorShot.h" -#include "level_bullet_manager.h" +#include "Level_Bullet_Manager.h" #include "game_cl_mp.h" #include "reward_event_generator.h" diff --git a/src/xrGame/WeaponGroza.cpp b/src/xrGame/WeaponGroza.cpp index d47667dafc..1834a5f5b7 100644 --- a/src/xrGame/WeaponGroza.cpp +++ b/src/xrGame/WeaponGroza.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "weapongroza.h" +#include "WeaponGroza.h" CWeaponGroza::CWeaponGroza() :CWeaponMagazinedWGrenade(SOUND_TYPE_WEAPON_SUBMACHINEGUN) {} diff --git a/src/xrGame/WeaponGroza.h b/src/xrGame/WeaponGroza.h index da7c5fe2b9..4f8ff45390 100644 --- a/src/xrGame/WeaponGroza.h +++ b/src/xrGame/WeaponGroza.h @@ -1,6 +1,6 @@ #pragma once -#include "weaponmagazinedwgrenade.h" +#include "WeaponMagazinedWGrenade.h" #include "../xrScripts/script_export_space.h" class CWeaponGroza : diff --git a/src/xrGame/WeaponHPSA.cpp b/src/xrGame/WeaponHPSA.cpp index 30958b7729..8da4296c72 100644 --- a/src/xrGame/WeaponHPSA.cpp +++ b/src/xrGame/WeaponHPSA.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "WeaponHPSA.h" diff --git a/src/xrGame/WeaponHPSA_script.cpp b/src/xrGame/WeaponHPSA_script.cpp index aa0873c539..856ec24da7 100644 --- a/src/xrGame/WeaponHPSA_script.cpp +++ b/src/xrGame/WeaponHPSA_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "WeaponHPSA.h" diff --git a/src/xrGame/WeaponHUD.cpp b/src/xrGame/WeaponHUD.cpp index e34afdddee..e610ebf691 100644 --- a/src/xrGame/WeaponHUD.cpp +++ b/src/xrGame/WeaponHUD.cpp @@ -2,10 +2,10 @@ // могут держать в руках персонажи, также используется // для синхронизации анимаций с видом от 3-го лица ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "WeaponHUD.h" #include "Weapon.h" -#include "../xrEngine/Motion.h" +#include "../xrEngine/motion.h" #include "../Include/xrRender/Kinematics.h" #include "Level.h" #include "../xrPhysics/MathUtils.h" diff --git a/src/xrGame/WeaponKnife.cpp b/src/xrGame/WeaponKnife.cpp index b16c9b802e..110f6b6054 100644 --- a/src/xrGame/WeaponKnife.cpp +++ b/src/xrGame/WeaponKnife.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "WeaponKnife.h" #include "Entity.h" @@ -7,8 +7,8 @@ #include "../xrEngine/xr_level_controller.h" #include "game_cl_base.h" #include "../Include/xrRender/Kinematics.h" -#include "../xrEngine/gamemtllib.h" -#include "level_bullet_manager.h" +#include "../xrEngine/GameMtlLib.h" +#include "Level_Bullet_Manager.h" #include "../xrSound/ai_sounds.h" #include "game_cl_single.h" #include "../xrEngine/SkeletonMotions.h" diff --git a/src/xrGame/WeaponKnife_script.cpp b/src/xrGame/WeaponKnife_script.cpp index 8d82c5c441..2ebc37ae21 100644 --- a/src/xrGame/WeaponKnife_script.cpp +++ b/src/xrGame/WeaponKnife_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "WeaponKnife.h" diff --git a/src/xrGame/WeaponLR300.cpp b/src/xrGame/WeaponLR300.cpp index 6f3464c66c..0869390652 100644 --- a/src/xrGame/WeaponLR300.cpp +++ b/src/xrGame/WeaponLR300.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "WeaponLR300.h" diff --git a/src/xrGame/WeaponMagazined.cpp b/src/xrGame/WeaponMagazined.cpp index e04b5b75b8..ee018cbe1b 100644 --- a/src/xrGame/WeaponMagazined.cpp +++ b/src/xrGame/WeaponMagazined.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "WeaponMagazined.h" diff --git a/src/xrGame/WeaponMagazined.h b/src/xrGame/WeaponMagazined.h index 62c855be15..d02fce805b 100644 --- a/src/xrGame/WeaponMagazined.h +++ b/src/xrGame/WeaponMagazined.h @@ -1,7 +1,7 @@ #pragma once #include "Weapon.h" -#include "hudsound.h" +#include "HudSound.h" #include "../xrSound/ai_sounds.h" class ENGINE_API CMotionDef; diff --git a/src/xrGame/WeaponMagazinedWGrenade.cpp b/src/xrGame/WeaponMagazinedWGrenade.cpp index 396cec749c..01d7c2eab0 100644 --- a/src/xrGame/WeaponMagazinedWGrenade.cpp +++ b/src/xrGame/WeaponMagazinedWGrenade.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" -#include "weaponmagazinedwgrenade.h" -#include "entity.h" +#include "StdAfx.h" +#include "WeaponMagazinedWGrenade.h" +#include "Entity.h" #include "GrenadeLauncher.h" #include "xrServer_Objects_ALife_Items.h" #include "ExplosiveRocket.h" @@ -13,7 +13,7 @@ #include "player_hud.h" #include "Actor_Flags.h" #include "Inventory.h" -#include "inventoryOwner.h" +#include "InventoryOwner.h" #ifdef DEBUG # include "phdebug.h" diff --git a/src/xrGame/WeaponMagazinedWGrenade.h b/src/xrGame/WeaponMagazinedWGrenade.h index a4723df569..c9286d7c3b 100644 --- a/src/xrGame/WeaponMagazinedWGrenade.h +++ b/src/xrGame/WeaponMagazinedWGrenade.h @@ -1,6 +1,6 @@ #pragma once -#include "weaponmagazined.h" -#include "rocketlauncher.h" +#include "WeaponMagazined.h" +#include "RocketLauncher.h" class CWeaponFakeGrenade; diff --git a/src/xrGame/WeaponMounted.cpp b/src/xrGame/WeaponMounted.cpp index 9f1803b58e..503f8a65a7 100644 --- a/src/xrGame/WeaponMounted.cpp +++ b/src/xrGame/WeaponMounted.cpp @@ -1,17 +1,17 @@ -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop #include "WeaponMounted.h" #include "xrServer_Objects_ALife.h" -#include "camerafirsteye.h" -#include "actor.h" -#include "weaponammo.h" +#include "CameraFirstEye.h" +#include "Actor.h" +#include "WeaponAmmo.h" -#include "actoreffector.h" -#include "effectorshot.h" +#include "ActorEffector.h" +#include "EffectorShot.h" #include "ai_sounds.h" -#include "level.h" +#include "Level.h" #include "xr_level_controller.h" #include "../Include/xrRender/Kinematics.h" #include "game_object_space.h" diff --git a/src/xrGame/WeaponMounted.h b/src/xrGame/WeaponMounted.h index d518cd58e4..7e2ab93f10 100644 --- a/src/xrGame/WeaponMounted.h +++ b/src/xrGame/WeaponMounted.h @@ -3,11 +3,11 @@ #pragma once #include "holder_custom.h" -#include "shootingobject.h" +#include "ShootingObject.h" -#include "hudsound.h" -#include "weaponammo.h" -#include "physicsshellholder.h" +#include "HudSound.h" +#include "WeaponAmmo.h" +#include "PhysicsShellHolder.h" class CWeaponMounted : public CPhysicsShellHolder, public CHolderCustom, diff --git a/src/xrGame/WeaponPM.cpp b/src/xrGame/WeaponPM.cpp index cf30115b06..bcfc91e64c 100644 --- a/src/xrGame/WeaponPM.cpp +++ b/src/xrGame/WeaponPM.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "WeaponPM.h" diff --git a/src/xrGame/WeaponPistol.cpp b/src/xrGame/WeaponPistol.cpp index ec2d6a4184..075c1b5c41 100644 --- a/src/xrGame/WeaponPistol.cpp +++ b/src/xrGame/WeaponPistol.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "weaponpistol.h" +#include "StdAfx.h" +#include "WeaponPistol.h" #include "Actor.h" CWeaponPistol::CWeaponPistol() diff --git a/src/xrGame/WeaponPistol.h b/src/xrGame/WeaponPistol.h index 10b76eb1b1..15f9bfa8c7 100644 --- a/src/xrGame/WeaponPistol.h +++ b/src/xrGame/WeaponPistol.h @@ -1,5 +1,5 @@ #pragma once -#include "weaponcustompistol.h" +#include "WeaponCustomPistol.h" class CWeaponPistol : public CWeaponCustomPistol diff --git a/src/xrGame/WeaponRG6.cpp b/src/xrGame/WeaponRG6.cpp index 1945ce0491..6a24854668 100644 --- a/src/xrGame/WeaponRG6.cpp +++ b/src/xrGame/WeaponRG6.cpp @@ -1,13 +1,13 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "WeaponRG6.h" -#include "entity.h" -#include "explosiveRocket.h" +#include "Entity.h" +#include "ExplosiveRocket.h" #include "Level.h" #include "../xrPhysics/MathUtils.h" #include "Actor.h" #include "UIGameCustom.h" -#include "inventory.h" -#include "inventoryOwner.h" +#include "Inventory.h" +#include "InventoryOwner.h" #ifdef DEBUG # include "phdebug.h" diff --git a/src/xrGame/WeaponRG6.h b/src/xrGame/WeaponRG6.h index b2bfe7b18b..a6924e3658 100644 --- a/src/xrGame/WeaponRG6.h +++ b/src/xrGame/WeaponRG6.h @@ -1,7 +1,7 @@ #pragma once -#include "rocketlauncher.h" -#include "weaponShotgun.h" +#include "RocketLauncher.h" +#include "WeaponShotgun.h" #include "../xrScripts/script_export_space.h" class CWeaponRG6 : public CRocketLauncher, diff --git a/src/xrGame/WeaponRG6_script.cpp b/src/xrGame/WeaponRG6_script.cpp index 91668dc531..d173c1e003 100644 --- a/src/xrGame/WeaponRG6_script.cpp +++ b/src/xrGame/WeaponRG6_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "WeaponRG6.h" diff --git a/src/xrGame/WeaponRPG7.cpp b/src/xrGame/WeaponRPG7.cpp index 4772a09e64..99b1eb9f73 100644 --- a/src/xrGame/WeaponRPG7.cpp +++ b/src/xrGame/WeaponRPG7.cpp @@ -1,13 +1,13 @@ -#include "stdafx.h" -#include "weaponrpg7.h" +#include "StdAfx.h" +#include "WeaponRPG7.h" #include "xrServer_Objects_ALife_Items.h" -#include "explosiverocket.h" -#include "entity.h" +#include "ExplosiveRocket.h" +#include "Entity.h" #include "Level.h" #include "player_hud.h" -#include "hudmanager.h" -#include "inventory.h" -#include "inventoryOwner.h" +#include "HUDManager.h" +#include "Inventory.h" +#include "InventoryOwner.h" CWeaponRPG7::CWeaponRPG7() { diff --git a/src/xrGame/WeaponRPG7.h b/src/xrGame/WeaponRPG7.h index 73384d1a19..89ccebfcc0 100644 --- a/src/xrGame/WeaponRPG7.h +++ b/src/xrGame/WeaponRPG7.h @@ -1,7 +1,7 @@ #pragma once -#include "weaponpistol.h" -#include "rocketlauncher.h" +#include "WeaponPistol.h" +#include "RocketLauncher.h" #include "../xrScripts/script_export_space.h" class CWeaponRPG7 : public CWeaponCustomPistol, diff --git a/src/xrGame/WeaponRPG7_script.cpp b/src/xrGame/WeaponRPG7_script.cpp index 843ea943cc..874cd26740 100644 --- a/src/xrGame/WeaponRPG7_script.cpp +++ b/src/xrGame/WeaponRPG7_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "WeaponRPG7.h" diff --git a/src/xrGame/WeaponSVD.cpp b/src/xrGame/WeaponSVD.cpp index 5c48e3da5c..99b5783a3c 100644 --- a/src/xrGame/WeaponSVD.cpp +++ b/src/xrGame/WeaponSVD.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "weaponsvd.h" +#include "WeaponSVD.h" CWeaponSVD::CWeaponSVD(void) {} diff --git a/src/xrGame/WeaponSVD.h b/src/xrGame/WeaponSVD.h index 54d0eb272c..455d5d280a 100644 --- a/src/xrGame/WeaponSVD.h +++ b/src/xrGame/WeaponSVD.h @@ -1,6 +1,6 @@ #pragma once -#include "weaponcustompistol.h" +#include "WeaponCustomPistol.h" #include "../xrScripts/script_export_space.h" class CWeaponSVD : diff --git a/src/xrGame/WeaponSVU.cpp b/src/xrGame/WeaponSVU.cpp index 76db8ccea6..9a8f79662c 100644 --- a/src/xrGame/WeaponSVU.cpp +++ b/src/xrGame/WeaponSVU.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "weaponsvu.h" +#include "WeaponSVU.h" CWeaponSVU::CWeaponSVU(void) {} diff --git a/src/xrGame/WeaponSVU.h b/src/xrGame/WeaponSVU.h index a784818bdf..d3be3ae348 100644 --- a/src/xrGame/WeaponSVU.h +++ b/src/xrGame/WeaponSVU.h @@ -1,6 +1,6 @@ #pragma once -#include "weaponcustompistol.h" +#include "WeaponCustomPistol.h" #include "../xrScripts/script_export_space.h" class CWeaponSVU : diff --git a/src/xrGame/WeaponShotgun.cpp b/src/xrGame/WeaponShotgun.cpp index ab97875abf..01dbd4115d 100644 --- a/src/xrGame/WeaponShotgun.cpp +++ b/src/xrGame/WeaponShotgun.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "script_game_object.h" -#include "weaponshotgun.h" -#include "entity.h" +#include "WeaponShotgun.h" +#include "Entity.h" #include "Inventory.h" #include "Level.h" #include "Actor.h" diff --git a/src/xrGame/WeaponShotgun.h b/src/xrGame/WeaponShotgun.h index 95242ad89b..ba1fac3569 100644 --- a/src/xrGame/WeaponShotgun.h +++ b/src/xrGame/WeaponShotgun.h @@ -1,6 +1,6 @@ #pragma once -#include "weaponcustompistol.h" +#include "WeaponCustomPistol.h" #include "../xrScripts/script_export_space.h" class CWeaponShotgun : public CWeaponCustomPistol diff --git a/src/xrGame/WeaponStatMgun.cpp b/src/xrGame/WeaponStatMgun.cpp index 2839dc23e2..1255b3a64c 100644 --- a/src/xrGame/WeaponStatMgun.cpp +++ b/src/xrGame/WeaponStatMgun.cpp @@ -1,13 +1,13 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "WeaponStatMgun.h" #include "../Include/xrRender/Kinematics.h" #include "../xrPhysics/PhysicsShell.h" -#include "weaponAmmo.h" +#include "WeaponAmmo.h" #include "object_broker.h" #include "../xrSound/ai_sounds.h" #include "Actor.h" -#include "actorEffector.h" -#include "camerafirsteye.h" +#include "ActorEffector.h" +#include "CameraFirstEye.h" #include "game_object_space.h" #include "Level.h" diff --git a/src/xrGame/WeaponStatMgun.h b/src/xrGame/WeaponStatMgun.h index 2b8edc7b17..ebea055d42 100644 --- a/src/xrGame/WeaponStatMgun.h +++ b/src/xrGame/WeaponStatMgun.h @@ -1,9 +1,9 @@ #pragma once #include "holder_custom.h" -#include "shootingobject.h" -#include "physicsshellholder.h" -#include "hudsound.h" +#include "ShootingObject.h" +#include "PhysicsShellHolder.h" +#include "HudSound.h" class CCartridge; class CCameraBase; diff --git a/src/xrGame/WeaponStatMgunFire.cpp b/src/xrGame/WeaponStatMgunFire.cpp index 30d560be62..a1d83d9004 100644 --- a/src/xrGame/WeaponStatMgunFire.cpp +++ b/src/xrGame/WeaponStatMgunFire.cpp @@ -1,10 +1,10 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "WeaponStatMgun.h" #include "Level.h" #include "entity_alive.h" -#include "hudsound.h" +#include "HudSound.h" #include "Actor.h" -#include "actorEffector.h" +#include "ActorEffector.h" #include "EffectorShot.h" #include "Weapon.h" diff --git a/src/xrGame/WeaponStatMgunIR.cpp b/src/xrGame/WeaponStatMgunIR.cpp index e37e83d281..b0b51580e1 100644 --- a/src/xrGame/WeaponStatMgunIR.cpp +++ b/src/xrGame/WeaponStatMgunIR.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "WeaponStatMgun.h" #include "../xrEngine/xr_level_controller.h" diff --git a/src/xrGame/WeaponUSP45.cpp b/src/xrGame/WeaponUSP45.cpp index a4a4e36300..a0a27f8e86 100644 --- a/src/xrGame/WeaponUSP45.cpp +++ b/src/xrGame/WeaponUSP45.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "weaponusp45.h" +#include "WeaponUSP45.h" CWeaponUSP45::CWeaponUSP45() {} diff --git a/src/xrGame/WeaponUSP45.h b/src/xrGame/WeaponUSP45.h index 39fa62b8b5..643eb0b8aa 100644 --- a/src/xrGame/WeaponUSP45.h +++ b/src/xrGame/WeaponUSP45.h @@ -1,6 +1,6 @@ #pragma once -#include "weaponpistol.h" +#include "WeaponPistol.h" #include "../xrScripts/script_export_space.h" class CWeaponUSP45 : diff --git a/src/xrGame/WeaponUpgrade.cpp b/src/xrGame/WeaponUpgrade.cpp index 6c601dd142..7b6096d83f 100644 --- a/src/xrGame/WeaponUpgrade.cpp +++ b/src/xrGame/WeaponUpgrade.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Weapon.h" static bool process_if_exists_deg2rad( LPCSTR section, LPCSTR name, float& value, bool test ) diff --git a/src/xrGame/WeaponVal.cpp b/src/xrGame/WeaponVal.cpp index f93b9185d5..55073c14e2 100644 --- a/src/xrGame/WeaponVal.cpp +++ b/src/xrGame/WeaponVal.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "weaponval.h" +#include "WeaponVal.h" CWeaponVal::CWeaponVal(void) : CWeaponMagazined(SOUND_TYPE_WEAPON_SUBMACHINEGUN) { diff --git a/src/xrGame/WeaponVal.h b/src/xrGame/WeaponVal.h index 0febf94928..5e5a78ec3f 100644 --- a/src/xrGame/WeaponVal.h +++ b/src/xrGame/WeaponVal.h @@ -1,6 +1,6 @@ #pragma once -#include "weaponmagazined.h" +#include "WeaponMagazined.h" #include "../xrScripts/script_export_space.h" class CWeaponVal : diff --git a/src/xrGame/WeaponVintorez.cpp b/src/xrGame/WeaponVintorez.cpp index 9353f9c8d8..30f6ea8323 100644 --- a/src/xrGame/WeaponVintorez.cpp +++ b/src/xrGame/WeaponVintorez.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "weaponvintorez.h" +#include "WeaponVintorez.h" CWeaponVintorez::CWeaponVintorez(void) : CWeaponMagazined(SOUND_TYPE_WEAPON_SNIPERRIFLE) {} diff --git a/src/xrGame/WeaponVintorez.h b/src/xrGame/WeaponVintorez.h index 1293c380cf..b1d3277258 100644 --- a/src/xrGame/WeaponVintorez.h +++ b/src/xrGame/WeaponVintorez.h @@ -1,6 +1,6 @@ #pragma once -#include "weaponmagazined.h" +#include "WeaponMagazined.h" #include "../xrScripts/script_export_space.h" class CWeaponVintorez : diff --git a/src/xrGame/WeaponWalther.cpp b/src/xrGame/WeaponWalther.cpp index e040145dfb..4b638a128b 100644 --- a/src/xrGame/WeaponWalther.cpp +++ b/src/xrGame/WeaponWalther.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "weaponwalther.h" +#include "WeaponWalther.h" CWeaponWalther::CWeaponWalther(void) {} diff --git a/src/xrGame/WeaponWalther.h b/src/xrGame/WeaponWalther.h index bce77041bb..8c9a1c8b50 100644 --- a/src/xrGame/WeaponWalther.h +++ b/src/xrGame/WeaponWalther.h @@ -1,6 +1,6 @@ #pragma once -#include "weaponpistol.h" +#include "WeaponPistol.h" #include "../xrScripts/script_export_space.h" class CWeaponWalther : diff --git a/src/xrGame/Wound.cpp b/src/xrGame/Wound.cpp index 1589cce853..6b928dc5f4 100644 --- a/src/xrGame/Wound.cpp +++ b/src/xrGame/Wound.cpp @@ -2,8 +2,8 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" -#include "wound.h" +#include "StdAfx.h" +#include "Wound.h" #include "../xrEngine/bone.h" CWound::CWound(u16 bone_num) diff --git a/src/xrGame/ZoneCampfire.cpp b/src/xrGame/ZoneCampfire.cpp index 9f7c8b295d..c2438e1ee5 100644 --- a/src/xrGame/ZoneCampfire.cpp +++ b/src/xrGame/ZoneCampfire.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "ZoneCampfire.h" #include "../xrParticles/stdafx.h" #include "../xrParticles/ParticlesObject.h" diff --git a/src/xrGame/ZoneVisual.cpp b/src/xrGame/ZoneVisual.cpp index 0d6856874f..c48c9d5cc1 100644 --- a/src/xrGame/ZoneVisual.cpp +++ b/src/xrGame/ZoneVisual.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "CustomZone.h" //#include "../Include/xrRender/KinematicsAnimated.h" #include "../Include/xrRender/KinematicsAnimated.h" #include "ZoneVisual.h" #include "xrServer_Objects_ALife_Monsters.h" //#include "../Include/xrRender/KinematicsAnimated.h" -#include "../Include//xrRender/RenderVisual.h" +#include "../Include/xrRender/RenderVisual.h" CVisualZone::CVisualZone () { } diff --git a/src/xrGame/ZudaArtifact.cpp b/src/xrGame/ZudaArtifact.cpp index 47d524b276..6bdbbafd3c 100644 --- a/src/xrGame/ZudaArtifact.cpp +++ b/src/xrGame/ZudaArtifact.cpp @@ -3,7 +3,7 @@ // ZudaArtefact - артефакт "зуда" /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ZudaArtifact.h" #include "../xrPhysics/PhysicsShell.h" diff --git a/src/xrGame/account_manager.cpp b/src/xrGame/account_manager.cpp index 44b877a73b..bb84cda37b 100644 --- a/src/xrGame/account_manager.cpp +++ b/src/xrGame/account_manager.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "account_manager.h" #include "gamespy/GameSpy_GP.h" diff --git a/src/xrGame/account_manager.h b/src/xrGame/account_manager.h index 8d1d685d08..3ce15509fd 100644 --- a/src/xrGame/account_manager.h +++ b/src/xrGame/account_manager.h @@ -2,7 +2,7 @@ #define ACCOUNT_MANAGER #include "mixed_delegate.h" -#include "GameSpy/GameSpy_FuncDefs.h" +#include "gamespy/GameSpy_FuncDefs.h" #include "../xrScripts/script_export_space.h" #include "queued_async_method.h" diff --git a/src/xrGame/account_manager_console.cpp b/src/xrGame/account_manager_console.cpp index 24d31c5877..e9efd8f863 100644 --- a/src/xrGame/account_manager_console.cpp +++ b/src/xrGame/account_manager_console.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "account_manager_console.h" #include "gamespy/GameSpy_Full.h" #include "gamespy/GameSpy_GP.h" diff --git a/src/xrGame/account_manager_console.h b/src/xrGame/account_manager_console.h index 737ac06b4b..284f2778de 100644 --- a/src/xrGame/account_manager_console.h +++ b/src/xrGame/account_manager_console.h @@ -1,7 +1,7 @@ #ifndef ACCOUNT_MANAGER_CONSOLE #define ACCOUNT_MANAGER_CONSOLE -#include "../xrEngine/xr_ioconsole.h" +#include "../xrEngine/XR_IOConsole.h" #include "../xrEngine/xr_ioc_cmd.h" class CCC_CreateGameSpyAccount : public IConsole_Command diff --git a/src/xrGame/account_manager_script.cpp b/src/xrGame/account_manager_script.cpp index ddd0d40512..3783b910cb 100644 --- a/src/xrGame/account_manager_script.cpp +++ b/src/xrGame/account_manager_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "account_manager.h" using namespace luabind; diff --git a/src/xrGame/action_base_script.cpp b/src/xrGame/action_base_script.cpp index 5c56956cf9..9e6080cd98 100644 --- a/src/xrGame/action_base_script.cpp +++ b/src/xrGame/action_base_script.cpp @@ -6,7 +6,7 @@ // Description : Base action script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_action_wrapper.h" #include "script_game_object.h" diff --git a/src/xrGame/action_planner_action_script.cpp b/src/xrGame/action_planner_action_script.cpp index ad25d1afb2..cb9e1ed539 100644 --- a/src/xrGame/action_planner_action_script.cpp +++ b/src/xrGame/action_planner_action_script.cpp @@ -6,7 +6,7 @@ // Description : Action planner action script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_action_planner_action_wrapper.h" #include "script_game_object.h" diff --git a/src/xrGame/action_planner_script.cpp b/src/xrGame/action_planner_script.cpp index 0102d1a04f..327ab8ba6a 100644 --- a/src/xrGame/action_planner_script.cpp +++ b/src/xrGame/action_planner_script.cpp @@ -6,7 +6,7 @@ // Description : Action planner script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_action_planner_wrapper.h" #include "script_game_object.h" diff --git a/src/xrGame/actor_communication.cpp b/src/xrGame/actor_communication.cpp index 3979569440..18aee55d19 100644 --- a/src/xrGame/actor_communication.cpp +++ b/src/xrGame/actor_communication.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "Actor.h" #include "UIGameSP.h" @@ -22,9 +22,9 @@ #include "ui/UITalkWnd.h" #include "game_object_space.h" #include "encyclopedia_article.h" -#include "GameTaskManager.h" -#include "GameTaskdefs.h" -#include "infoportion.h" +#include "GametaskManager.h" +#include "GameTaskDefs.h" +#include "InfoPortion.h" #include "Inventory.h" #include "CustomDetector.h" #include "ai/monsters/basemonster/base_monster.h" diff --git a/src/xrGame/actor_input_handler.cpp b/src/xrGame/actor_input_handler.cpp index 5afa2cb112..0f3329d907 100644 --- a/src/xrGame/actor_input_handler.cpp +++ b/src/xrGame/actor_input_handler.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "actor_input_handler.h" #include "Actor.h" #include "Level.h" diff --git a/src/xrGame/actor_memory.cpp b/src/xrGame/actor_memory.cpp index 37b1ab12e9..7ae11bdbfe 100644 --- a/src/xrGame/actor_memory.cpp +++ b/src/xrGame/actor_memory.cpp @@ -6,11 +6,11 @@ // Description : actor memory //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "actor_memory.h" #include "Actor.h" -#include "../xrEngine/camerabase.h" -#include "gamepersistent.h" +#include "../xrEngine/CameraBase.h" +#include "GamePersistent.h" CActorMemory::CActorMemory (CActor *actor) : inherited ( diff --git a/src/xrGame/actor_mp_client.cpp b/src/xrGame/actor_mp_client.cpp index 2751b512eb..decb0159c3 100644 --- a/src/xrGame/actor_mp_client.cpp +++ b/src/xrGame/actor_mp_client.cpp @@ -1,13 +1,13 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "actor_mp_client.h" -#include "actorcondition.h" +#include "ActorCondition.h" #include "../xrEngine/CameraBase.h" #include "../xrEngine/CameraManager.h" #include "game_cl_base.h" #include "ui/UIActorMenu.h" #include "ui/UIDragDropReferenceList.h" -#include "uigamecustom.h" +#include "UIGameCustom.h" #include "eatable_item.h" //if we are not current control entity we use this value diff --git a/src/xrGame/actor_mp_client_export.cpp b/src/xrGame/actor_mp_client_export.cpp index 591bb7309c..14ed8f1a29 100644 --- a/src/xrGame/actor_mp_client_export.cpp +++ b/src/xrGame/actor_mp_client_export.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "actor_mp_client.h" #include "CharacterPhysicsSupport.h" #include "Inventory.h" diff --git a/src/xrGame/actor_mp_client_import.cpp b/src/xrGame/actor_mp_client_import.cpp index a6be2676bd..db549f7944 100644 --- a/src/xrGame/actor_mp_client_import.cpp +++ b/src/xrGame/actor_mp_client_import.cpp @@ -1,10 +1,10 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "actor_mp_client.h" #include "Inventory.h" #include "Level.h" #include "GamePersistent.h" #include "game_cl_base.h" -#include "../xrEngine/camerabase.h" +#include "../xrEngine/CameraBase.h" //#include "Physics.h" #include "../xrPhysics/phvalide.h" diff --git a/src/xrGame/actor_mp_server.cpp b/src/xrGame/actor_mp_server.cpp index bcde9af01d..3aa9c2bb3e 100644 --- a/src/xrGame/actor_mp_server.cpp +++ b/src/xrGame/actor_mp_server.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "actor_mp_server.h" CSE_ActorMP::CSE_ActorMP (LPCSTR section) : diff --git a/src/xrGame/actor_mp_server_export.cpp b/src/xrGame/actor_mp_server_export.cpp index d9330e30f7..5e14d9c3cd 100644 --- a/src/xrGame/actor_mp_server_export.cpp +++ b/src/xrGame/actor_mp_server_export.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "actor_mp_server.h" //#include "Physics.h" //#include "mathutils.h" diff --git a/src/xrGame/actor_mp_server_import.cpp b/src/xrGame/actor_mp_server_import.cpp index c5a0f4ef33..499594d440 100644 --- a/src/xrGame/actor_mp_server_import.cpp +++ b/src/xrGame/actor_mp_server_import.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "actor_mp_server.h" //#include "Physics.h" //#include "mathutils.h" diff --git a/src/xrGame/actor_mp_state.cpp b/src/xrGame/actor_mp_state.cpp index 03bbbe7dcc..502891cd0e 100644 --- a/src/xrGame/actor_mp_state.cpp +++ b/src/xrGame/actor_mp_state.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "actor_mp_state.h" #define USE_LOGIC_ACCELERATION diff --git a/src/xrGame/actor_script.cpp b/src/xrGame/actor_script.cpp index 1e49a2f443..e873b89e4c 100644 --- a/src/xrGame/actor_script.cpp +++ b/src/xrGame/actor_script.cpp @@ -6,7 +6,7 @@ // Description : actor script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "Actor.h" #include "level_changer.h" diff --git a/src/xrGame/actor_statistic_mgr.cpp b/src/xrGame/actor_statistic_mgr.cpp index 220758b221..c74ec76a4c 100644 --- a/src/xrGame/actor_statistic_mgr.cpp +++ b/src/xrGame/actor_statistic_mgr.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "actor_statistic_mgr.h" #include "alife_registry_wrappers.h" #include "alife_simulator_header.h" diff --git a/src/xrGame/agent_corpse_manager.cpp b/src/xrGame/agent_corpse_manager.cpp index 89c7490c56..d37034a934 100644 --- a/src/xrGame/agent_corpse_manager.cpp +++ b/src/xrGame/agent_corpse_manager.cpp @@ -6,7 +6,7 @@ // Description : Agent corpse manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "agent_corpse_manager.h" #include "member_order.h" #include "ai/stalker/ai_stalker.h" diff --git a/src/xrGame/agent_enemy_manager.cpp b/src/xrGame/agent_enemy_manager.cpp index 2b476c247e..3952a8861e 100644 --- a/src/xrGame/agent_enemy_manager.cpp +++ b/src/xrGame/agent_enemy_manager.cpp @@ -6,7 +6,7 @@ // Description : Agent enemy manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "agent_enemy_manager.h" #include "agent_manager.h" diff --git a/src/xrGame/agent_explosive_manager.cpp b/src/xrGame/agent_explosive_manager.cpp index 6e22cf2c87..b35b522089 100644 --- a/src/xrGame/agent_explosive_manager.cpp +++ b/src/xrGame/agent_explosive_manager.cpp @@ -6,13 +6,13 @@ // Description : Agent explosive manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "agent_explosive_manager.h" #include "agent_manager.h" #include "agent_location_manager.h" #include "agent_member_manager.h" -#include "missile.h" -#include "explosive.h" +#include "Missile.h" +#include "Explosive.h" #include "member_order.h" #include "ai/stalker/ai_stalker.h" #include "memory_manager.h" diff --git a/src/xrGame/agent_location_manager.cpp b/src/xrGame/agent_location_manager.cpp index 1d9d335dcd..31c453ea8e 100644 --- a/src/xrGame/agent_location_manager.cpp +++ b/src/xrGame/agent_location_manager.cpp @@ -6,7 +6,7 @@ // Description : Agent location manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "agent_location_manager.h" #include "agent_manager.h" #include "agent_member_manager.h" diff --git a/src/xrGame/agent_manager.cpp b/src/xrGame/agent_manager.cpp index addd754d4e..ba73cc42ec 100644 --- a/src/xrGame/agent_manager.cpp +++ b/src/xrGame/agent_manager.cpp @@ -6,7 +6,7 @@ // Description : Agent manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "agent_manager.h" #include "agent_corpse_manager.h" #include "agent_enemy_manager.h" diff --git a/src/xrGame/agent_member_manager.cpp b/src/xrGame/agent_member_manager.cpp index 140aabea41..48c03dbca1 100644 --- a/src/xrGame/agent_member_manager.cpp +++ b/src/xrGame/agent_member_manager.cpp @@ -6,16 +6,16 @@ // Description : Agent member manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "agent_member_manager.h" #include "ai/stalker/ai_stalker.h" #include "object_broker.h" #include "agent_manager.h" #include "agent_memory_manager.h" -#include "explosive.h" +#include "Explosive.h" #include "sound_player.h" #include "cover_point.h" -#include "grenade.h" +#include "Grenade.h" class CMemberPredicate2 { protected: diff --git a/src/xrGame/agent_memory_manager.cpp b/src/xrGame/agent_memory_manager.cpp index 85f6d73673..5e93a2ba6f 100644 --- a/src/xrGame/agent_memory_manager.cpp +++ b/src/xrGame/agent_memory_manager.cpp @@ -6,7 +6,7 @@ // Description : Agent memory manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "agent_memory_manager.h" #include "agent_manager.h" #include "agent_member_manager.h" diff --git a/src/xrGame/ai/ai_monsters_misc.cpp b/src/xrGame/ai/ai_monsters_misc.cpp index 96c13b95d7..cbb9101fc3 100644 --- a/src/xrGame/ai/ai_monsters_misc.cpp +++ b/src/xrGame/ai/ai_monsters_misc.cpp @@ -10,7 +10,7 @@ #include "pch_script.h" #include "ai_monsters_misc.h" #include "../ai_space.h" -#include "../custommonster.h" +#include "../CustomMonster.h" #include "../ef_storage.h" #include "../seniority_hierarchy_holder.h" #include "../team_hierarchy_holder.h" @@ -22,7 +22,7 @@ #include "../ef_pattern.h" #include "../memory_manager.h" #include "../enemy_manager.h" -#include "../level.h" +#include "../Level.h" #include "../agent_manager.h" #include "../agent_member_manager.h" #include "stalker/ai_stalker.h" diff --git a/src/xrGame/ai/crow/ai_crow.cpp b/src/xrGame/ai/crow/ai_crow.cpp index 00b2ded989..6a5d2c57ef 100644 --- a/src/xrGame/ai/crow/ai_crow.cpp +++ b/src/xrGame/ai/crow/ai_crow.cpp @@ -8,14 +8,14 @@ #include "stdafx.h" #include "pch_script.h" -#include "../../../xrPhysics/physicsshell.h" +#include "../../../xrPhysics/PhysicsShell.h" #include "../../../xrPhysics/phvalide.h" #include "ai_crow.h" -#include "../../level.h" +#include "../../Level.h" #include "../../../Include/xrRender/RenderVisual.h" #include "../../../Include/xrRender/Kinematics.h" #include "../../../Include/xrRender/KinematicsAnimated.h" -#include "../../actor.h" +#include "../../Actor.h" #include "game_object_space.h" #include "script_game_object.h" #include "Hit.h" diff --git a/src/xrGame/ai/monsters/ai_monster_defs.h b/src/xrGame/ai/monsters/ai_monster_defs.h index 5bbed2c75f..a4f1c39517 100644 --- a/src/xrGame/ai/monsters/ai_monster_defs.h +++ b/src/xrGame/ai/monsters/ai_monster_defs.h @@ -1,7 +1,7 @@ #pragma once #include "../../../Include/xrRender/KinematicsAnimated.h" -#include "../../../xrEngine/cameramanager.h" +#include "../../../xrEngine/CameraManager.h" typedef u32 TTime; diff --git a/src/xrGame/ai/monsters/ai_monster_motion_stats.cpp b/src/xrGame/ai/monsters/ai_monster_motion_stats.cpp index 369f308bdb..7f80c5bd58 100644 --- a/src/xrGame/ai/monsters/ai_monster_motion_stats.cpp +++ b/src/xrGame/ai/monsters/ai_monster_motion_stats.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ai_monster_motion_stats.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" void CMotionStats::update() { diff --git a/src/xrGame/ai/monsters/ai_monster_squad.cpp b/src/xrGame/ai/monsters/ai_monster_squad.cpp index f44dc1f240..8c1fdfdbc5 100644 --- a/src/xrGame/ai/monsters/ai_monster_squad.cpp +++ b/src/xrGame/ai/monsters/ai_monster_squad.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ai_monster_squad.h" -#include "../../entity.h" +#include "../../Entity.h" #include "../../entity_alive.h" #include "../../memory_manager.h" diff --git a/src/xrGame/ai/monsters/ai_monster_squad_attack.cpp b/src/xrGame/ai/monsters/ai_monster_squad_attack.cpp index 250f892040..3423ac5b30 100644 --- a/src/xrGame/ai/monsters/ai_monster_squad_attack.cpp +++ b/src/xrGame/ai/monsters/ai_monster_squad_attack.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "ai_monster_squad.h" -#include "../../entity.h" +#include "../../Entity.h" #include "../../entity_alive.h" -#include "../monsters/basemonster/base_monster.h " +#include "basemonster/base_monster.h" #include "monster_home.h" void CMonsterSquad::ProcessAttack() diff --git a/src/xrGame/ai/monsters/ai_monster_squad_manager.cpp b/src/xrGame/ai/monsters/ai_monster_squad_manager.cpp index 4323d12881..ea6b38f93c 100644 --- a/src/xrGame/ai/monsters/ai_monster_squad_manager.cpp +++ b/src/xrGame/ai/monsters/ai_monster_squad_manager.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ai_monster_squad_manager.h" #include "ai_monster_squad.h" -#include "../../entity.h" +#include "../../Entity.h" ////////////////////////////////////////////////////////////////////////// // SQUAD MANAGER Implementation diff --git a/src/xrGame/ai/monsters/ai_monster_squad_rest.cpp b/src/xrGame/ai/monsters/ai_monster_squad_rest.cpp index cf73908d99..971bc5ab2c 100644 --- a/src/xrGame/ai/monsters/ai_monster_squad_rest.cpp +++ b/src/xrGame/ai/monsters/ai_monster_squad_rest.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ai_monster_squad.h" -#include "../../entity.h" +#include "../../Entity.h" #include "../../ai_object_location.h" void CMonsterSquad::ProcessIdle() diff --git a/src/xrGame/ai/monsters/ai_monster_utils.cpp b/src/xrGame/ai/monsters/ai_monster_utils.cpp index 6c3d18ce77..d94f9199c0 100644 --- a/src/xrGame/ai/monsters/ai_monster_utils.cpp +++ b/src/xrGame/ai/monsters/ai_monster_utils.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ai_monster_utils.h" -#include "../../entity.h" +#include "../../Entity.h" #include "../../ai_object_location.h" #include "../../ai_space.h" #include "../../level_graph.h" diff --git a/src/xrGame/ai/monsters/anomaly_detector.cpp b/src/xrGame/ai/monsters/anomaly_detector.cpp index 3dda9b4642..d0febeb398 100644 --- a/src/xrGame/ai/monsters/anomaly_detector.cpp +++ b/src/xrGame/ai/monsters/anomaly_detector.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "anomaly_detector.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "../../restricted_object.h" -#include "../../customzone.h" -#include "../../level.h" +#include "../../CustomZone.h" +#include "../../Level.h" #include "../../space_restriction_manager.h" CAnomalyDetector::CAnomalyDetector(CBaseMonster *monster) : m_object(monster) diff --git a/src/xrGame/ai/monsters/basemonster/base_monster.cpp b/src/xrGame/ai/monsters/basemonster/base_monster.cpp index 396a82cd00..beef39479f 100644 --- a/src/xrGame/ai/monsters/basemonster/base_monster.cpp +++ b/src/xrGame/ai/monsters/basemonster/base_monster.cpp @@ -1,29 +1,29 @@ #include "stdafx.h" #include "base_monster.h" #include "../../../../xrPhysics/PhysicsShell.h" -#include "../../../hit.h" +#include "../../../Hit.h" #include "../../../PHDestroyable.h" #include "../../../CharacterPhysicsSupport.h" #include "../../../game_level_cross_table.h" #include "../../../game_graph.h" -#include "../../../phmovementcontrol.h" +#include "../../../PHMovementControl.h" #include "../ai_monster_squad_manager.h" -#include "../../../../xrServerEntities/xrserver_objects_alife_monsters.h" +#include "../../../../xrServerEntities/xrServer_Objects_ALife_Monsters.h" #include "../corpse_cover.h" #include "../../../cover_evaluators.h" #include "../../../seniority_hierarchy_holder.h" #include "../../../team_hierarchy_holder.h" #include "../../../squad_hierarchy_holder.h" #include "../../../group_hierarchy_holder.h" -#include "../../../phdestroyable.h" +#include "../../../PHDestroyable.h" #include "../../../../Include/xrRender/KinematicsAnimated.h" #include "../../../detail_path_manager.h" #include "../../../memory_manager.h" #include "../../../visual_memory_manager.h" #include "../monster_velocity_space.h" -#include "../../../entitycondition.h" +#include "../../../EntityCondition.h" #include "../../../sound_player.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../state_manager.h" #include "../controlled_entity.h" #include "../control_animation_base.h" @@ -33,10 +33,10 @@ #include "../anomaly_detector.h" #include "../monster_cover_manager.h" #include "../monster_home.h" -#include "../../../inventory.h" -#include "../../../xrserver.h" +#include "../../../Inventory.h" +#include "../../../xrServer.h" #include "../ai_monster_squad.h" -#include "../../../actor.h" +#include "../../../Actor.h" #include "../../../ai_object_location.h" #include "../../../ai_space.h" #include "../../../../xrScripts/script_engine.h" diff --git a/src/xrGame/ai/monsters/basemonster/base_monster.h b/src/xrGame/ai/monsters/basemonster/base_monster.h index 85a232b89f..b38c9b3eb9 100644 --- a/src/xrGame/ai/monsters/basemonster/base_monster.h +++ b/src/xrGame/ai/monsters/basemonster/base_monster.h @@ -25,8 +25,8 @@ #include "../monster_sound_defs.h" #include "../monster_aura.h" -#include "../../../inventoryowner.h" -#include "../../../../xrphysics/PHCharacter.h" +#include "../../../InventoryOwner.h" +#include "../../../../xrPhysics/PHCharacter.h" #include "../xrServerEntities/xrServer_Objects_ALife_Monsters.h" diff --git a/src/xrGame/ai/monsters/basemonster/base_monster_debug.cpp b/src/xrGame/ai/monsters/basemonster/base_monster_debug.cpp index ffaaa47dff..ba20b48f71 100644 --- a/src/xrGame/ai/monsters/basemonster/base_monster_debug.cpp +++ b/src/xrGame/ai/monsters/basemonster/base_monster_debug.cpp @@ -1,15 +1,15 @@ #include "stdafx.h" #include "pch_script.h" #include "base_monster.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../../../level_debug.h" -#include "../../../entitycondition.h" +#include "../../../EntityCondition.h" #include "../../../ai_debug.h" #include "../state_defs.h" #include "../state_manager.h" -#include "../../../phmovementcontrol.h" -#include "../../../characterphysicssupport.h" -#include "../../../actor.h" +#include "../../../PHMovementControl.h" +#include "../../../CharacterPhysicsSupport.h" +#include "../../../Actor.h" // Lain: added #include "../../../debug_text_tree.h" @@ -18,8 +18,8 @@ #include "../../../sound_memory_manager.h" #include "../../../hit_memory_manager.h" #include "../../../actor_memory.h" -#include "../../../inventory.h" -#include "../../../weapon.h" +#include "../../../Inventory.h" +#include "../../../Weapon.h" #include "../../../ai_object_location.h" #include "../../../movement_manager_space.h" #include "../control_animation_base.h" diff --git a/src/xrGame/ai/monsters/basemonster/base_monster_feel.cpp b/src/xrGame/ai/monsters/basemonster/base_monster_feel.cpp index 32e25c2a0a..d76b0cb0c6 100644 --- a/src/xrGame/ai/monsters/basemonster/base_monster_feel.cpp +++ b/src/xrGame/ai/monsters/basemonster/base_monster_feel.cpp @@ -9,12 +9,12 @@ #include "stdafx.h" #include "pch_script.h" #include "base_monster.h" -#include "../../../actor.h" +#include "../../../Actor.h" #include "../../../ActorEffector.h" #include "../ai_monster_effector.h" #include "../../../../Include/xrRender/KinematicsAnimated.h" #include "../../../sound_player.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../../../script_game_object.h" #include "../../../game_object_space.h" #include "../../../ai_monster_space.h" diff --git a/src/xrGame/ai/monsters/basemonster/base_monster_misc.cpp b/src/xrGame/ai/monsters/basemonster/base_monster_misc.cpp index 9dff35e2d2..6f465edf04 100644 --- a/src/xrGame/ai/monsters/basemonster/base_monster_misc.cpp +++ b/src/xrGame/ai/monsters/basemonster/base_monster_misc.cpp @@ -8,7 +8,7 @@ #include "stdafx.h" #include "base_monster.h" -#include "../../../entitycondition.h" +#include "../../../EntityCondition.h" //////////////////////////////////////////////////////////////////////////////////////////////////////// // Входные воздействия diff --git a/src/xrGame/ai/monsters/basemonster/base_monster_net.cpp b/src/xrGame/ai/monsters/basemonster/base_monster_net.cpp index 4de6a944d6..ad86448411 100644 --- a/src/xrGame/ai/monsters/basemonster/base_monster_net.cpp +++ b/src/xrGame/ai/monsters/basemonster/base_monster_net.cpp @@ -4,15 +4,15 @@ #include "../../../ai_object_location.h" #include "../../../game_graph.h" #include "../../../ai_space.h" -#include "../../../hit.h" +#include "../../../Hit.h" #include "../../../PHDestroyable.h" #include "../../../CharacterPhysicsSupport.h" #include "../control_animation_base.h" #include "../xrPhysics/net_physics_state.h" -#include "../../../../xrphysics/iPHWorld.h" +#include "../../../../xrPhysics/IPHWorld.h" #include "../../../PHMovementControl.h" -#include "../../../../xrphysics/PhysicsShell.h" +#include "../../../../xrPhysics/PhysicsShell.h" #include "../../../sound_player.h" extern int g_cl_InterpolationType; diff --git a/src/xrGame/ai/monsters/basemonster/base_monster_script.cpp b/src/xrGame/ai/monsters/basemonster/base_monster_script.cpp index 5499f6f75e..c1b96f651b 100644 --- a/src/xrGame/ai/monsters/basemonster/base_monster_script.cpp +++ b/src/xrGame/ai/monsters/basemonster/base_monster_script.cpp @@ -2,7 +2,7 @@ #include "pch_script.h" #include "base_monster.h" #include "../../../script_entity_action.h" -#include "../../../phmovementcontrol.h" +#include "../../../PHMovementControl.h" #include "../../../sight_manager.h" #include "../../../detail_path_manager.h" #include "../../../ai_object_location.h" @@ -11,7 +11,7 @@ #include "../state_manager.h" #include "../../../ai_debug.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../../../level_debug.h" #include "../control_animation_base.h" @@ -28,7 +28,7 @@ #include "../../../alife_group_registry.h" #include "../../../alife_object_registry.h" #include "../../../../xrCore/_vector3d_ext.h" -#include "../../../../xrServerEntities/xrServer_Objects_Alife_Monsters.h" +#include "../../../../xrServerEntities/xrServer_Objects_ALife_Monsters.h" using namespace MonsterSpace; using namespace MonsterSound; diff --git a/src/xrGame/ai/monsters/basemonster/base_monster_startup.cpp b/src/xrGame/ai/monsters/basemonster/base_monster_startup.cpp index fd93c09dc6..e1301f1655 100644 --- a/src/xrGame/ai/monsters/basemonster/base_monster_startup.cpp +++ b/src/xrGame/ai/monsters/basemonster/base_monster_startup.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "base_monster.h" #include "../../../ai_space.h" -#include "../../../hit.h" +#include "../../../Hit.h" #include "../../../PHDestroyable.h" #include "../../../CharacterPhysicsSupport.h" -#include "../../../phmovementcontrol.h" +#include "../../../PHMovementControl.h" #include "../ai_monster_squad_manager.h" #include "../../../../Include/xrRender/KinematicsAnimated.h" #include "../../../detail_path_manager.h" @@ -19,14 +19,14 @@ #include "../monster_cover_manager.h" #include "../monster_home.h" #include "../../../ai_object_location.h" -#include "../../../level.h" -#include "../../../../xrServerEntities/xrserver_objects_alife_monsters.h" +#include "../../../Level.h" +#include "../../../../xrServerEntities/xrServer_Objects_ALife_Monsters.h" #include "../../../alife_simulator.h" #include "../../../alife_object_registry.h" #include "../../../xrServer.h" #include "../../../inventory_item.h" -#include "../../../../xrServerEntities/xrServer_objects_ALife.h" -#include "../../../phMovementControl.h" +#include "../../../../xrServerEntities/xrServer_Objects_ALife.h" +#include "../../../PHMovementControl.h" #include "../ai_monster_squad.h" #include "../control_movement_base.h" #include "../control_animation_base.h" diff --git a/src/xrGame/ai/monsters/basemonster/base_monster_think.cpp b/src/xrGame/ai/monsters/basemonster/base_monster_think.cpp index a724d4bec9..a76560c0e1 100644 --- a/src/xrGame/ai/monsters/basemonster/base_monster_think.cpp +++ b/src/xrGame/ai/monsters/basemonster/base_monster_think.cpp @@ -6,7 +6,7 @@ #include "../../../../xrPhysics/PhysicsShell.h" #include "../../../detail_path_manager.h" #include "../monster_velocity_space.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../control_animation_base.h" void CBaseMonster::Think() diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker.cpp b/src/xrGame/ai/monsters/bloodsucker/bloodsucker.cpp index e338bc29f7..b318140c10 100644 --- a/src/xrGame/ai/monsters/bloodsucker/bloodsucker.cpp +++ b/src/xrGame/ai/monsters/bloodsucker/bloodsucker.cpp @@ -1,16 +1,16 @@ #include "stdafx.h" #include "bloodsucker.h" #include "bloodsucker_state_manager.h" -#include "../../../actor.h" +#include "../../../Actor.h" #include "../../../ActorEffector.h" #include "../../../../Include/xrRender/KinematicsAnimated.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../../../material_manager.h" #include "bloodsucker_vampire_effector.h" #include "../../../detail_path_manager.h" #include "../../../level_debug.h" #include "../monster_velocity_space.h" -#include "../../../gamepersistent.h" +#include "../../../GamePersistent.h" #include "../../../game_object_space.h" #include "../control_animation_base.h" @@ -18,7 +18,7 @@ #include "../control_rotation_jump.h" #include "../../../sound_player.h" -#include "../../../../xrEngine/camerabase.h" +#include "../../../../xrEngine/CameraBase.h" #include "../../../../xrEngine/xr_level_controller.h" #include "../../../ActorCondition.h" @@ -1008,7 +1008,7 @@ void CAI_Bloodsucker::sendToStopVampire() Level().Server->SendTo(xrCData->ID, tmp_packet, net_flags(TRUE, TRUE)); } -#include "../../../HudManager.h" +#include "../../../HUDManager.h" void CAI_Bloodsucker::OnEvent(NET_Packet& P, u16 type) { inherited::OnEvent(P, type); diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker.h index 0f0534a09d..58dd5fe3a4 100644 --- a/src/xrGame/ai/monsters/bloodsucker/bloodsucker.h +++ b/src/xrGame/ai/monsters/bloodsucker/bloodsucker.h @@ -1,6 +1,6 @@ #pragma once -#include "../BaseMonster/base_monster.h" +#include "../basemonster/base_monster.h" #include "../ai_monster_bones.h" #include "../controlled_entity.h" #include "../controlled_actor.h" diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_alien.cpp b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_alien.cpp index a3ba988e5b..c2ea11664f 100644 --- a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_alien.cpp +++ b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_alien.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "bloodsucker_alien.h" #include "bloodsucker.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../../../Actor.h" #include "../../../ActorEffector.h" -#include "../../../inventory.h" +#include "../../../Inventory.h" #include "../../../HudItem.h" #include "../../../../xrEngine/CustomHUD.h" diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_attack_state_hide_inline.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_attack_state_hide_inline.h index aba45d629e..70545e4197 100644 --- a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_attack_state_hide_inline.h +++ b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_attack_state_hide_inline.h @@ -9,7 +9,7 @@ #include "../monster_cover_manager.h" #include "../monster_home.h" -#include "../../../actor.h" +#include "../../../Actor.h" #include "../../../actor_memory.h" #include "../../../visual_memory_manager.h" diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_predator_inline.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_predator_inline.h index 19119c53af..e7968b1875 100644 --- a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_predator_inline.h +++ b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_predator_inline.h @@ -7,7 +7,7 @@ #include "../monster_cover_manager.h" #include "../monster_home.h" -#include "../../../actor.h" +#include "../../../Actor.h" #include "../../../actor_memory.h" #include "../../../visual_memory_manager.h" diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_predator_lite_inline.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_predator_lite_inline.h index acc8848ad4..7f07590a91 100644 --- a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_predator_lite_inline.h +++ b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_predator_lite_inline.h @@ -7,7 +7,7 @@ #include "../monster_cover_manager.h" #include "../monster_home.h" -#include "../../../actor.h" +#include "../../../Actor.h" #include "../../../actor_memory.h" #include "../../../visual_memory_manager.h" diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire_effector.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire_effector.h index b2be644529..30f3f7c960 100644 --- a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire_effector.h +++ b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire_effector.h @@ -1,8 +1,8 @@ #pragma once -#include "../../../../xrEngine/effectorPP.h" +#include "../../../../xrEngine/EffectorPP.h" #include "../../../CameraEffector.h" -#include "../../../../xrEngine/cameramanager.h" +#include "../../../../xrEngine/CameraManager.h" class CVampirePPEffector : public CEffectorPP { typedef CEffectorPP inherited; diff --git a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire_execute_inline.h b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire_execute_inline.h index bfc8840cf7..b409d7a292 100644 --- a/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire_execute_inline.h +++ b/src/xrGame/ai/monsters/bloodsucker/bloodsucker_vampire_execute_inline.h @@ -1,12 +1,12 @@ #pragma once #include "../../../../Include/xrRender/KinematicsAnimated.h" -#include "../../../actor.h" +#include "../../../Actor.h" #include "../../../../xrEngine/CameraBase.h" // #include "../../../../xrEngine/CameraBase.h" //#include "../../../ActorCondition.h" -#include "../../../HudManager.h" +#include "../../../HUDManager.h" #define TEMPLATE_SPECIALIZATION template <\ typename _Object\ diff --git a/src/xrGame/ai/monsters/boar/boar.h b/src/xrGame/ai/monsters/boar/boar.h index 8dc055f29b..ec001fe7db 100644 --- a/src/xrGame/ai/monsters/boar/boar.h +++ b/src/xrGame/ai/monsters/boar/boar.h @@ -1,6 +1,6 @@ #pragma once -#include "../BaseMonster/base_monster.h" +#include "../basemonster/base_monster.h" #include "../controlled_entity.h" #include "../../../../xrScripts/script_export_space.h" diff --git a/src/xrGame/ai/monsters/burer/burer.cpp b/src/xrGame/ai/monsters/burer/burer.cpp index 8a47737de7..eb41f2de4d 100644 --- a/src/xrGame/ai/monsters/burer/burer.cpp +++ b/src/xrGame/ai/monsters/burer/burer.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include "burer.h" #include "../../../../xrPhysics/PhysicsShell.h" -#include "../../../characterphysicssupport.h" -#include "../../../actor.h" +#include "../../../CharacterPhysicsSupport.h" +#include "../../../Actor.h" #include "burer_state_manager.h" #include "../../../../Include/xrRender/KinematicsAnimated.h" #include "../../../sound_player.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../../../ai_monster_space.h" #include "../../../level_debug.h" #include "../monster_velocity_space.h" @@ -20,7 +20,7 @@ #include "../../../Inventory.h" #include "../../../ActorCondition.h" #include "../../../../xrEngine/xr_level_controller.h" -#include "../../../weapon.h" +#include "../../../Weapon.h" #include "../../../../xrCore/_vector3d_ext.h" #include "../control_direction_base.h" diff --git a/src/xrGame/ai/monsters/burer/burer.h b/src/xrGame/ai/monsters/burer/burer.h index 386dd55375..746e7c92b8 100644 --- a/src/xrGame/ai/monsters/burer/burer.h +++ b/src/xrGame/ai/monsters/burer/burer.h @@ -1,5 +1,5 @@ #pragma once -#include "../BaseMonster/base_monster.h" +#include "../basemonster/base_monster.h" #include "../telekinesis.h" #include "../anim_triple.h" #include "../scanning_ability.h" diff --git a/src/xrGame/ai/monsters/burer/burer_state_attack_tele.h b/src/xrGame/ai/monsters/burer/burer_state_attack_tele.h index db0cd2d396..e354984fd6 100644 --- a/src/xrGame/ai/monsters/burer/burer_state_attack_tele.h +++ b/src/xrGame/ai/monsters/burer/burer_state_attack_tele.h @@ -1,6 +1,6 @@ #pragma once #include "../state.h" -#include "../../../grenade.h" +#include "../../../Grenade.h" template diff --git a/src/xrGame/ai/monsters/burer/burer_state_attack_tele_inline.h b/src/xrGame/ai/monsters/burer/burer_state_attack_tele_inline.h index 7c21accfd0..528a9f81fa 100644 --- a/src/xrGame/ai/monsters/burer/burer_state_attack_tele_inline.h +++ b/src/xrGame/ai/monsters/burer/burer_state_attack_tele_inline.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../level.h" +#include "../../../Level.h" #define GOOD_DISTANCE_FOR_TELE 15.f #define MAX_TIME_CHECK_FAILURE 6000 diff --git a/src/xrGame/ai/monsters/cat/cat.h b/src/xrGame/ai/monsters/cat/cat.h index 761a9a4185..8124c95ba3 100644 --- a/src/xrGame/ai/monsters/cat/cat.h +++ b/src/xrGame/ai/monsters/cat/cat.h @@ -1,5 +1,5 @@ #pragma once -#include "../BaseMonster/base_monster.h" +#include "../basemonster/base_monster.h" #include "../../../../xrScripts/script_export_space.h" class CCat : public CBaseMonster{ diff --git a/src/xrGame/ai/monsters/cat/cat_state_manager.cpp b/src/xrGame/ai/monsters/cat/cat_state_manager.cpp index ca0f8a32f9..b460a66e42 100644 --- a/src/xrGame/ai/monsters/cat/cat_state_manager.cpp +++ b/src/xrGame/ai/monsters/cat/cat_state_manager.cpp @@ -15,7 +15,7 @@ #include "../states/monster_state_hear_danger_sound.h" #include "../states/monster_state_hitted.h" #include "../states/state_test_look_actor.h" -#include "../../../entitycondition.h" +#include "../../../EntityCondition.h" #include "../states/monster_state_help_sound.h" CStateManagerCat::CStateManagerCat(CCat *obj) : inherited(obj) diff --git a/src/xrGame/ai/monsters/chimera/chimera.cpp b/src/xrGame/ai/monsters/chimera/chimera.cpp index 8d7a2b41da..873bf1e486 100644 --- a/src/xrGame/ai/monsters/chimera/chimera.cpp +++ b/src/xrGame/ai/monsters/chimera/chimera.cpp @@ -4,7 +4,7 @@ //#include "../../../../Include/xrRender/KinematicsAnimated.h" #include "../../../detail_path_manager.h" #include "../monster_velocity_space.h" -#include "../../../level.h" +#include "../../../Level.h" //#include "../../../PhysicsShell.h" #include "../../../sound_player.h" #include "../control_animation_base.h" diff --git a/src/xrGame/ai/monsters/chimera/chimera.h b/src/xrGame/ai/monsters/chimera/chimera.h index 69b99d2468..2c028b6090 100644 --- a/src/xrGame/ai/monsters/chimera/chimera.h +++ b/src/xrGame/ai/monsters/chimera/chimera.h @@ -1,5 +1,5 @@ #pragma once -#include "../BaseMonster/base_monster.h" +#include "../basemonster/base_monster.h" #include "../../../../xrScripts/script_export_space.h" class CChimera : public CBaseMonster diff --git a/src/xrGame/ai/monsters/control_animation.cpp b/src/xrGame/ai/monsters/control_animation.cpp index 8239bd5212..a45fd8dc8d 100644 --- a/src/xrGame/ai/monsters/control_animation.cpp +++ b/src/xrGame/ai/monsters/control_animation.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "control_animation.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "control_manager.h" void SAnimationPart::set_motion (MotionID const& m) diff --git a/src/xrGame/ai/monsters/control_animation_base.cpp b/src/xrGame/ai/monsters/control_animation_base.cpp index 15bf4e91ed..f0584b4331 100644 --- a/src/xrGame/ai/monsters/control_animation_base.cpp +++ b/src/xrGame/ai/monsters/control_animation_base.cpp @@ -2,7 +2,7 @@ #include "control_animation_base.h" #include "control_direction_base.h" #include "control_movement_base.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "../../PHMovementControl.h" #include "anim_triple.h" #include "../../../Include/xrRender/KinematicsAnimated.h" @@ -11,8 +11,8 @@ #include "monster_event_manager.h" #include "control_jump.h" #include "../../sound_player.h" -#include "../../../xrEngine/gamemtllib.h" -#include "../../actor.h" +#include "../../../xrEngine/GameMtlLib.h" +#include "../../Actor.h" // DEBUG purpose only const char *dbg_action_name_table[] = { diff --git a/src/xrGame/ai/monsters/control_animation_base_accel.cpp b/src/xrGame/ai/monsters/control_animation_base_accel.cpp index 785ac4c9ad..d6360e5175 100644 --- a/src/xrGame/ai/monsters/control_animation_base_accel.cpp +++ b/src/xrGame/ai/monsters/control_animation_base_accel.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "control_animation_base.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "../../detail_path_manager.h" #include "monster_velocity_space.h" diff --git a/src/xrGame/ai/monsters/control_animation_base_update.cpp b/src/xrGame/ai/monsters/control_animation_base_update.cpp index a57595cab7..6635a44247 100644 --- a/src/xrGame/ai/monsters/control_animation_base_update.cpp +++ b/src/xrGame/ai/monsters/control_animation_base_update.cpp @@ -2,7 +2,7 @@ #include "control_animation_base.h" #include "control_direction_base.h" #include "control_movement_base.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "../../CharacterPhysicsSupport.h" #include "../../PHMovementControl.h" #include "../../detail_path_manager.h" diff --git a/src/xrGame/ai/monsters/control_critical_wound.cpp b/src/xrGame/ai/monsters/control_critical_wound.cpp index 61534f33aa..4667df2d08 100644 --- a/src/xrGame/ai/monsters/control_critical_wound.cpp +++ b/src/xrGame/ai/monsters/control_critical_wound.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "control_critical_wound.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "control_animation_base.h" #include "control_direction_base.h" #include "control_movement_base.h" diff --git a/src/xrGame/ai/monsters/control_direction.cpp b/src/xrGame/ai/monsters/control_direction.cpp index 2fe98e6a9c..70aa8348c0 100644 --- a/src/xrGame/ai/monsters/control_direction.cpp +++ b/src/xrGame/ai/monsters/control_direction.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "control_direction.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "control_manager.h" #include "../../detail_path_manager.h" diff --git a/src/xrGame/ai/monsters/control_jump.cpp b/src/xrGame/ai/monsters/control_jump.cpp index dd9915977b..a1293bf08e 100644 --- a/src/xrGame/ai/monsters/control_jump.cpp +++ b/src/xrGame/ai/monsters/control_jump.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "control_jump.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "control_manager.h" #include "../../PHMovementControl.h" #include "../../../Include/xrRender/KinematicsAnimated.h" #include "../../detail_path_manager.h" -#include "../../level.h" +#include "../../Level.h" #include "control_animation_base.h" #include "control_direction_base.h" #include "control_movement_base.h" diff --git a/src/xrGame/ai/monsters/control_manager.cpp b/src/xrGame/ai/monsters/control_manager.cpp index a734d343bd..1237a1e0b3 100644 --- a/src/xrGame/ai/monsters/control_manager.cpp +++ b/src/xrGame/ai/monsters/control_manager.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "control_manager.h" #include "control_combase.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" // Lain: added #ifdef DEBUG diff --git a/src/xrGame/ai/monsters/control_manager_custom.cpp b/src/xrGame/ai/monsters/control_manager_custom.cpp index b1dbae1f77..dec543e8a3 100644 --- a/src/xrGame/ai/monsters/control_manager_custom.cpp +++ b/src/xrGame/ai/monsters/control_manager_custom.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include "control_manager_custom.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "control_sequencer.h" #include "control_run_attack.h" #include "control_threaten.h" #include "../../../xrPhysics/PhysicsShell.h" #include "../../detail_path_manager.h" -#include "../../level.h" +#include "../../Level.h" #include "control_animation_base.h" #include "control_critical_wound.h" diff --git a/src/xrGame/ai/monsters/control_melee_jump.cpp b/src/xrGame/ai/monsters/control_melee_jump.cpp index 130a228e41..f02f5da2c4 100644 --- a/src/xrGame/ai/monsters/control_melee_jump.cpp +++ b/src/xrGame/ai/monsters/control_melee_jump.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "control_melee_jump.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "control_manager.h" #define CHECK_YAW 165 * PI / 180 diff --git a/src/xrGame/ai/monsters/control_movement.cpp b/src/xrGame/ai/monsters/control_movement.cpp index f66935f316..652cd4292d 100644 --- a/src/xrGame/ai/monsters/control_movement.cpp +++ b/src/xrGame/ai/monsters/control_movement.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "control_movement.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "control_manager.h" #include "../../PHMovementControl.h" #include "../../CharacterPhysicsSupport.h" diff --git a/src/xrGame/ai/monsters/control_movement_base.cpp b/src/xrGame/ai/monsters/control_movement_base.cpp index 1527aab28c..a117188ce5 100644 --- a/src/xrGame/ai/monsters/control_movement_base.cpp +++ b/src/xrGame/ai/monsters/control_movement_base.cpp @@ -2,7 +2,7 @@ #include "control_movement_base.h" #include "control_animation_base.h" #include "control_direction_base.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "monster_velocity_space.h" #include "../../detail_path_manager.h" diff --git a/src/xrGame/ai/monsters/control_path_builder.cpp b/src/xrGame/ai/monsters/control_path_builder.cpp index 6ba7216bf7..55f607cf96 100644 --- a/src/xrGame/ai/monsters/control_path_builder.cpp +++ b/src/xrGame/ai/monsters/control_path_builder.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "control_path_builder.h" #include "control_manager.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "../../game_location_selector.h" #include "../../level_location_selector.h" #include "../../detail_path_manager.h" @@ -9,8 +9,8 @@ #include "../../ai_space.h" #include "../../movement_manager_space.h" #include "../../level_path_manager.h" -#include "../../actor.h" -#include "../../Actor_Memory.h" +#include "../../Actor.h" +#include "../../actor_memory.h" #include "../../visual_memory_manager.h" #ifdef DEBUG diff --git a/src/xrGame/ai/monsters/control_path_builder_base.cpp b/src/xrGame/ai/monsters/control_path_builder_base.cpp index 36bf7b457e..f54b2b4f17 100644 --- a/src/xrGame/ai/monsters/control_path_builder_base.cpp +++ b/src/xrGame/ai/monsters/control_path_builder_base.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "control_path_builder_base.h" -#include "BaseMonster/base_monster.h" -#include "../../phmovementcontrol.h" +#include "basemonster/base_monster.h" +#include "../../PHMovementControl.h" #include "../../cover_evaluators.h" #include "../../level_path_manager.h" #include "../../detail_path_manager.h" diff --git a/src/xrGame/ai/monsters/control_path_builder_base_path.cpp b/src/xrGame/ai/monsters/control_path_builder_base_path.cpp index d2e837216b..f33a63aaf6 100644 --- a/src/xrGame/ai/monsters/control_path_builder_base_path.cpp +++ b/src/xrGame/ai/monsters/control_path_builder_base_path.cpp @@ -3,7 +3,7 @@ #include "../../cover_point.h" #include "../../cover_manager.h" #include "../../cover_evaluators.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "../../detail_path_manager.h" #include "../../level_location_selector.h" #include "../../level_path_manager.h" diff --git a/src/xrGame/ai/monsters/control_path_builder_base_set.cpp b/src/xrGame/ai/monsters/control_path_builder_base_set.cpp index f092b87295..0d86af811e 100644 --- a/src/xrGame/ai/monsters/control_path_builder_base_set.cpp +++ b/src/xrGame/ai/monsters/control_path_builder_base_set.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "control_path_builder_base.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "../../level_graph.h" #include "../../ai_space.h" diff --git a/src/xrGame/ai/monsters/control_path_builder_base_update.cpp b/src/xrGame/ai/monsters/control_path_builder_base_update.cpp index 26f52f76b0..3dc3fe51ef 100644 --- a/src/xrGame/ai/monsters/control_path_builder_base_update.cpp +++ b/src/xrGame/ai/monsters/control_path_builder_base_update.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "control_path_builder_base.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "../../detail_path_manager.h" void CControlPathBuilderBase::update_frame() diff --git a/src/xrGame/ai/monsters/control_rotation_jump.cpp b/src/xrGame/ai/monsters/control_rotation_jump.cpp index 67199a89b0..62a3daf879 100644 --- a/src/xrGame/ai/monsters/control_rotation_jump.cpp +++ b/src/xrGame/ai/monsters/control_rotation_jump.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "control_rotation_jump.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "control_manager.h" #include "monster_velocity_space.h" #include "control_direction_base.h" diff --git a/src/xrGame/ai/monsters/control_run_attack.cpp b/src/xrGame/ai/monsters/control_run_attack.cpp index 8468132a73..f62ad01ac6 100644 --- a/src/xrGame/ai/monsters/control_run_attack.cpp +++ b/src/xrGame/ai/monsters/control_run_attack.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "control_run_attack.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "monster_velocity_space.h" #include "control_animation_base.h" #include "control_direction_base.h" diff --git a/src/xrGame/ai/monsters/control_threaten.cpp b/src/xrGame/ai/monsters/control_threaten.cpp index d079687c12..8cab419ab8 100644 --- a/src/xrGame/ai/monsters/control_threaten.cpp +++ b/src/xrGame/ai/monsters/control_threaten.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "control_threaten.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "control_animation_base.h" #include "control_direction_base.h" #include "control_movement_base.h" diff --git a/src/xrGame/ai/monsters/controlled_actor.cpp b/src/xrGame/ai/monsters/controlled_actor.cpp index a5b90cf7cf..6b86bd8b00 100644 --- a/src/xrGame/ai/monsters/controlled_actor.cpp +++ b/src/xrGame/ai/monsters/controlled_actor.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "controlled_actor.h" -#include "../../actor.h" +#include "../../Actor.h" #include "../../../xrEngine/CameraBase.h" -#include "../../level.h" +#include "../../Level.h" #include "ai_monster_utils.h" -#include "../../inventory.h" +#include "../../Inventory.h" #define SPEED_MIN 0.5f #define SPEED_MAX 4.f diff --git a/src/xrGame/ai/monsters/controller/controller.cpp b/src/xrGame/ai/monsters/controller/controller.cpp index 03e2cc819e..ead6f6e455 100644 --- a/src/xrGame/ai/monsters/controller/controller.cpp +++ b/src/xrGame/ai/monsters/controller/controller.cpp @@ -2,12 +2,12 @@ #include "controller.h" #include "controller_state_manager.h" #include "../controlled_entity.h" -#include "../../../actor.h" +#include "../../../Actor.h" #include "../../../ActorEffector.h" #include "../../../ActorCondition.h" #include "../ai_monster_effector.h" #include "../../../../Include/xrRender/KinematicsAnimated.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../../../sound_player.h" #include "../../../ai_monster_space.h" #include "../../../UIGameCustom.h" @@ -722,7 +722,7 @@ bool CController::tube_ready () const } -#include "../../../HudManager.h" +#include "../../../HUDManager.h" #include "../../../../xrEngine/CameraBase.h" #include "../../../CharacterPhysicsSupport.h" diff --git a/src/xrGame/ai/monsters/controller/controller.h b/src/xrGame/ai/monsters/controller/controller.h index 6168dd6ea5..658e19a4e8 100644 --- a/src/xrGame/ai/monsters/controller/controller.h +++ b/src/xrGame/ai/monsters/controller/controller.h @@ -1,5 +1,5 @@ #pragma once -#include "../BaseMonster/base_monster.h" +#include "../basemonster/base_monster.h" #include "../anim_triple.h" #include "../../../../xrScripts/script_export_space.h" #include "../controlled_actor.h" diff --git a/src/xrGame/ai/monsters/controller/controller_animation.cpp b/src/xrGame/ai/monsters/controller/controller_animation.cpp index 1dcccdc7bd..640cf9d42c 100644 --- a/src/xrGame/ai/monsters/controller/controller_animation.cpp +++ b/src/xrGame/ai/monsters/controller/controller_animation.cpp @@ -2,7 +2,7 @@ #include "controller_animation.h" #include "controller.h" #include "../../../detail_path_manager.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../control_direction_base.h" #include "../control_path_builder_base.h" #include "controller_direction.h" diff --git a/src/xrGame/ai/monsters/controller/controller_psy_aura.cpp b/src/xrGame/ai/monsters/controller/controller_psy_aura.cpp index 7124e0df60..ef0f11e54c 100644 --- a/src/xrGame/ai/monsters/controller/controller_psy_aura.cpp +++ b/src/xrGame/ai/monsters/controller/controller_psy_aura.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "controller_psy_aura.h" #include "controller.h" -#include "../../../actor.h" -#include "../../../level.h" +#include "../../../Actor.h" +#include "../../../Level.h" #include "../../../CameraEffector.h" #include "../../../ActorEffector.h" diff --git a/src/xrGame/ai/monsters/controller/controller_psy_hit.cpp b/src/xrGame/ai/monsters/controller/controller_psy_hit.cpp index 16c74ff487..4c10398d7f 100644 --- a/src/xrGame/ai/monsters/controller/controller_psy_hit.cpp +++ b/src/xrGame/ai/monsters/controller/controller_psy_hit.cpp @@ -1,18 +1,18 @@ #include "stdafx.h" #include "controller_psy_hit.h" -#include "../BaseMonster/base_monster.h" +#include "../basemonster/base_monster.h" #include "controller.h" #include "../control_animation_base.h" #include "../control_direction_base.h" #include "../control_movement_base.h" -#include "../../../level.h" -#include "../../../actor.h" +#include "../../../Level.h" +#include "../../../Actor.h" #include "../../../ActorEffector.h" #include "../../../../xrEngine/CameraBase.h" #include "../../../CharacterPhysicsSupport.h" #include "../../../level_debug.h" #include "../../../ActorCondition.h" -#include "../../../HudManager.h" +#include "../../../HUDManager.h" diff --git a/src/xrGame/ai/monsters/controller/controller_psy_hit_effector.h b/src/xrGame/ai/monsters/controller/controller_psy_hit_effector.h index bb2fb0e2b8..4f2131151a 100644 --- a/src/xrGame/ai/monsters/controller/controller_psy_hit_effector.h +++ b/src/xrGame/ai/monsters/controller/controller_psy_hit_effector.h @@ -1,5 +1,5 @@ #pragma once -#include "../../../../xrEngine/effector.h" +#include "../../../../xrEngine/Effector.h" #include "../../../pp_effector_custom.h" //////////////////////////////////////////////////////////////////////////////////// diff --git a/src/xrGame/ai/monsters/controller/controller_state_attack_hide_inline.h b/src/xrGame/ai/monsters/controller/controller_state_attack_hide_inline.h index fe06163e38..184e42edff 100644 --- a/src/xrGame/ai/monsters/controller/controller_state_attack_hide_inline.h +++ b/src/xrGame/ai/monsters/controller/controller_state_attack_hide_inline.h @@ -3,7 +3,7 @@ #include "../../../ai_space.h" #include "../monster_cover_manager.h" #include "../../../cover_point.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../../../level_debug.h" diff --git a/src/xrGame/ai/monsters/controller/controller_state_attack_hide_lite_inline.h b/src/xrGame/ai/monsters/controller/controller_state_attack_hide_lite_inline.h index b96978c9ec..e2f375029c 100644 --- a/src/xrGame/ai/monsters/controller/controller_state_attack_hide_lite_inline.h +++ b/src/xrGame/ai/monsters/controller/controller_state_attack_hide_lite_inline.h @@ -3,7 +3,7 @@ #include "../../../ai_space.h" #include "../monster_cover_manager.h" #include "../../../cover_point.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../../../level_debug.h" #define TEMPLATE_SPECIALIZATION template <\ diff --git a/src/xrGame/ai/monsters/controller/controller_state_manager.cpp b/src/xrGame/ai/monsters/controller/controller_state_manager.cpp index 181c9c2ba5..7168f6e256 100644 --- a/src/xrGame/ai/monsters/controller/controller_state_manager.cpp +++ b/src/xrGame/ai/monsters/controller/controller_state_manager.cpp @@ -21,7 +21,7 @@ #include "../states/monster_state_hitted.h" #include "../states/monster_state_attack.h" -#include "../../../entitycondition.h" +#include "../../../EntityCondition.h" #include "../states/state_test_state.h" diff --git a/src/xrGame/ai/monsters/dog/dog.cpp b/src/xrGame/ai/monsters/dog/dog.cpp index 273c390b90..c66e796492 100644 --- a/src/xrGame/ai/monsters/dog/dog.cpp +++ b/src/xrGame/ai/monsters/dog/dog.cpp @@ -14,7 +14,7 @@ #include "../../../level_graph.h" #include "../../../ai_space.h" #include "../../../ai_object_location.h" -#include "../../../actor.h" +#include "../../../Actor.h" CAI_Dog::CAI_Dog() { diff --git a/src/xrGame/ai/monsters/dog/dog.h b/src/xrGame/ai/monsters/dog/dog.h index dc54b5191c..d50374debe 100644 --- a/src/xrGame/ai/monsters/dog/dog.h +++ b/src/xrGame/ai/monsters/dog/dog.h @@ -1,6 +1,6 @@ #pragma once -#include "../BaseMonster/base_monster.h" +#include "../basemonster/base_monster.h" #include "../controlled_entity.h" #include "../../../../xrScripts/script_export_space.h" diff --git a/src/xrGame/ai/monsters/energy_holder.cpp b/src/xrGame/ai/monsters/energy_holder.cpp index 247c755a99..4bb839bb66 100644 --- a/src/xrGame/ai/monsters/energy_holder.cpp +++ b/src/xrGame/ai/monsters/energy_holder.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "energy_holder.h" -#include "../../gameobject.h" +#include "../../GameObject.h" CEnergyHolder::CEnergyHolder() { diff --git a/src/xrGame/ai/monsters/flesh/flesh.h b/src/xrGame/ai/monsters/flesh/flesh.h index d16d7f2331..d176a55e34 100644 --- a/src/xrGame/ai/monsters/flesh/flesh.h +++ b/src/xrGame/ai/monsters/flesh/flesh.h @@ -1,5 +1,5 @@ #pragma once -#include "../BaseMonster/base_monster.h" +#include "../basemonster/base_monster.h" #include "../controlled_entity.h" #include "../../../../xrScripts/script_export_space.h" diff --git a/src/xrGame/ai/monsters/fracture/fracture.h b/src/xrGame/ai/monsters/fracture/fracture.h index 1d3ff28a67..c98e19efe3 100644 --- a/src/xrGame/ai/monsters/fracture/fracture.h +++ b/src/xrGame/ai/monsters/fracture/fracture.h @@ -1,5 +1,5 @@ #pragma once -#include "../BaseMonster/base_monster.h" +#include "../basemonster/base_monster.h" #include "../../../../xrScripts/script_export_space.h" class CStateManagerFracture; diff --git a/src/xrGame/ai/monsters/fracture/fracture_state_manager.cpp b/src/xrGame/ai/monsters/fracture/fracture_state_manager.cpp index c5db473e1f..7ea3a54e89 100644 --- a/src/xrGame/ai/monsters/fracture/fracture_state_manager.cpp +++ b/src/xrGame/ai/monsters/fracture/fracture_state_manager.cpp @@ -14,7 +14,7 @@ #include "../states/monster_state_hear_danger_sound.h" #include "../states/monster_state_hitted.h" -#include "../../../entitycondition.h" +#include "../../../EntityCondition.h" CStateManagerFracture::CStateManagerFracture(CFracture *obj) : inherited(obj) { diff --git a/src/xrGame/ai/monsters/group_states/group_state_attack_inline.h b/src/xrGame/ai/monsters/group_states/group_state_attack_inline.h index 03f4c5db13..9acfe02e54 100644 --- a/src/xrGame/ai/monsters/group_states/group_state_attack_inline.h +++ b/src/xrGame/ai/monsters/group_states/group_state_attack_inline.h @@ -4,14 +4,14 @@ #include "../states/monster_state_attack_run_attack.h" #include "../states/state_hide_from_point.h" #include "../states/monster_state_find_enemy.h" -#include "group_state_squad_move_to_radius.h " +#include "group_state_squad_move_to_radius.h" #include "group_state_home_point_attack.h" #include "group_state_custom.h" #include "../ai_monster_squad.h" #include "../ai_monster_squad_manager.h" #include "group_state_attack_run.h" #include "../../../entity_alive.h" -#include "../../../actor.h" +#include "../../../Actor.h" #define TEMPLATE_SPECIALIZATION template <\ typename _Object\ diff --git a/src/xrGame/ai/monsters/group_states/group_state_eat_drag_inline.h b/src/xrGame/ai/monsters/group_states/group_state_eat_drag_inline.h index b0d2f385ed..a0e97dd465 100644 --- a/src/xrGame/ai/monsters/group_states/group_state_eat_drag_inline.h +++ b/src/xrGame/ai/monsters/group_states/group_state_eat_drag_inline.h @@ -2,7 +2,7 @@ #include "../../../../xrPhysics/IPHCapture.h" #include "../../../CaptureBoneCallback.h" -#include "../../../../include/xrrender/Kinematics.h" +#include "../../../../Include/xrRender/Kinematics.h" #define TEMPLATE_SPECIALIZATION template <\ typename _Object\ diff --git a/src/xrGame/ai/monsters/group_states/group_state_eat_inline.h b/src/xrGame/ai/monsters/group_states/group_state_eat_inline.h index 2d1c49c2b0..664c9260db 100644 --- a/src/xrGame/ai/monsters/group_states/group_state_eat_inline.h +++ b/src/xrGame/ai/monsters/group_states/group_state_eat_inline.h @@ -9,7 +9,7 @@ #include "../../../CharacterPhysicsSupport.h" #include "group_state_eat_drag.h" #include "group_state_custom.h" -#include "group_state_eat_eat.h " +#include "group_state_eat_eat.h" #define TEMPLATE_SPECIALIZATION template <\ diff --git a/src/xrGame/ai/monsters/group_states/group_state_hear_danger_sound_inline.h b/src/xrGame/ai/monsters/group_states/group_state_hear_danger_sound_inline.h index 5569d81d40..699781f702 100644 --- a/src/xrGame/ai/monsters/group_states/group_state_hear_danger_sound_inline.h +++ b/src/xrGame/ai/monsters/group_states/group_state_hear_danger_sound_inline.h @@ -4,7 +4,7 @@ #include "../states/monster_state_home_point_danger.h" #include "../ai_monster_squad.h" -#include "../../../entity.h" +#include "../../../Entity.h" #include "../../../ai_object_location.h" #define TEMPLATE_SPECIALIZATION template <\ diff --git a/src/xrGame/ai/monsters/group_states/group_state_rest.h b/src/xrGame/ai/monsters/group_states/group_state_rest.h index b073eef1ae..323e10640e 100644 --- a/src/xrGame/ai/monsters/group_states/group_state_rest.h +++ b/src/xrGame/ai/monsters/group_states/group_state_rest.h @@ -1,7 +1,7 @@ #pragma once #include "../state.h" -#include "../../../entitycondition.h" +#include "../../../EntityCondition.h" #include "../states/state_data.h" template class CStateGroupRest : public CState<_Object> { diff --git a/src/xrGame/ai/monsters/monster_corpse_manager.cpp b/src/xrGame/ai/monsters/monster_corpse_manager.cpp index 77bf30ee8f..435a96ee66 100644 --- a/src/xrGame/ai/monsters/monster_corpse_manager.cpp +++ b/src/xrGame/ai/monsters/monster_corpse_manager.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "monster_corpse_manager.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "../../ai_object_location.h" CMonsterCorpseManager::CMonsterCorpseManager() diff --git a/src/xrGame/ai/monsters/monster_corpse_memory.cpp b/src/xrGame/ai/monsters/monster_corpse_memory.cpp index 7e2affd7fa..e821289741 100644 --- a/src/xrGame/ai/monsters/monster_corpse_memory.cpp +++ b/src/xrGame/ai/monsters/monster_corpse_memory.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "monster_corpse_memory.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "../../memory_manager.h" #include "../../visual_memory_manager.h" #include "../../item_manager.h" diff --git a/src/xrGame/ai/monsters/monster_cover_manager.cpp b/src/xrGame/ai/monsters/monster_cover_manager.cpp index 1e9c2dab7f..044014373c 100644 --- a/src/xrGame/ai/monsters/monster_cover_manager.cpp +++ b/src/xrGame/ai/monsters/monster_cover_manager.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" #include "monster_cover_manager.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "../../cover_evaluators.h" #include "../../cover_point.h" #include "../../ai_space.h" #include "../../level_graph.h" #include "../../game_graph.h" #include "../../game_level_cross_table.h" -#include "../../level.h" +#include "../../Level.h" #include "../../level_debug.h" #include "../../cover_manager.h" #include "../../ai_object_location.h" diff --git a/src/xrGame/ai/monsters/monster_enemy_manager.cpp b/src/xrGame/ai/monsters/monster_enemy_manager.cpp index a20a50d036..743411311a 100644 --- a/src/xrGame/ai/monsters/monster_enemy_manager.cpp +++ b/src/xrGame/ai/monsters/monster_enemy_manager.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "monster_enemy_manager.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "../ai_monsters_misc.h" #include "../../ai_object_location.h" #include "../../memory_manager.h" #include "../../visual_memory_manager.h" -#include "../../actor.h" +#include "../../Actor.h" #include "../../actor_memory.h" CMonsterEnemyManager::CMonsterEnemyManager() diff --git a/src/xrGame/ai/monsters/monster_enemy_memory.cpp b/src/xrGame/ai/monsters/monster_enemy_memory.cpp index 51725394e2..f150f671c6 100644 --- a/src/xrGame/ai/monsters/monster_enemy_memory.cpp +++ b/src/xrGame/ai/monsters/monster_enemy_memory.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" #include "pch_script.h" #include "monster_enemy_memory.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "../../memory_manager.h" #include "../../visual_memory_manager.h" #include "../../enemy_manager.h" #include "../../ai_object_location.h" #include "monster_home.h" -#include "Dog/dog.h" +#include "dog/dog.h" #include "ai_monster_squad.h" #include "ai_monster_squad_manager.h" #include "../../Actor.h" diff --git a/src/xrGame/ai/monsters/monster_hit_memory.cpp b/src/xrGame/ai/monsters/monster_hit_memory.cpp index 17767ca15c..38248b7bd0 100644 --- a/src/xrGame/ai/monsters/monster_hit_memory.cpp +++ b/src/xrGame/ai/monsters/monster_hit_memory.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "monster_hit_memory.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" CMonsterHitMemory::CMonsterHitMemory() { diff --git a/src/xrGame/ai/monsters/monster_home.cpp b/src/xrGame/ai/monsters/monster_home.cpp index b1d1e5aafb..95b7d11087 100644 --- a/src/xrGame/ai/monsters/monster_home.cpp +++ b/src/xrGame/ai/monsters/monster_home.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "monster_home.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #include "../../ai_space.h" #include "../../patrol_path_storage.h" #include "../../patrol_path.h" diff --git a/src/xrGame/ai/monsters/monster_sound_memory.cpp b/src/xrGame/ai/monsters/monster_sound_memory.cpp index 83dadabb03..248dd7632c 100644 --- a/src/xrGame/ai/monsters/monster_sound_memory.cpp +++ b/src/xrGame/ai/monsters/monster_sound_memory.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "monster_sound_memory.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" #define CHECK_SOUND_TYPE(a,b,c) { if ((a & b) == b) return c; } diff --git a/src/xrGame/ai/monsters/poltergeist/poltergeist.cpp b/src/xrGame/ai/monsters/poltergeist/poltergeist.cpp index 693aeb2535..f6c68a25bf 100644 --- a/src/xrGame/ai/monsters/poltergeist/poltergeist.cpp +++ b/src/xrGame/ai/monsters/poltergeist/poltergeist.cpp @@ -1,20 +1,20 @@ #include "stdafx.h" #include "poltergeist.h" #include "poltergeist_state_manager.h" -#include "../../../characterphysicssupport.h" +#include "../../../CharacterPhysicsSupport.h" #include "../../../PHMovementControl.h" #include "../../../PhysicsShellHolder.h" #include "../../../ai_debug.h" #include "poltergeist_movement.h" #include "../../../detail_path_manager.h" #include "../monster_velocity_space.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../../../level_debug.h" #include "../control_animation_base.h" #include "../control_movement_base.h" #include "../control_path_builder_base.h" #include "../../../../xrPhysics/PhysicsShell.h" -#include "../../../actor.h" +#include "../../../Actor.h" #include "../../../actor_memory.h" #include "../../../visual_memory_manager.h" #include "ActorEffector.h" diff --git a/src/xrGame/ai/monsters/poltergeist/poltergeist.h b/src/xrGame/ai/monsters/poltergeist/poltergeist.h index 8858cfd2f4..9853dfb05b 100644 --- a/src/xrGame/ai/monsters/poltergeist/poltergeist.h +++ b/src/xrGame/ai/monsters/poltergeist/poltergeist.h @@ -1,5 +1,5 @@ #pragma once -#include "../BaseMonster/base_monster.h" +#include "../basemonster/base_monster.h" #include "../telekinesis.h" #include "../energy_holder.h" #include "../../../../xrScripts/script_export_space.h" diff --git a/src/xrGame/ai/monsters/poltergeist/poltergeist_ability.cpp b/src/xrGame/ai/monsters/poltergeist/poltergeist_ability.cpp index 8f6a8b817a..f789e35b0c 100644 --- a/src/xrGame/ai/monsters/poltergeist/poltergeist_ability.cpp +++ b/src/xrGame/ai/monsters/poltergeist/poltergeist_ability.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "poltergeist.h" #include "../../../../xrPhysics/PhysicsShell.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../../../material_manager.h" #include "../../../level_debug.h" diff --git a/src/xrGame/ai/monsters/poltergeist/poltergeist_flame_thrower.cpp b/src/xrGame/ai/monsters/poltergeist/poltergeist_flame_thrower.cpp index b1a302529b..16f14dd5c3 100644 --- a/src/xrGame/ai/monsters/poltergeist/poltergeist_flame_thrower.cpp +++ b/src/xrGame/ai/monsters/poltergeist/poltergeist_flame_thrower.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" #include "poltergeist.h" -#include "../../../../xrServerEntities/xrmessages.h" +#include "../../../../xrServerEntities/xrMessages.h" #include "../../../ai_object_location.h" #include "../../../level_graph.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../../../ai_space.h" #include "../../../restricted_object.h" -#include "../../../actor.h" -#include "../../../actorEffector.h" +#include "../../../Actor.h" +#include "../../../ActorEffector.h" #include "../ai_monster_effector.h" CPolterFlame::CPolterFlame(CPoltergeist *polter) : inherited (polter) diff --git a/src/xrGame/ai/monsters/poltergeist/poltergeist_state_manager.cpp b/src/xrGame/ai/monsters/poltergeist/poltergeist_state_manager.cpp index 9e7ca84fe7..6bb9d2815c 100644 --- a/src/xrGame/ai/monsters/poltergeist/poltergeist_state_manager.cpp +++ b/src/xrGame/ai/monsters/poltergeist/poltergeist_state_manager.cpp @@ -15,7 +15,7 @@ #include "../states/monster_state_hear_int_sound.h" #include "../states/monster_state_hear_danger_sound.h" #include "../states/monster_state_hitted.h" -#include "../../../entitycondition.h" +#include "../../../EntityCondition.h" CStateManagerPoltergeist::CStateManagerPoltergeist(CPoltergeist *obj) : inherited(obj) { diff --git a/src/xrGame/ai/monsters/poltergeist/poltergeist_telekinesis.cpp b/src/xrGame/ai/monsters/poltergeist/poltergeist_telekinesis.cpp index 7edd679d91..9438eacfca 100644 --- a/src/xrGame/ai/monsters/poltergeist/poltergeist_telekinesis.cpp +++ b/src/xrGame/ai/monsters/poltergeist/poltergeist_telekinesis.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "poltergeist.h" #include "../../../PhysicsShellHolder.h" -#include "../../../level.h" -#include "../../../actor.h" -#include "../../../../xrPhysics/icolisiondamageinfo.h" +#include "../../../Level.h" +#include "../../../Actor.h" +#include "../../../../xrPhysics/IColisiondamageInfo.h" CPolterTele::CPolterTele(CPoltergeist *polter) : inherited (polter),m_pmt_object_collision_damage(0.5f) { } diff --git a/src/xrGame/ai/monsters/pseudodog/pseudodog.cpp b/src/xrGame/ai/monsters/pseudodog/pseudodog.cpp index e86646b52b..4cebad767b 100644 --- a/src/xrGame/ai/monsters/pseudodog/pseudodog.cpp +++ b/src/xrGame/ai/monsters/pseudodog/pseudodog.cpp @@ -3,7 +3,7 @@ #include "pseudodog_state_manager.h" #include "../../../../Include/xrRender/KinematicsAnimated.h" #include "../../../sound_player.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../../../ai_monster_space.h" #include "../monster_velocity_space.h" #include "../control_animation_base.h" diff --git a/src/xrGame/ai/monsters/pseudodog/pseudodog.h b/src/xrGame/ai/monsters/pseudodog/pseudodog.h index 0c6f541fe8..25d69761d9 100644 --- a/src/xrGame/ai/monsters/pseudodog/pseudodog.h +++ b/src/xrGame/ai/monsters/pseudodog/pseudodog.h @@ -1,6 +1,6 @@ #pragma once -#include "../BaseMonster/base_monster.h" +#include "../basemonster/base_monster.h" #include "../../../../xrScripts/script_export_space.h" class CAI_PseudoDog : public CBaseMonster { diff --git a/src/xrGame/ai/monsters/pseudodog/pseudodog_state_manager.cpp b/src/xrGame/ai/monsters/pseudodog/pseudodog_state_manager.cpp index a5a4553b38..f909cd2267 100644 --- a/src/xrGame/ai/monsters/pseudodog/pseudodog_state_manager.cpp +++ b/src/xrGame/ai/monsters/pseudodog/pseudodog_state_manager.cpp @@ -7,7 +7,7 @@ #include "../control_movement_base.h" #include "../control_path_builder_base.h" -#include "../../../actor.h" +#include "../../../Actor.h" #include "../../stalker/ai_stalker.h" #include "../states/monster_state_rest.h" #include "../states/monster_state_attack.h" diff --git a/src/xrGame/ai/monsters/pseudodog/psy_dog.cpp b/src/xrGame/ai/monsters/pseudodog/psy_dog.cpp index 4840a81f85..76dc99fbeb 100644 --- a/src/xrGame/ai/monsters/pseudodog/psy_dog.cpp +++ b/src/xrGame/ai/monsters/pseudodog/psy_dog.cpp @@ -4,19 +4,19 @@ #include "../../../ai_space.h" #include "../../../alife_simulator.h" #include "../../../../xrServerEntities/xrServer_Object_Base.h" -#include "../../../xrserver.h" +#include "../../../xrServer.h" #include "../../../ai_object_location.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../control_movement_base.h" #include "../monster_velocity_space.h" #include "../../../restricted_object.h" -#include "../../../actor.h" +#include "../../../Actor.h" #include "../ai_monster_effector.h" #include "../../../ActorEffector.h" #include "psy_dog_aura.h" #include "psy_dog_state_manager.h" #include "../../../alife_object_registry.h" -#include "../../../../xrServerEntities/xrserver_objects_alife_monsters.h" +#include "../../../../xrServerEntities/xrServer_Objects_ALife_Monsters.h" CPsyDog::CPsyDog() { diff --git a/src/xrGame/ai/monsters/pseudodog/psy_dog_aura.cpp b/src/xrGame/ai/monsters/pseudodog/psy_dog_aura.cpp index 90d430fa09..177c73623a 100644 --- a/src/xrGame/ai/monsters/pseudodog/psy_dog_aura.cpp +++ b/src/xrGame/ai/monsters/pseudodog/psy_dog_aura.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "psy_dog_aura.h" #include "psy_dog.h" -#include "../../../actor.h" +#include "../../../Actor.h" #include "../../../ActorEffector.h" #include "../../../actor_memory.h" #include "../../../visual_memory_manager.h" -#include "../../../level.h" +#include "../../../Level.h" CPPEffectorPsyDogAura::CPPEffectorPsyDogAura(const SPPInfo &ppi, u32 time_to_fade) : inherited(ppi) diff --git a/src/xrGame/ai/monsters/pseudodog/psy_dog_state_manager.cpp b/src/xrGame/ai/monsters/pseudodog/psy_dog_state_manager.cpp index 4455dda4f6..af3e417cf3 100644 --- a/src/xrGame/ai/monsters/pseudodog/psy_dog_state_manager.cpp +++ b/src/xrGame/ai/monsters/pseudodog/psy_dog_state_manager.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "psy_dog.h" #include "psy_dog_state_manager.h" -#include "../../../actor.h" +#include "../../../Actor.h" #include "../control_direction_base.h" #include "../control_movement_base.h" #include "../control_path_builder_base.h" diff --git a/src/xrGame/ai/monsters/pseudogigant/pseudo_gigant.cpp b/src/xrGame/ai/monsters/pseudogigant/pseudo_gigant.cpp index 65e0d42340..84fe50a9bb 100644 --- a/src/xrGame/ai/monsters/pseudogigant/pseudo_gigant.cpp +++ b/src/xrGame/ai/monsters/pseudogigant/pseudo_gigant.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "pseudo_gigant.h" #include "pseudo_gigant_step_effector.h" -#include "../../../actor.h" +#include "../../../Actor.h" #include "../../../ActorEffector.h" -#include "../../../level.h" +#include "../../../Level.h" #include "pseudogigant_state_manager.h" #include "../monster_velocity_space.h" #include "../control_animation_base.h" diff --git a/src/xrGame/ai/monsters/pseudogigant/pseudo_gigant.h b/src/xrGame/ai/monsters/pseudogigant/pseudo_gigant.h index 1e104da6fe..4af1af498d 100644 --- a/src/xrGame/ai/monsters/pseudogigant/pseudo_gigant.h +++ b/src/xrGame/ai/monsters/pseudogigant/pseudo_gigant.h @@ -1,5 +1,5 @@ #pragma once -#include "../BaseMonster/base_monster.h" +#include "../basemonster/base_monster.h" #include "../controlled_entity.h" #include "../../../../xrScripts/script_export_space.h" diff --git a/src/xrGame/ai/monsters/pseudogigant/pseudogigant_state_manager.cpp b/src/xrGame/ai/monsters/pseudogigant/pseudogigant_state_manager.cpp index 5cee86e9cf..e6d62bcdab 100644 --- a/src/xrGame/ai/monsters/pseudogigant/pseudogigant_state_manager.cpp +++ b/src/xrGame/ai/monsters/pseudogigant/pseudogigant_state_manager.cpp @@ -14,7 +14,7 @@ #include "../states/monster_state_hear_int_sound.h" #include "../states/monster_state_hear_danger_sound.h" #include "../states/monster_state_hitted.h" -#include "../../../entitycondition.h" +#include "../../../EntityCondition.h" #include "../states/monster_state_controlled.h" #include "../states/monster_state_help_sound.h" diff --git a/src/xrGame/ai/monsters/psy_aura.cpp b/src/xrGame/ai/monsters/psy_aura.cpp index 6287b74457..9dc580eb2e 100644 --- a/src/xrGame/ai/monsters/psy_aura.cpp +++ b/src/xrGame/ai/monsters/psy_aura.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "psy_aura.h" -#include "BaseMonster/base_monster.h" +#include "basemonster/base_monster.h" CPsyAura::CPsyAura() { diff --git a/src/xrGame/ai/monsters/psy_aura.h b/src/xrGame/ai/monsters/psy_aura.h index 19e1fa7a49..37920e0ae7 100644 --- a/src/xrGame/ai/monsters/psy_aura.h +++ b/src/xrGame/ai/monsters/psy_aura.h @@ -1,5 +1,5 @@ #pragma once -#include "../../../xrEngine/feel_touch.h" +#include "../../../xrEngine/Feel_Touch.h" #include "energy_holder.h" class CBaseMonster; diff --git a/src/xrGame/ai/monsters/rats/ai_rat.cpp b/src/xrGame/ai/monsters/rats/ai_rat.cpp index ed160d1f74..b9c7fadaf2 100644 --- a/src/xrGame/ai/monsters/rats/ai_rat.cpp +++ b/src/xrGame/ai/monsters/rats/ai_rat.cpp @@ -12,7 +12,7 @@ #include "../../../../xrPhysics/PhysicsShell.h" #include "../../../game_graph.h" #include "../../../game_level_cross_table.h" -#include "../../../../xrServerEntities/xrserver_objects_alife_monsters.h" +#include "../../../../xrServerEntities/xrServer_Objects_ALife_Monsters.h" #include "ai_rat_space.h" #include "../../../../Include/xrRender/KinematicsAnimated.h" diff --git a/src/xrGame/ai/monsters/rats/ai_rat_impl.h b/src/xrGame/ai/monsters/rats/ai_rat_impl.h index 82e49ce6f1..4e7f4d509e 100644 --- a/src/xrGame/ai/monsters/rats/ai_rat_impl.h +++ b/src/xrGame/ai/monsters/rats/ai_rat_impl.h @@ -8,7 +8,7 @@ #pragma once -#include "../../../level.h" +#include "../../../Level.h" #include "../../../seniority_hierarchy_holder.h" #include "../../../team_hierarchy_holder.h" #include "../../../squad_hierarchy_holder.h" diff --git a/src/xrGame/ai/monsters/rats/ai_rat_templates.cpp b/src/xrGame/ai/monsters/rats/ai_rat_templates.cpp index bc071914cf..f9a3b43a21 100644 --- a/src/xrGame/ai/monsters/rats/ai_rat_templates.cpp +++ b/src/xrGame/ai/monsters/rats/ai_rat_templates.cpp @@ -16,7 +16,7 @@ #include "../../../level_graph.h" #include "../../../movement_manager.h" #include "../../../location_manager.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../../../random32.h" #include "../../../ai_space.h" #include "../../../restricted_object.h" diff --git a/src/xrGame/ai/monsters/snork/snork.cpp b/src/xrGame/ai/monsters/snork/snork.cpp index 06897ee969..494dda3304 100644 --- a/src/xrGame/ai/monsters/snork/snork.cpp +++ b/src/xrGame/ai/monsters/snork/snork.cpp @@ -3,7 +3,7 @@ #include "snork_state_manager.h" #include "../../../detail_path_manager_space.h" #include "../../../detail_path_manager.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../monster_velocity_space.h" #include "../../../sound_player.h" #include "../control_animation_base.h" diff --git a/src/xrGame/ai/monsters/snork/snork.h b/src/xrGame/ai/monsters/snork/snork.h index e0048adfd8..0219a82ed8 100644 --- a/src/xrGame/ai/monsters/snork/snork.h +++ b/src/xrGame/ai/monsters/snork/snork.h @@ -1,5 +1,5 @@ #pragma once -#include "../BaseMonster/base_monster.h" +#include "../basemonster/base_monster.h" #include "../../../../xrScripts/script_export_space.h" class CSnork : public CBaseMonster { diff --git a/src/xrGame/ai/monsters/snork/snork_jump.cpp b/src/xrGame/ai/monsters/snork/snork_jump.cpp index b707b3889b..0130fb1441 100644 --- a/src/xrGame/ai/monsters/snork/snork_jump.cpp +++ b/src/xrGame/ai/monsters/snork/snork_jump.cpp @@ -3,7 +3,7 @@ #include "snork_jump.h" //#include "../jump_ability.h" #include "../../../../Include/xrRender/KinematicsAnimated.h" -#include "../../../level.h" +#include "../../../Level.h" //CSnorkJump::CSnorkJump(CSnork *monster) //{ diff --git a/src/xrGame/ai/monsters/snork/snork_state_manager.cpp b/src/xrGame/ai/monsters/snork/snork_state_manager.cpp index 49febaab26..c095de264d 100644 --- a/src/xrGame/ai/monsters/snork/snork_state_manager.cpp +++ b/src/xrGame/ai/monsters/snork/snork_state_manager.cpp @@ -7,7 +7,7 @@ #include "../control_movement_base.h" #include "../control_path_builder_base.h" -#include "../../../level.h" +#include "../../../Level.h" #include "../../../level_debug.h" #include "../states/monster_state_rest.h" #include "../states/monster_state_attack.h" @@ -21,7 +21,7 @@ #include "../states/state_test_state.h" #include "../states/monster_state_help_sound.h" -#include "../../../entitycondition.h" +#include "../../../EntityCondition.h" CStateManagerSnork::CStateManagerSnork(CSnork *obj) : inherited(obj) { diff --git a/src/xrGame/ai/monsters/states/monster_state_attack_inline.h b/src/xrGame/ai/monsters/states/monster_state_attack_inline.h index ea92d4601a..87590ba025 100644 --- a/src/xrGame/ai/monsters/states/monster_state_attack_inline.h +++ b/src/xrGame/ai/monsters/states/monster_state_attack_inline.h @@ -13,7 +13,7 @@ #include "../ai_monster_squad.h" #include "../ai_monster_squad_manager.h" -#include "../../../actor.h" +#include "../../../Actor.h" #define TEMPLATE_SPECIALIZATION template <\ typename _Object\ diff --git a/src/xrGame/ai/monsters/states/monster_state_rest.h b/src/xrGame/ai/monsters/states/monster_state_rest.h index 96ef2e31a2..751b3aa204 100644 --- a/src/xrGame/ai/monsters/states/monster_state_rest.h +++ b/src/xrGame/ai/monsters/states/monster_state_rest.h @@ -1,7 +1,7 @@ #pragma once #include "../state.h" -#include "../../../entitycondition.h" +#include "../../../EntityCondition.h" template class CStateMonsterRest : public CState<_Object> { diff --git a/src/xrGame/ai/monsters/states/monster_state_smart_terrain_task_inline.h b/src/xrGame/ai/monsters/states/monster_state_smart_terrain_task_inline.h index ede0de033e..e6a78bac7e 100644 --- a/src/xrGame/ai/monsters/states/monster_state_smart_terrain_task_inline.h +++ b/src/xrGame/ai/monsters/states/monster_state_smart_terrain_task_inline.h @@ -2,7 +2,7 @@ #include "../../../alife_simulator.h" #include "../../../alife_object_registry.h" -#include "../../../../xrServerEntities/xrserver_objects_alife_monsters.h" +#include "../../../../xrServerEntities/xrServer_Objects_ALife_Monsters.h" #include "../../../../xrServerEntities/alife_monster_brain.h" #include "state_move_to_point.h" diff --git a/src/xrGame/ai/monsters/states/state_test_look_actor_inline.h b/src/xrGame/ai/monsters/states/state_test_look_actor_inline.h index 87244b245d..4d5b313437 100644 --- a/src/xrGame/ai/monsters/states/state_test_look_actor_inline.h +++ b/src/xrGame/ai/monsters/states/state_test_look_actor_inline.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../level.h" +#include "../../../Level.h" #define TEMPLATE_SPECIALIZATION template <\ typename _Object\ diff --git a/src/xrGame/ai/monsters/states/state_test_state_inline.h b/src/xrGame/ai/monsters/states/state_test_state_inline.h index efc9723ef1..235b4cb918 100644 --- a/src/xrGame/ai/monsters/states/state_test_state_inline.h +++ b/src/xrGame/ai/monsters/states/state_test_state_inline.h @@ -1,6 +1,6 @@ #pragma once -#include "../../../level.h" +#include "../../../Level.h" #include "state_move_to_point.h" #include "state_custom_action.h" diff --git a/src/xrGame/ai/monsters/telekinetic_object.cpp b/src/xrGame/ai/monsters/telekinetic_object.cpp index fe6c571e18..43b82bfd03 100644 --- a/src/xrGame/ai/monsters/telekinetic_object.cpp +++ b/src/xrGame/ai/monsters/telekinetic_object.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "../../physicsshellholder.h" +#include "../../PhysicsShellHolder.h" #include "telekinetic_object.h" #include "../../../xrPhysics/PhysicsShell.h" #include "../../../xrPhysics/MathUtils.h" //#include "../../PHInterpolation.h" //#include "../../PHElement.h" -#include "../../level.h" -#include "../../gameobject.h" +#include "../../Level.h" +#include "../../GameObject.h" #define KEEP_IMPULSE_UPDATE 200 diff --git a/src/xrGame/ai/monsters/tushkano/tushkano.h b/src/xrGame/ai/monsters/tushkano/tushkano.h index e2690591c3..9d5fb7283b 100644 --- a/src/xrGame/ai/monsters/tushkano/tushkano.h +++ b/src/xrGame/ai/monsters/tushkano/tushkano.h @@ -1,5 +1,5 @@ #pragma once -#include "../BaseMonster/base_monster.h" +#include "../basemonster/base_monster.h" #include "../controlled_entity.h" #include "../../../../xrScripts/script_export_space.h" diff --git a/src/xrGame/ai/monsters/tushkano/tushkano_state_manager.cpp b/src/xrGame/ai/monsters/tushkano/tushkano_state_manager.cpp index 9a3cc9eba6..39acc3745a 100644 --- a/src/xrGame/ai/monsters/tushkano/tushkano_state_manager.cpp +++ b/src/xrGame/ai/monsters/tushkano/tushkano_state_manager.cpp @@ -16,7 +16,7 @@ #include "../states/monster_state_controlled.h" #include "../states/monster_state_help_sound.h" -#include "../../../entitycondition.h" +#include "../../../EntityCondition.h" CStateManagerTushkano::CStateManagerTushkano(CTushkano *obj) : inherited(obj) diff --git a/src/xrGame/ai/monsters/zombie/zombie.cpp b/src/xrGame/ai/monsters/zombie/zombie.cpp index 49275d414e..31ae8e516b 100644 --- a/src/xrGame/ai/monsters/zombie/zombie.cpp +++ b/src/xrGame/ai/monsters/zombie/zombie.cpp @@ -2,7 +2,7 @@ #include "zombie.h" #include "zombie_state_manager.h" #include "../../../../Include/xrRender/KinematicsAnimated.h" -#include "../../../entitycondition.h" +#include "../../../EntityCondition.h" #include "../monster_velocity_space.h" #include "../control_animation_base.h" diff --git a/src/xrGame/ai/monsters/zombie/zombie.h b/src/xrGame/ai/monsters/zombie/zombie.h index b5226bf538..114d42714b 100644 --- a/src/xrGame/ai/monsters/zombie/zombie.h +++ b/src/xrGame/ai/monsters/zombie/zombie.h @@ -1,5 +1,5 @@ #pragma once -#include "../BaseMonster/base_monster.h" +#include "../basemonster/base_monster.h" #include "../controlled_entity.h" #include "../ai_monster_bones.h" #include "../anim_triple.h" diff --git a/src/xrGame/ai/monsters/zombie/zombie_state_manager.cpp b/src/xrGame/ai/monsters/zombie/zombie_state_manager.cpp index ab26acdee0..ec883e169f 100644 --- a/src/xrGame/ai/monsters/zombie/zombie_state_manager.cpp +++ b/src/xrGame/ai/monsters/zombie/zombie_state_manager.cpp @@ -12,7 +12,7 @@ #include "../states/monster_state_eat.h" #include "../states/monster_state_hear_int_sound.h" #include "zombie_state_attack_run.h" -#include "../../../entitycondition.h" +#include "../../../EntityCondition.h" #include "../../../detail_path_manager.h" #include "../states/monster_state_controlled.h" #include "../states/monster_state_help_sound.h" diff --git a/src/xrGame/ai/phantom/phantom.cpp b/src/xrGame/ai/phantom/phantom.cpp index ca706aca84..0d5b91810f 100644 --- a/src/xrGame/ai/phantom/phantom.cpp +++ b/src/xrGame/ai/phantom/phantom.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "phantom.h" -#include "../../level.h" -#include "../../../xrServerEntities/xrserver_objects_alife_monsters.h" +#include "../../Level.h" +#include "../../../xrServerEntities/xrServer_Objects_ALife_Monsters.h" #include "../../../xrEngine/motion.h" #include "../Include/xrRender/RenderVisual.h" #include "../Include/xrRender/KinematicsAnimated.h" diff --git a/src/xrGame/ai/phantom/phantom.h b/src/xrGame/ai/phantom/phantom.h index 195ac88938..71a35a3f2b 100644 --- a/src/xrGame/ai/phantom/phantom.h +++ b/src/xrGame/ai/phantom/phantom.h @@ -1,6 +1,6 @@ #pragma once -#include "../../entity.h" +#include "../../Entity.h" #include "../../../Include/xrRender/KinematicsAnimated.h" class CParticlesObject; diff --git a/src/xrGame/ai/stalker/ai_stalker.cpp b/src/xrGame/ai/stalker/ai_stalker.cpp index 531b6f058c..fdfdb3f5e0 100644 --- a/src/xrGame/ai/stalker/ai_stalker.cpp +++ b/src/xrGame/ai/stalker/ai_stalker.cpp @@ -10,23 +10,23 @@ #include "pch_script.h" #include "ai_stalker.h" #include "../ai_monsters_misc.h" -#include "../../weapon.h" -#include "../../hit.h" -#include "../../phdestroyable.h" +#include "../../Weapon.h" +#include "../../Hit.h" +#include "../../PHDestroyable.h" #include "../../CharacterPhysicsSupport.h" #include "../../script_entity_action.h" #include "../../game_level_cross_table.h" #include "../../game_graph.h" -#include "../../inventory.h" -#include "../../artefact.h" -#include "../../phmovementcontrol.h" -#include "../../../xrServerEntities/xrserver_objects_alife_monsters.h" +#include "../../Inventory.h" +#include "../../Artefact.h" +#include "../../PHMovementControl.h" +#include "../../../xrServerEntities/xrServer_Objects_ALife_Monsters.h" #include "../../cover_evaluators.h" -#include "../../xrserver.h" +#include "../../xrServer.h" #include "../../../xrEngine/xr_level_controller.h" #include "../../../Include/xrRender/Kinematics.h" #include "../../../xrServerEntities/character_info.h" -#include "../../actor.h" +#include "../../Actor.h" #include "../xrEngine/CameraBase.h" #include "../../relation_registry.h" #include "../../stalker_animation_manager.h" @@ -41,15 +41,15 @@ #include "../../sight_manager.h" #include "../../ai_object_location.h" #include "../../stalker_movement_manager_smart_cover.h" -#include "../../entitycondition.h" -#include "../../../xrScripts//script_engine.h" +#include "../../EntityCondition.h" +#include "../../../xrScripts/script_engine.h" #include "ai_stalker_impl.h" #include "../../sound_player.h" #include "../../stalker_sound_data.h" #include "../../stalker_sound_data_visitor.h" #include "ai_stalker_space.h" #include "../../mt_config.h" -#include "../../effectorshot.h" +#include "../../EffectorShot.h" #include "../../visual_memory_manager.h" #include "../../enemy_manager.h" #include "../../../xrServerEntities/alife_human_brain.h" diff --git a/src/xrGame/ai/stalker/ai_stalker_cover.cpp b/src/xrGame/ai/stalker/ai_stalker_cover.cpp index 1d0a08e811..63a6634dff 100644 --- a/src/xrGame/ai/stalker/ai_stalker_cover.cpp +++ b/src/xrGame/ai/stalker/ai_stalker_cover.cpp @@ -25,7 +25,7 @@ #include "../../smart_cover_animation_planner.h" #include "../../script_game_object.h" #include "../../stalker_decision_space.h" -#include "../../weapon.h" +#include "../../Weapon.h" extern const float MIN_SUITABLE_ENEMY_DISTANCE = 3.f; diff --git a/src/xrGame/ai/stalker/ai_stalker_debug.cpp b/src/xrGame/ai/stalker/ai_stalker_debug.cpp index 07d93a1bee..c6a1179cfd 100644 --- a/src/xrGame/ai/stalker/ai_stalker_debug.cpp +++ b/src/xrGame/ai/stalker/ai_stalker_debug.cpp @@ -18,13 +18,13 @@ #include "../../enemy_manager.h" #include "../../danger_manager.h" #include "../../item_manager.h" -#include "../../actor.h" +#include "../../Actor.h" #include "../../stalker_planner.h" #include "../../script_game_object.h" #include "../../stalker_animation_manager.h" -#include "../../weapon.h" +#include "../../Weapon.h" #include "../../sound_player.h" -#include "../../inventory.h" +#include "../../Inventory.h" #include "../../object_handler_planner.h" #include "../../stalker_movement_manager_smart_cover.h" #include "../../movement_manager_space.h" @@ -34,7 +34,7 @@ #include "../../detail_path_manager.h" #include "../../sight_manager.h" #include "../../ai_object_location.h" -#include "../../entitycondition.h" +#include "../../EntityCondition.h" #include "../ai_monsters_misc.h" #include "../../agent_manager.h" #include "../../agent_member_manager.h" @@ -42,15 +42,15 @@ #include "../../agent_corpse_manager.h" #include "../../agent_location_manager.h" #include "../../cover_point.h" -#include "../../../xrEngine/camerabase.h" +#include "../../../xrEngine/CameraBase.h" #include "../../mt_config.h" -#include "../../weaponmagazined.h" +#include "../../WeaponMagazined.h" #include "../../object_handler_space.h" #include "../../debug_renderer.h" #include "../../CharacterPhysicsSupport.h" #include "../../smart_cover_animation_selector.h" #include "../../animation_movement_controller.h" -#include "../../phdebug.h" +#include "../../PHDebug.h" #include "../../game_object_space.h" #include "../../aimers_weapon.h" #include "../../aimers_bone.h" diff --git a/src/xrGame/ai/stalker/ai_stalker_events.cpp b/src/xrGame/ai/stalker/ai_stalker_events.cpp index dfaa821a77..1c9889c2f5 100644 --- a/src/xrGame/ai/stalker/ai_stalker_events.cpp +++ b/src/xrGame/ai/stalker/ai_stalker_events.cpp @@ -8,13 +8,13 @@ #include "stdafx.h" #include "ai_stalker.h" -#include "../../pda.h" -#include "../../inventory.h" -#include "../../../xrServerEntities/xrmessages.h" -#include "../../shootingobject.h" -#include "../../level.h" +#include "../../PDA.h" +#include "../../Inventory.h" +#include "../../../xrServerEntities/xrMessages.h" +#include "../../ShootingObject.h" +#include "../../Level.h" #include "../../ai_monster_space.h" -#include "../../characterphysicssupport.h" +#include "../../CharacterPhysicsSupport.h" using namespace StalkerSpace; using namespace MonsterSpace; diff --git a/src/xrGame/ai/stalker/ai_stalker_fire.cpp b/src/xrGame/ai/stalker/ai_stalker_fire.cpp index 324d250514..f49cd59c2c 100644 --- a/src/xrGame/ai/stalker/ai_stalker_fire.cpp +++ b/src/xrGame/ai/stalker/ai_stalker_fire.cpp @@ -11,11 +11,11 @@ #include "ai_stalker.h" #include "ai_stalker_impl.h" #include "../../script_entity_action.h" -#include "../../inventory.h" +#include "../../Inventory.h" #include "../../ef_storage.h" #include "../../stalker_decision_space.h" #include "../../script_game_object.h" -#include "../../customzone.h" +#include "../../CustomZone.h" #include "../../../Include/xrRender/KinematicsAnimated.h" #include "../../agent_manager.h" #include "../../stalker_animation_manager.h" @@ -26,7 +26,7 @@ #include "../../enemy_manager.h" #include "../../item_manager.h" #include "../../stalker_movement_manager_smart_cover.h" -#include "../../entitycondition.h" +#include "../../EntityCondition.h" #include "../../sound_player.h" #include "../../cover_point.h" #include "../../agent_member_manager.h" @@ -35,22 +35,22 @@ #include "../../object_handler_planner.h" #include "../../object_handler_space.h" #include "../../visual_memory_manager.h" -#include "../../weapon.h" +#include "../../Weapon.h" #include "ai_stalker_space.h" -#include "../../effectorshot.h" +#include "../../EffectorShot.h" #include "../../BoneProtections.h" #include "../../RadioactiveZone.h" #include "../../restricted_object.h" #include "../../ai_object_location.h" -#include "../../missile.h" -#include "../../../xrPhysics/iphworld.h" +#include "../../Missile.h" +#include "../../../xrPhysics/IPHWorld.h" #include "../../stalker_animation_names.h" #include "../../agent_corpse_manager.h" #include "../../CharacterPhysicsSupport.h" #include "../../stalker_planner.h" #include "../../stalker_decision_space.h" #include "../../script_game_object.h" -#include "../../inventory.h" +#include "../../Inventory.h" #include "../../trajectories.h" diff --git a/src/xrGame/ai/stalker/ai_stalker_impl.h b/src/xrGame/ai/stalker/ai_stalker_impl.h index 9cc96b8c9a..e742999f4f 100644 --- a/src/xrGame/ai/stalker/ai_stalker_impl.h +++ b/src/xrGame/ai/stalker/ai_stalker_impl.h @@ -8,12 +8,12 @@ #pragma once -#include "../../level.h" +#include "../../Level.h" #include "../../seniority_hierarchy_holder.h" #include "../../team_hierarchy_holder.h" #include "../../squad_hierarchy_holder.h" #include "../../group_hierarchy_holder.h" -#include "../../effectorshot.h" +#include "../../EffectorShot.h" #include "stalker_movement_manager_smart_cover.h" #include "smart_cover_animation_selector.h" #include "smart_cover_animation_planner.h" diff --git a/src/xrGame/ai/stalker/ai_stalker_misc.cpp b/src/xrGame/ai/stalker/ai_stalker_misc.cpp index 7324252846..ceeff96618 100644 --- a/src/xrGame/ai/stalker/ai_stalker_misc.cpp +++ b/src/xrGame/ai/stalker/ai_stalker_misc.cpp @@ -10,21 +10,21 @@ #include "pch_script.h" #include "ai_stalker.h" #include "ai_stalker_space.h" -#include "../../bolt.h" -#include "../../inventory.h" +#include "../../Bolt.h" +#include "../../Inventory.h" #include "../../../xrServerEntities/character_info.h" #include "../../relation_registry.h" #include "../../memory_manager.h" #include "../../item_manager.h" #include "../../stalker_movement_manager_smart_cover.h" -#include "../../explosive.h" +#include "../../Explosive.h" #include "../../agent_manager.h" #include "../../agent_member_manager.h" #include "../../agent_explosive_manager.h" #include "../../agent_location_manager.h" #include "../../danger_object_location.h" #include "../../member_order.h" -#include "../../level.h" +#include "../../Level.h" #include "../../sound_player.h" #include "../../enemy_manager.h" #include "../../danger_manager.h" diff --git a/src/xrGame/ai/stalker/ai_stalker_script_entity.cpp b/src/xrGame/ai/stalker/ai_stalker_script_entity.cpp index 6ecc88b2b1..b78f7d84e4 100644 --- a/src/xrGame/ai/stalker/ai_stalker_script_entity.cpp +++ b/src/xrGame/ai/stalker/ai_stalker_script_entity.cpp @@ -10,10 +10,10 @@ #include "ai_stalker.h" #include "../../stalker_animation_manager.h" #include "../../script_entity_action.h" -#include "../../torch.h" -#include "../../inventory.h" -#include "../../weapon.h" -#include "../../weaponmagazined.h" +#include "../../Torch.h" +#include "../../Inventory.h" +#include "../../Weapon.h" +#include "../../WeaponMagazined.h" #include "../../../Include/xrRender/Kinematics.h" #include "../../../xrScripts/script_engine.h" #include "../../sight_manager.h" diff --git a/src/xrGame/ai/trader/ai_trader.cpp b/src/xrGame/ai/trader/ai_trader.cpp index 50ab0f5d2d..014a06a287 100644 --- a/src/xrGame/ai/trader/ai_trader.cpp +++ b/src/xrGame/ai/trader/ai_trader.cpp @@ -12,14 +12,14 @@ #include "../../trade.h" #include "../../script_entity_action.h" #include "../../script_game_object.h" -#include "../../inventory.h" -#include "../../../xrServerEntities/xrserver_objects_alife_monsters.h" -#include "../../artefact.h" -#include "../../xrserver.h" +#include "../../Inventory.h" +#include "../../../xrServerEntities/xrServer_Objects_ALife_Monsters.h" +#include "../../Artefact.h" +#include "../../xrServer.h" #include "../../relation_registry.h" #include "../../../xrServerEntities/object_broker.h" #include "../../sound_player.h" -#include "../../level.h" +#include "../../Level.h" #include "../../game_object_space.h" #include "trader_animation.h" #include "../../../xrServerEntities/clsid_game.h" diff --git a/src/xrGame/ai/trader/ai_trader.h b/src/xrGame/ai/trader/ai_trader.h index c6c8c120dc..aa9a7f62fb 100644 --- a/src/xrGame/ai/trader/ai_trader.h +++ b/src/xrGame/ai/trader/ai_trader.h @@ -9,7 +9,7 @@ #pragma once #include "../../CustomMonster.h" -#include "../../inventoryowner.h" +#include "../../InventoryOwner.h" #include "../../script_entity.h" #include "../../sound_player.h" #include "../../AI_PhraseDialogManager.h" diff --git a/src/xrGame/ai_crow_script.cpp b/src/xrGame/ai_crow_script.cpp index e936e239e8..2b720a7565 100644 --- a/src/xrGame/ai_crow_script.cpp +++ b/src/xrGame/ai_crow_script.cpp @@ -6,7 +6,7 @@ // Description : Crow script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "ai/crow/ai_crow.h" diff --git a/src/xrGame/ai_debug_variables.cpp b/src/xrGame/ai_debug_variables.cpp index a9982e3ade..baa2fbb284 100644 --- a/src/xrGame/ai_debug_variables.cpp +++ b/src/xrGame/ai_debug_variables.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" namespace ai_dbg { diff --git a/src/xrGame/ai_obstacle.cpp b/src/xrGame/ai_obstacle.cpp index d2d32ac0b9..c5b05314d7 100644 --- a/src/xrGame/ai_obstacle.cpp +++ b/src/xrGame/ai_obstacle.cpp @@ -6,7 +6,7 @@ // Description : ai obstacle class inline functions //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ai_obstacle.h" #include "ai_space.h" #include "level_graph.h" @@ -98,7 +98,7 @@ IC bool ai_obstacle::inside (const u32 &vertex_id) const ); } -#include "../xrengine/xr_collide_form.h" +#include "../xrEngine/xr_collide_form.h" void ai_obstacle::compute_matrix_novis(Fmatrix &result, const Fvector &additional) { if(!m_object->CFORM()) diff --git a/src/xrGame/ai_sounds.cpp b/src/xrGame/ai_sounds.cpp index ae40261bae..e093f1717e 100644 --- a/src/xrGame/ai_sounds.cpp +++ b/src/xrGame/ai_sounds.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop #include "../xrSound/ai_sounds.h" diff --git a/src/xrGame/ai_space.cpp b/src/xrGame/ai_space.cpp index 3bb62e8b57..5912826fdd 100644 --- a/src/xrGame/ai_space.cpp +++ b/src/xrGame/ai_space.cpp @@ -6,7 +6,7 @@ // Description : AI space class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "game_graph.h" #include "level_graph.h" #include "graph_engine.h" diff --git a/src/xrGame/ai_stalker_alife.cpp b/src/xrGame/ai_stalker_alife.cpp index ee95b377d5..c44b8f0c7e 100644 --- a/src/xrGame/ai_stalker_alife.cpp +++ b/src/xrGame/ai_stalker_alife.cpp @@ -6,13 +6,13 @@ // Description : Stalker ALife functions //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ai/stalker/ai_stalker.h" #include "ai_space.h" #include "alife_simulator.h" #include "alife_space.h" #include "Inventory.h" -#include "pda.h" +#include "PDA.h" #include "eatable_item.h" #include "medkit.h" #include "Weapon.h" diff --git a/src/xrGame/aimers_base.cpp b/src/xrGame/aimers_base.cpp index bbef318570..f7e95db04e 100644 --- a/src/xrGame/aimers_base.cpp +++ b/src/xrGame/aimers_base.cpp @@ -6,10 +6,10 @@ // Description : aimers base class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "aimers_base.h" -#include "gameobject.h" -#include "../include/xrrender/kinematics.h" +#include "GameObject.h" +#include "../Include/xrRender/Kinematics.h" #include "animation_movement_controller.h" using aimers::base; diff --git a/src/xrGame/aimers_base.h b/src/xrGame/aimers_base.h index 323fc3f787..fc06e7bd5c 100644 --- a/src/xrGame/aimers_base.h +++ b/src/xrGame/aimers_base.h @@ -9,7 +9,7 @@ #ifndef AIMERS_BASE_H_INCLUDED #define AIMERS_BASE_H_INCLUDED #include "../Include/xrRender/Kinematics.h" -#include "../include/xrrender/animation_motion.h" +#include "../Include/xrRender/animation_motion.h" class CGameObject; class IKinematics; diff --git a/src/xrGame/aimers_bone.h b/src/xrGame/aimers_bone.h index fb59c3bb42..eb9ed31b59 100644 --- a/src/xrGame/aimers_bone.h +++ b/src/xrGame/aimers_bone.h @@ -10,7 +10,7 @@ #define AIMERS_BONE_H_INCLUDED #include "aimers_base.h" -#include "../include/xrrender/kinematics.h" +#include "../Include/xrRender/Kinematics.h" #include "animation_movement_controller.h" #include "game_object_space.h" diff --git a/src/xrGame/aimers_weapon.cpp b/src/xrGame/aimers_weapon.cpp index cbd103cad9..37bf88fb13 100644 --- a/src/xrGame/aimers_weapon.cpp +++ b/src/xrGame/aimers_weapon.cpp @@ -6,12 +6,12 @@ // Description : weapon aimer class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "aimers_weapon.h" -#include "../include/xrrender/kinematics.h" +#include "../Include/xrRender/Kinematics.h" #include "animation_movement_controller.h" #include "game_object_space.h" -#include "gameobject.h" +#include "GameObject.h" #include "animation_movement_controller.h" #include "Weapon.h" diff --git a/src/xrGame/alife_anomalous_zone.cpp b/src/xrGame/alife_anomalous_zone.cpp index d50365a026..be046ad7fd 100644 --- a/src/xrGame/alife_anomalous_zone.cpp +++ b/src/xrGame/alife_anomalous_zone.cpp @@ -6,7 +6,7 @@ // Description : ALife anomalous zone class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer_Objects_ALife_Monsters.h" #include "ai_space.h" #include "alife_simulator.h" diff --git a/src/xrGame/alife_combat_manager.cpp b/src/xrGame/alife_combat_manager.cpp index fe43cbff7a..e892a05bcd 100644 --- a/src/xrGame/alife_combat_manager.cpp +++ b/src/xrGame/alife_combat_manager.cpp @@ -6,7 +6,7 @@ // Description : ALife combat manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_combat_manager.h" #include "xrServer_Objects_ALife_Monsters.h" #include "alife_graph_registry.h" diff --git a/src/xrGame/alife_communication_manager.cpp b/src/xrGame/alife_communication_manager.cpp index aba10d9509..ed5133e535 100644 --- a/src/xrGame/alife_communication_manager.cpp +++ b/src/xrGame/alife_communication_manager.cpp @@ -6,7 +6,7 @@ // Description : ALife communication manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_communication_manager.h" /** diff --git a/src/xrGame/alife_creature_abstract.cpp b/src/xrGame/alife_creature_abstract.cpp index 8a18f091eb..b5bd5c9798 100644 --- a/src/xrGame/alife_creature_abstract.cpp +++ b/src/xrGame/alife_creature_abstract.cpp @@ -6,7 +6,7 @@ // Description : ALife creature abstract class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer_Objects_ALife_Monsters.h" #include "monster_community.h" #include "Level.h" diff --git a/src/xrGame/alife_dynamic_object.cpp b/src/xrGame/alife_dynamic_object.cpp index c0cf59531b..d969815773 100644 --- a/src/xrGame/alife_dynamic_object.cpp +++ b/src/xrGame/alife_dynamic_object.cpp @@ -6,7 +6,7 @@ // Description : ALife dynamic object class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer_Objects_ALife.h" #include "alife_simulator.h" #include "alife_schedule_registry.h" diff --git a/src/xrGame/alife_graph_registry.cpp b/src/xrGame/alife_graph_registry.cpp index 98952d9ea1..ec6482c9d5 100644 --- a/src/xrGame/alife_graph_registry.cpp +++ b/src/xrGame/alife_graph_registry.cpp @@ -6,7 +6,7 @@ // Description : ALife graph registry //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_graph_registry.h" #include "../xrEngine/x_ray.h" diff --git a/src/xrGame/alife_group_abstract.cpp b/src/xrGame/alife_group_abstract.cpp index 8bf46d8d99..b72ea0c392 100644 --- a/src/xrGame/alife_group_abstract.cpp +++ b/src/xrGame/alife_group_abstract.cpp @@ -6,7 +6,7 @@ // Description : ALife group abstract class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer_Objects_ALife.h" #include "ai_space.h" #include "alife_simulator.h" diff --git a/src/xrGame/alife_group_registry.cpp b/src/xrGame/alife_group_registry.cpp index d551210e6f..f56b17804f 100644 --- a/src/xrGame/alife_group_registry.cpp +++ b/src/xrGame/alife_group_registry.cpp @@ -6,7 +6,7 @@ // Description : ALife group registry //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_group_registry.h" #include "xrServer_Objects_ALife_Monsters.h" diff --git a/src/xrGame/alife_human_abstract.cpp b/src/xrGame/alife_human_abstract.cpp index ec732f7f8b..ad08672197 100644 --- a/src/xrGame/alife_human_abstract.cpp +++ b/src/xrGame/alife_human_abstract.cpp @@ -6,7 +6,7 @@ // Description : ALife human abstract class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer_objects_ALife_Monsters.h" #include "alife_human_brain.h" #include "alife_human_object_handler.h" diff --git a/src/xrGame/alife_human_brain_script.cpp b/src/xrGame/alife_human_brain_script.cpp index dbb7c157d5..9c93feefa0 100644 --- a/src/xrGame/alife_human_brain_script.cpp +++ b/src/xrGame/alife_human_brain_script.cpp @@ -6,7 +6,7 @@ // Description : ALife human brain class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "alife_human_brain.h" diff --git a/src/xrGame/alife_human_object_handler.cpp b/src/xrGame/alife_human_object_handler.cpp index a9237df61a..058c9e8dac 100644 --- a/src/xrGame/alife_human_object_handler.cpp +++ b/src/xrGame/alife_human_object_handler.cpp @@ -6,7 +6,7 @@ // Description : ALife human object handler class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_human_object_handler.h" #include "xrServer_Objects_ALife_Monsters.h" diff --git a/src/xrGame/alife_interaction_manager.cpp b/src/xrGame/alife_interaction_manager.cpp index a5f8080fa4..19a75341cf 100644 --- a/src/xrGame/alife_interaction_manager.cpp +++ b/src/xrGame/alife_interaction_manager.cpp @@ -6,7 +6,7 @@ // Description : ALife communication manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_interaction_manager.h" /** #include "xrServer_Objects_ALife_Monsters.h" diff --git a/src/xrGame/alife_monster_abstract.cpp b/src/xrGame/alife_monster_abstract.cpp index c2af235bc9..be5f9c1e06 100644 --- a/src/xrGame/alife_monster_abstract.cpp +++ b/src/xrGame/alife_monster_abstract.cpp @@ -6,7 +6,7 @@ // Description : ALife mnster abstract class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer_Objects_ALife_Monsters.h" #include "ai_space.h" #include "alife_simulator.h" diff --git a/src/xrGame/alife_monster_base.cpp b/src/xrGame/alife_monster_base.cpp index e0462d5534..cececfb79b 100644 --- a/src/xrGame/alife_monster_base.cpp +++ b/src/xrGame/alife_monster_base.cpp @@ -6,7 +6,7 @@ // Description : ALife mnster base class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer_Objects_ALife_Monsters.h" #include "alife_simulator.h" #include "xrServer.h" diff --git a/src/xrGame/alife_monster_brain_script.cpp b/src/xrGame/alife_monster_brain_script.cpp index f3ec38c0a2..0d02c2a657 100644 --- a/src/xrGame/alife_monster_brain_script.cpp +++ b/src/xrGame/alife_monster_brain_script.cpp @@ -6,7 +6,7 @@ // Description : ALife monster brain class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "alife_monster_brain.h" #include "alife_monster_movement_manager.h" diff --git a/src/xrGame/alife_monster_detail_path_manager.cpp b/src/xrGame/alife_monster_detail_path_manager.cpp index 508e089bdc..6b6f45853f 100644 --- a/src/xrGame/alife_monster_detail_path_manager.cpp +++ b/src/xrGame/alife_monster_detail_path_manager.cpp @@ -6,7 +6,7 @@ // Description : ALife monster detail path manager class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_monster_detail_path_manager.h" #include "ai_space.h" #include "alife_simulator.h" diff --git a/src/xrGame/alife_monster_detail_path_manager_script.cpp b/src/xrGame/alife_monster_detail_path_manager_script.cpp index bf898c9cb3..3f959a0022 100644 --- a/src/xrGame/alife_monster_detail_path_manager_script.cpp +++ b/src/xrGame/alife_monster_detail_path_manager_script.cpp @@ -6,7 +6,7 @@ // Description : ALife monster detail path manager class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "alife_monster_detail_path_manager.h" #include "alife_smart_terrain_task.h" diff --git a/src/xrGame/alife_monster_movement_manager.cpp b/src/xrGame/alife_monster_movement_manager.cpp index 5fd805dc0b..7bd7728405 100644 --- a/src/xrGame/alife_monster_movement_manager.cpp +++ b/src/xrGame/alife_monster_movement_manager.cpp @@ -6,7 +6,7 @@ // Description : ALife monster movement manager class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_monster_movement_manager.h" #include "alife_monster_detail_path_manager.h" #include "alife_monster_patrol_path_manager.h" diff --git a/src/xrGame/alife_monster_movement_manager_script.cpp b/src/xrGame/alife_monster_movement_manager_script.cpp index f1c878a99f..b07807ec98 100644 --- a/src/xrGame/alife_monster_movement_manager_script.cpp +++ b/src/xrGame/alife_monster_movement_manager_script.cpp @@ -6,7 +6,7 @@ // Description : ALife monster movement manager class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "alife_monster_movement_manager.h" #include "alife_monster_detail_path_manager.h" diff --git a/src/xrGame/alife_monster_patrol_path_manager.cpp b/src/xrGame/alife_monster_patrol_path_manager.cpp index 345faa21b0..cea9982282 100644 --- a/src/xrGame/alife_monster_patrol_path_manager.cpp +++ b/src/xrGame/alife_monster_patrol_path_manager.cpp @@ -6,7 +6,7 @@ // Description : ALife monster patrol path manager class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_monster_patrol_path_manager.h" #include "xrServer_Objects_ALife_Monsters.h" #include "ai_space.h" diff --git a/src/xrGame/alife_monster_patrol_path_manager_script.cpp b/src/xrGame/alife_monster_patrol_path_manager_script.cpp index 5002d7345d..121fae9efb 100644 --- a/src/xrGame/alife_monster_patrol_path_manager_script.cpp +++ b/src/xrGame/alife_monster_patrol_path_manager_script.cpp @@ -6,7 +6,7 @@ // Description : ALife monster patrol path manager class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "alife_monster_patrol_path_manager.h" #include "patrol_path_manager_space.h" diff --git a/src/xrGame/alife_object.cpp b/src/xrGame/alife_object.cpp index 0dc3a38a88..93815769d8 100644 --- a/src/xrGame/alife_object.cpp +++ b/src/xrGame/alife_object.cpp @@ -6,7 +6,7 @@ // Description : ALife object class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer_Objects_ALife.h" #include "alife_simulator.h" #include "xrServer_Objects_ALife_Items.h" diff --git a/src/xrGame/alife_object_registry.cpp b/src/xrGame/alife_object_registry.cpp index dcbe8e23ae..8d1f4ae614 100644 --- a/src/xrGame/alife_object_registry.cpp +++ b/src/xrGame/alife_object_registry.cpp @@ -6,7 +6,7 @@ // Description : ALife object registry //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_object_registry.h" #include "ai_debug.h" diff --git a/src/xrGame/alife_online_offline_group.cpp b/src/xrGame/alife_online_offline_group.cpp index 30b4928d7d..ee0f7e7774 100644 --- a/src/xrGame/alife_online_offline_group.cpp +++ b/src/xrGame/alife_online_offline_group.cpp @@ -6,7 +6,7 @@ // Description : ALife Online Offline Group class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer_Objects_ALife_Monsters.h" #include "ai_space.h" #include "alife_simulator.h" diff --git a/src/xrGame/alife_online_offline_group_brain.cpp b/src/xrGame/alife_online_offline_group_brain.cpp index 8fcb7dabba..01a19a1cfa 100644 --- a/src/xrGame/alife_online_offline_group_brain.cpp +++ b/src/xrGame/alife_online_offline_group_brain.cpp @@ -6,7 +6,7 @@ // Description : ALife Online Offline Group brain class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_online_offline_group_brain.h" #include "object_broker.h" #include "xrServer_Objects_ALife_Monsters.h" diff --git a/src/xrGame/alife_registry_container.cpp b/src/xrGame/alife_registry_container.cpp index b94fcb2004..d605fd1228 100644 --- a/src/xrGame/alife_registry_container.cpp +++ b/src/xrGame/alife_registry_container.cpp @@ -6,7 +6,7 @@ // Description : ALife registry container class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_registry_container.h" #include "object_interfaces.h" #include "alife_space.h" diff --git a/src/xrGame/alife_registry_container_composition.h b/src/xrGame/alife_registry_container_composition.h index 3811ebe83e..d53b9960a9 100644 --- a/src/xrGame/alife_registry_container_composition.h +++ b/src/xrGame/alife_registry_container_composition.h @@ -16,7 +16,7 @@ #include "relation_registry_defs.h" -#include "gametaskdefs.h" +#include "GameTaskDefs.h" #include "game_news.h" #include "map_location_defs.h" diff --git a/src/xrGame/alife_schedule_registry.cpp b/src/xrGame/alife_schedule_registry.cpp index ea2368941a..861ae81c76 100644 --- a/src/xrGame/alife_schedule_registry.cpp +++ b/src/xrGame/alife_schedule_registry.cpp @@ -6,7 +6,7 @@ // Description : ALife schedule registry //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_schedule_registry.h" CALifeScheduleRegistry::~CALifeScheduleRegistry () diff --git a/src/xrGame/alife_simulator.cpp b/src/xrGame/alife_simulator.cpp index 1a6e115698..c5e30ec209 100644 --- a/src/xrGame/alife_simulator.cpp +++ b/src/xrGame/alife_simulator.cpp @@ -6,17 +6,17 @@ // Description : ALife Simulator //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "alife_simulator.h" #include "xrServer_Objects_ALife.h" #include "ai_space.h" #include "../xrEngine/IGame_Persistent.h" #include "../xrScripts/script_engine.h" -#include "mainmenu.h" +#include "MainMenu.h" #include "object_factory.h" #include "alife_object_registry.h" -#include "../xrEngine/xr_ioconsole.h" +#include "../xrEngine/XR_IOConsole.h" #ifdef DEBUG # include "moving_objects.h" diff --git a/src/xrGame/alife_simulator_base.cpp b/src/xrGame/alife_simulator_base.cpp index 5de9f0a8ac..0acece3b47 100644 --- a/src/xrGame/alife_simulator_base.cpp +++ b/src/xrGame/alife_simulator_base.cpp @@ -6,7 +6,7 @@ // Description : ALife Simulator base class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "alife_simulator_base.h" #include "alife_simulator_header.h" @@ -19,7 +19,7 @@ #include "alife_smart_terrain_registry.h" #include "alife_group_registry.h" #include "alife_registry_container.h" -#include "xrserver.h" +#include "xrServer.h" #include "level_graph.h" #include "inventory_upgrade_manager.h" #include "Level.h" diff --git a/src/xrGame/alife_simulator_base2.cpp b/src/xrGame/alife_simulator_base2.cpp index c811ce2ea5..939104e72a 100644 --- a/src/xrGame/alife_simulator_base2.cpp +++ b/src/xrGame/alife_simulator_base2.cpp @@ -6,7 +6,7 @@ // Description : ALife Simulator base class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_simulator_base.h" #include "relation_registry.h" #include "alife_registry_wrappers.h" diff --git a/src/xrGame/alife_simulator_header.cpp b/src/xrGame/alife_simulator_header.cpp index 98c101d657..9e646d4f7a 100644 --- a/src/xrGame/alife_simulator_header.cpp +++ b/src/xrGame/alife_simulator_header.cpp @@ -6,7 +6,7 @@ // Description : ALife Simulator header //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_simulator_header.h" CALifeSimulatorHeader::~CALifeSimulatorHeader () diff --git a/src/xrGame/alife_simulator_script.cpp b/src/xrGame/alife_simulator_script.cpp index aa61646254..b988fc75b3 100644 --- a/src/xrGame/alife_simulator_script.cpp +++ b/src/xrGame/alife_simulator_script.cpp @@ -6,7 +6,7 @@ // Description : ALife Simulator script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "alife_simulator.h" #include "ai_space.h" diff --git a/src/xrGame/alife_smart_terrain_registry.cpp b/src/xrGame/alife_smart_terrain_registry.cpp index 013581c84a..8a05dab7b2 100644 --- a/src/xrGame/alife_smart_terrain_registry.cpp +++ b/src/xrGame/alife_smart_terrain_registry.cpp @@ -6,7 +6,7 @@ // Description : ALife smart terrain registry //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_smart_terrain_registry.h" #include "xrServer_Objects_ALife_Monsters.h" diff --git a/src/xrGame/alife_smart_terrain_task.cpp b/src/xrGame/alife_smart_terrain_task.cpp index 2108455f2d..4f89729e56 100644 --- a/src/xrGame/alife_smart_terrain_task.cpp +++ b/src/xrGame/alife_smart_terrain_task.cpp @@ -6,7 +6,7 @@ // Description : ALife smart terrain task //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_smart_terrain_task.h" #include "ai_space.h" #include "patrol_path_storage.h" diff --git a/src/xrGame/alife_smart_terrain_task_script.cpp b/src/xrGame/alife_smart_terrain_task_script.cpp index e3ea475e20..72c08fa3ef 100644 --- a/src/xrGame/alife_smart_terrain_task_script.cpp +++ b/src/xrGame/alife_smart_terrain_task_script.cpp @@ -6,7 +6,7 @@ // Description : ALife smart terrain task //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "alife_smart_terrain_task.h" diff --git a/src/xrGame/alife_smart_zone.cpp b/src/xrGame/alife_smart_zone.cpp index 7f23b37695..73efeeb9d4 100644 --- a/src/xrGame/alife_smart_zone.cpp +++ b/src/xrGame/alife_smart_zone.cpp @@ -6,7 +6,7 @@ // Description : ALife smart zone class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer_Objects_ALife.h" CSE_ALifeItemWeapon *CSE_ALifeSmartZone::tpfGetBestWeapon (ALife::EHitType &tHitType, float &fHitPower) diff --git a/src/xrGame/alife_spawn_registry.cpp b/src/xrGame/alife_spawn_registry.cpp index 97704b10dd..9fa1ba59c9 100644 --- a/src/xrGame/alife_spawn_registry.cpp +++ b/src/xrGame/alife_spawn_registry.cpp @@ -6,7 +6,7 @@ // Description : ALife spawn registry //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_spawn_registry.h" #include "object_broker.h" #include "game_base.h" diff --git a/src/xrGame/alife_spawn_registry_header.cpp b/src/xrGame/alife_spawn_registry_header.cpp index 0c335add9e..aa2f296713 100644 --- a/src/xrGame/alife_spawn_registry_header.cpp +++ b/src/xrGame/alife_spawn_registry_header.cpp @@ -6,10 +6,10 @@ // Description : ALife spawn registry header //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_spawn_registry_header.h" #include "alife_space.h" -#include "../xrEngine/xrlevel.h" +#include "../xrEngine/xrLevel.h" CALifeSpawnHeader::~CALifeSpawnHeader () { diff --git a/src/xrGame/alife_spawn_registry_spawn.cpp b/src/xrGame/alife_spawn_registry_spawn.cpp index 3dc74a8026..f4b4a3419d 100644 --- a/src/xrGame/alife_spawn_registry_spawn.cpp +++ b/src/xrGame/alife_spawn_registry_spawn.cpp @@ -6,7 +6,7 @@ // Description : ALife spawn registry spawn routines //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_spawn_registry.h" #include "random32.h" diff --git a/src/xrGame/alife_storage_manager.cpp b/src/xrGame/alife_storage_manager.cpp index f694ad617f..695d8ade21 100644 --- a/src/xrGame/alife_storage_manager.cpp +++ b/src/xrGame/alife_storage_manager.cpp @@ -6,7 +6,7 @@ // Description : ALife Simulator storage manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_storage_manager.h" #include "alife_simulator_header.h" #include "alife_time_manager.h" @@ -15,7 +15,7 @@ #include "alife_graph_registry.h" #include "alife_group_registry.h" #include "alife_registry_container.h" -#include "xrserver.h" +#include "xrServer.h" #include "Level.h" #include "../xrEngine/x_ray.h" #include "saved_game_wrapper.h" diff --git a/src/xrGame/alife_story_registry.cpp b/src/xrGame/alife_story_registry.cpp index 70d8f97a68..f17789b52b 100644 --- a/src/xrGame/alife_story_registry.cpp +++ b/src/xrGame/alife_story_registry.cpp @@ -6,7 +6,7 @@ // Description : ALife story registry //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_story_registry.h" #include "xrServer_Objects_ALife.h" #include "ai_space.h" diff --git a/src/xrGame/alife_surge_manager.cpp b/src/xrGame/alife_surge_manager.cpp index f5643bbea0..a086877d87 100644 --- a/src/xrGame/alife_surge_manager.cpp +++ b/src/xrGame/alife_surge_manager.cpp @@ -6,7 +6,7 @@ // Description : ALife Simulator surge manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_surge_manager.h" #include "alife_object_registry.h" #include "alife_spawn_registry.h" @@ -18,7 +18,7 @@ #include "ef_storage.h" #include "ef_pattern.h" #include "graph_engine.h" -#include "xrserver.h" +#include "xrServer.h" #include "alife_human_brain.h" using namespace ALife; diff --git a/src/xrGame/alife_switch_manager.cpp b/src/xrGame/alife_switch_manager.cpp index 077b7adaed..2379bc81a4 100644 --- a/src/xrGame/alife_switch_manager.cpp +++ b/src/xrGame/alife_switch_manager.cpp @@ -6,14 +6,14 @@ // Description : ALife Simulator switch manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_switch_manager.h" #include "xrServer_Objects_ALife.h" #include "alife_graph_registry.h" #include "alife_object_registry.h" #include "alife_schedule_registry.h" #include "../game_level_cross_table.h" -#include "xrserver.h" +#include "xrServer.h" #include "ai_space.h" #include "level_graph.h" diff --git a/src/xrGame/alife_time_manager.cpp b/src/xrGame/alife_time_manager.cpp index 4e897b7100..f63c47052e 100644 --- a/src/xrGame/alife_time_manager.cpp +++ b/src/xrGame/alife_time_manager.cpp @@ -6,7 +6,7 @@ // Description : ALfie time manager class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_time_manager.h" #include "../xrEngine/date_time.h" diff --git a/src/xrGame/alife_trader.cpp b/src/xrGame/alife_trader.cpp index 3b13a5323c..67a6074a4e 100644 --- a/src/xrGame/alife_trader.cpp +++ b/src/xrGame/alife_trader.cpp @@ -6,7 +6,7 @@ // Description : ALife trader class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer_Objects_ALife_Monsters.h" #include "ai_space.h" #include "alife_simulator.h" diff --git a/src/xrGame/alife_trader_abstract.cpp b/src/xrGame/alife_trader_abstract.cpp index 31a16062b9..deaf1369a6 100644 --- a/src/xrGame/alife_trader_abstract.cpp +++ b/src/xrGame/alife_trader_abstract.cpp @@ -6,7 +6,7 @@ // Description : ALife trader abstract class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer_Objects_ALife_Monsters.h" #include "alife_simulator.h" #include "specific_character.h" diff --git a/src/xrGame/alife_update_manager.cpp b/src/xrGame/alife_update_manager.cpp index e2a12cd739..ec328c2d79 100644 --- a/src/xrGame/alife_update_manager.cpp +++ b/src/xrGame/alife_update_manager.cpp @@ -6,7 +6,7 @@ // Description : ALife Simulator update manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "alife_update_manager.h" #include "alife_simulator_header.h" #include "alife_time_manager.h" @@ -15,7 +15,7 @@ #include "alife_spawn_registry.h" #include "alife_object_registry.h" #include "ef_storage.h" -#include "xrserver.h" +#include "xrServer.h" #include "Level.h" #include "graph_engine.h" #include "../xrEngine/x_ray.h" @@ -250,7 +250,7 @@ bool CALifeUpdateManager::change_level (NET_Packet &net_packet) return (true); } -#include "../xrEngine/igame_persistent.h" +#include "../xrEngine/IGame_Persistent.h" void CALifeUpdateManager::new_game (LPCSTR save_name) { // g_pGamePersistent->LoadTitle ("st_creating_new_game"); diff --git a/src/xrGame/ammunition_groups.cpp b/src/xrGame/ammunition_groups.cpp index 9c7d6d195d..2f5e21a89f 100644 --- a/src/xrGame/ammunition_groups.cpp +++ b/src/xrGame/ammunition_groups.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "ammunition_groups.h" #include "ui/UIBuyWndShared.h" #include "../xrCore/xr_ini.h" diff --git a/src/xrGame/animation_movement_controller.cpp b/src/xrGame/animation_movement_controller.cpp index b6ae6340ba..c4a1ffa644 100644 --- a/src/xrGame/animation_movement_controller.cpp +++ b/src/xrGame/animation_movement_controller.cpp @@ -5,7 +5,7 @@ #include "game_object_space.h" #include "../xrPhysics/matrix_utils.h" #ifdef DEBUG -#include "phdebug.h" +#include "PHDebug.h" #endif void DBG_DrawBones( const Fmatrix &xform, IKinematics *K ); diff --git a/src/xrGame/animation_script_callback.cpp b/src/xrGame/animation_script_callback.cpp index dd4be04804..a38822df57 100644 --- a/src/xrGame/animation_script_callback.cpp +++ b/src/xrGame/animation_script_callback.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "animation_script_callback.h" #include "../xrScripts/script_callback_ex.h" -#include "gameobject.h" +#include "GameObject.h" #include "game_object_space.h" #include "../Include/xrRender/KinematicsAnimated.h" diff --git a/src/xrGame/animation_utils.cpp b/src/xrGame/animation_utils.cpp index 0b587c8572..6e944fe359 100644 --- a/src/xrGame/animation_utils.cpp +++ b/src/xrGame/animation_utils.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "animation_utils.h" #include "../Include/xrRender/Kinematics.h" diff --git a/src/xrGame/antirad.cpp b/src/xrGame/antirad.cpp index c7e5248508..ce7b3d106a 100644 --- a/src/xrGame/antirad.cpp +++ b/src/xrGame/antirad.cpp @@ -3,7 +3,7 @@ // Antirad - таблетки выводящие радиацию /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "antirad.h" #include "../xrPhysics/PhysicsShell.h" diff --git a/src/xrGame/artefact_activation.cpp b/src/xrGame/artefact_activation.cpp index f4c25afc5b..02b774071c 100644 --- a/src/xrGame/artefact_activation.cpp +++ b/src/xrGame/artefact_activation.cpp @@ -5,7 +5,7 @@ // Autor : Alexander Maniluk // Description : artefact activation class //////////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "artefact_activation.h" #include "../xrPhysics/PhysicsShell.h" @@ -19,7 +19,7 @@ #include "Level.h" #include "ai_object_location.h" #include "xrServer_Objects_ALife_Monsters.h" -#include "../xrPhysics/iphworld.h" +#include "../xrPhysics/IPHWorld.h" #include "restriction_space.h" #include "../xrEngine/IGame_Persistent.h" diff --git a/src/xrGame/artefact_script.cpp b/src/xrGame/artefact_script.cpp index abcc5c7a73..2393ff1966 100644 --- a/src/xrGame/artefact_script.cpp +++ b/src/xrGame/artefact_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "Artefact.h" #include "MercuryBall.h" diff --git a/src/xrGame/atlas_submit_queue.cpp b/src/xrGame/atlas_submit_queue.cpp index a2af27f131..efe07b8d8d 100644 --- a/src/xrGame/atlas_submit_queue.cpp +++ b/src/xrGame/atlas_submit_queue.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "atlas_submit_queue.h" #include "stats_submitter.h" #include "login_manager.h" diff --git a/src/xrGame/attachable_item.cpp b/src/xrGame/attachable_item.cpp index 68d290cb26..29e8b654d6 100644 --- a/src/xrGame/attachable_item.cpp +++ b/src/xrGame/attachable_item.cpp @@ -6,10 +6,10 @@ // Description : Attachable item //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" -#include "physicsshellholder.h" +#include "StdAfx.h" +#include "PhysicsShellHolder.h" #include "attachable_item.h" -#include "inventoryowner.h" +#include "InventoryOwner.h" #include "Inventory.h" #include "../xrEngine/xr_input.h" #include "../../xrUI/ui_base.h" diff --git a/src/xrGame/attachment_owner.cpp b/src/xrGame/attachment_owner.cpp index 33c8d43815..c34a4e55fe 100644 --- a/src/xrGame/attachment_owner.cpp +++ b/src/xrGame/attachment_owner.cpp @@ -6,12 +6,12 @@ // Description : Attachment owner //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "attachment_owner.h" #include "attachable_item.h" #include "../Include/xrRender/Kinematics.h" #include "inventory_item.h" -#include "physicsshellholder.h" +#include "PhysicsShellHolder.h" CAttachmentOwner::~CAttachmentOwner() { diff --git a/src/xrGame/autosave_manager.cpp b/src/xrGame/autosave_manager.cpp index d8b33c5968..0671701266 100644 --- a/src/xrGame/autosave_manager.cpp +++ b/src/xrGame/autosave_manager.cpp @@ -6,7 +6,7 @@ // Description : Autosave manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "autosave_manager.h" #include "../xrEngine/date_time.h" #include "ai_space.h" diff --git a/src/xrGame/awards_store.cpp b/src/xrGame/awards_store.cpp index e5053f87a2..9e697c1d65 100644 --- a/src/xrGame/awards_store.cpp +++ b/src/xrGame/awards_store.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "awards_store.h" -#include "GameSpy/GameSpy_Full.h" -#include "GameSpy/GAmeSpy_SAKE.h" +#include "gamespy/GameSpy_Full.h" +#include "gamespy/GameSpy_SAKE.h" namespace gamespy_profile { diff --git a/src/xrGame/awards_store.h b/src/xrGame/awards_store.h index 65ba82d66f..946dcf49f2 100644 --- a/src/xrGame/awards_store.h +++ b/src/xrGame/awards_store.h @@ -3,7 +3,7 @@ #include "../xrCore/associative_vector.h" #include "profile_data_types.h" -#include "../xrGameSpy/GameSpy/sake/sake.h" +#include "../xrGameSpy/gamespy/sake/sake.h" #include "gsc_dsigned_ltx.h" class CGameSpy_Full; diff --git a/src/xrGame/base_client_classes_script.cpp b/src/xrGame/base_client_classes_script.cpp index 2e5777a68e..e819975ff7 100644 --- a/src/xrGame/base_client_classes_script.cpp +++ b/src/xrGame/base_client_classes_script.cpp @@ -6,11 +6,11 @@ // Description : XRay base client classes script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "base_client_classes.h" #include "base_client_classes_wrappers.h" -#include "../xrEngine/feel_sound.h" +#include "../xrEngine/Feel_Sound.h" //#include "../Include/xrRender/RenderVisual.h" #include "../Include/xrRender/RenderVisual.h" #include "../Include/xrRender/Kinematics.h" diff --git a/src/xrGame/base_client_classes_wrappers.h b/src/xrGame/base_client_classes_wrappers.h index 7956e8ca7d..51d2f9969b 100644 --- a/src/xrGame/base_client_classes_wrappers.h +++ b/src/xrGame/base_client_classes_wrappers.h @@ -10,13 +10,13 @@ #include "../xrScripts/script_export_space.h" #include "base_client_classes.h" -#include "../xrEngine/engineapi.h" -#include "../xrcdb/ispatial.h" -#include "../xrEngine/isheduled.h" -#include "../xrEngine/irenderable.h" -#include "../xrEngine/icollidable.h" +#include "../xrEngine/EngineAPI.h" +#include "../xrCDB/ISpatial.h" +#include "../xrEngine/ISheduled.h" +#include "../xrEngine/IRenderable.h" +#include "../xrEngine/ICollidable.h" #include "../xrEngine/xr_object.h" -#include "entity.h" +#include "Entity.h" #include "ai_space.h" #include "../xrScripts/script_engine.h" #include diff --git a/src/xrGame/best_scores_helper.cpp b/src/xrGame/best_scores_helper.cpp index bffdcdc9f2..ace40f20ba 100644 --- a/src/xrGame/best_scores_helper.cpp +++ b/src/xrGame/best_scores_helper.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "best_scores_helper.h" #include "game_base.h" diff --git a/src/xrGame/best_scores_store.cpp b/src/xrGame/best_scores_store.cpp index fcb49c3379..590b57efaa 100644 --- a/src/xrGame/best_scores_store.cpp +++ b/src/xrGame/best_scores_store.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "best_scores_store.h" -#include "GameSpy/GameSpy_Full.h" -#include "GameSpy/GAmeSpy_SAKE.h" +#include "gamespy/GameSpy_Full.h" +#include "gamespy/GameSpy_SAKE.h" namespace gamespy_profile { diff --git a/src/xrGame/best_scores_store.h b/src/xrGame/best_scores_store.h index d6f4818284..5ae4291df2 100644 --- a/src/xrGame/best_scores_store.h +++ b/src/xrGame/best_scores_store.h @@ -2,7 +2,7 @@ #define BEST_SCORES_SYSTEM_INCLUDED #include "../xrCore/associative_vector.h" -#include "../xrGameSpy/GameSpy/sake/sake.h" +#include "../xrGameSpy/gamespy/sake/sake.h" #include "profile_data_types.h" class CGameSpy_Full; diff --git a/src/xrGame/black_list.cpp b/src/xrGame/black_list.cpp index 83a4ef3f36..78cae86868 100644 --- a/src/xrGame/black_list.cpp +++ b/src/xrGame/black_list.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "black_list.h" #include "Level.h" #include "game_cl_base.h" diff --git a/src/xrGame/bone_groups.cpp b/src/xrGame/bone_groups.cpp index 5c94c0e598..b53ce64216 100644 --- a/src/xrGame/bone_groups.cpp +++ b/src/xrGame/bone_groups.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "bone_groups.h" #include "Actor.h" #include "../Include/xrRender/Kinematics.h" diff --git a/src/xrGame/cameralook.cpp b/src/xrGame/cameralook.cpp index d4afee1cc1..f9f33b067a 100644 --- a/src/xrGame/cameralook.cpp +++ b/src/xrGame/cameralook.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop -#include "CameraLook.h" -#include "../xrEngine/Cameramanager.h" +#include "cameralook.h" +#include "../xrEngine/CameraManager.h" #include "../xrEngine/xr_level_controller.h" #include "Actor.h" #include "object_broker.h" @@ -193,8 +193,8 @@ void CCameraLook2::UpdateDistance(Fvector& pivot, Fvector& correction) } #include "Actor.h" -#include "inventory.h" -#include "weapon.h" +#include "Inventory.h" +#include "Weapon.h" void CCameraLook2::Update(Fvector& point, Fvector& noise_dangle) { Fmatrix mR, R; diff --git a/src/xrGame/car_memory.cpp b/src/xrGame/car_memory.cpp index 8b3892f522..5898a63188 100644 --- a/src/xrGame/car_memory.cpp +++ b/src/xrGame/car_memory.cpp @@ -6,9 +6,9 @@ // Description : car memory //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "car_memory.h" -#include "car.h" +#include "Car.h" car_memory::car_memory (CCar *object) : inherited ( diff --git a/src/xrGame/cdkey_ban_list.cpp b/src/xrGame/cdkey_ban_list.cpp index 0e3bedd75f..199f85c45a 100644 --- a/src/xrGame/cdkey_ban_list.cpp +++ b/src/xrGame/cdkey_ban_list.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "cdkey_ban_list.h" #include "object_broker.h" diff --git a/src/xrGame/character_community.cpp b/src/xrGame/character_community.cpp index 1aa9c767aa..b873cd16ff 100644 --- a/src/xrGame/character_community.cpp +++ b/src/xrGame/character_community.cpp @@ -3,7 +3,7 @@ // ////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "character_community.h" ////////////////////////////////////////////////////////////////////////// diff --git a/src/xrGame/character_hit_animations.cpp b/src/xrGame/character_hit_animations.cpp index 958d7505e7..059ea33941 100644 --- a/src/xrGame/character_hit_animations.cpp +++ b/src/xrGame/character_hit_animations.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "character_hit_animations.h" @@ -8,7 +8,7 @@ #include "../Include/xrRender/Kinematics.h" #include "animation_utils.h" #ifdef DEBUG -#include "phdebug.h" +#include "PHDebug.h" #endif hit_animation_global_params ghit_anims_params ; diff --git a/src/xrGame/character_rank.cpp b/src/xrGame/character_rank.cpp index c9ccb1dd53..df68de2231 100644 --- a/src/xrGame/character_rank.cpp +++ b/src/xrGame/character_rank.cpp @@ -3,7 +3,7 @@ // ними ////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "character_rank.h" diff --git a/src/xrGame/character_reputation.cpp b/src/xrGame/character_reputation.cpp index 063e928a56..b7e4b37971 100644 --- a/src/xrGame/character_reputation.cpp +++ b/src/xrGame/character_reputation.cpp @@ -3,7 +3,7 @@ // отношений между ними ////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "character_reputation.h" diff --git a/src/xrGame/character_shell_control.cpp b/src/xrGame/character_shell_control.cpp index 40f31198b2..cba0f1a3bc 100644 --- a/src/xrGame/character_shell_control.cpp +++ b/src/xrGame/character_shell_control.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "character_shell_control.h" diff --git a/src/xrGame/client_spawn_manager.cpp b/src/xrGame/client_spawn_manager.cpp index 875291b240..6d6688fad6 100644 --- a/src/xrGame/client_spawn_manager.cpp +++ b/src/xrGame/client_spawn_manager.cpp @@ -6,13 +6,13 @@ // Description : Seniority hierarchy holder //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "client_spawn_manager.h" #include "ai_space.h" #include "../xrScripts/script_engine.h" #include "Level.h" -#include "gameobject.h" +#include "GameObject.h" #include "script_game_object.h" CClientSpawnManager::~CClientSpawnManager () diff --git a/src/xrGame/client_spawn_manager_script.cpp b/src/xrGame/client_spawn_manager_script.cpp index 8e61e1f18c..8b45c602d0 100644 --- a/src/xrGame/client_spawn_manager_script.cpp +++ b/src/xrGame/client_spawn_manager_script.cpp @@ -6,7 +6,7 @@ // Description : Client spawn manager script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "client_spawn_manager.h" diff --git a/src/xrGame/configs_common.cpp b/src/xrGame/configs_common.cpp index d5551eb7cf..93aebfab02 100644 --- a/src/xrGame/configs_common.cpp +++ b/src/xrGame/configs_common.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "configs_common.h" namespace mp_anticheat diff --git a/src/xrGame/configs_dump_verifyer.cpp b/src/xrGame/configs_dump_verifyer.cpp index 79fc0af23a..c698e33e39 100644 --- a/src/xrGame/configs_dump_verifyer.cpp +++ b/src/xrGame/configs_dump_verifyer.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "configs_dump_verifyer.h" #include "configs_common.h" #include "configs_dumper.h" diff --git a/src/xrGame/configs_dumper.cpp b/src/xrGame/configs_dumper.cpp index 202ffef81a..c12a807b22 100644 --- a/src/xrGame/configs_dumper.cpp +++ b/src/xrGame/configs_dumper.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "configs_dumper.h" #include "configs_common.h" #include "../xrCore/ppmd_compressor.h" diff --git a/src/xrGame/console_commands.cpp b/src/xrGame/console_commands.cpp index b2a3664aef..35b30768fe 100644 --- a/src/xrGame/console_commands.cpp +++ b/src/xrGame/console_commands.cpp @@ -1,12 +1,12 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "../xrEngine/xr_ioconsole.h" +#include "../xrEngine/XR_IOConsole.h" #include "../xrEngine/xr_ioc_cmd.h" -#include "../xrEngine/customhud.h" -#include "../xrEngine/fdemorecord.h" -#include "../xrEngine/fdemoplay.h" +#include "../xrEngine/CustomHUD.h" +#include "../xrEngine/FDemoRecord.h" +#include "../xrEngine/FDemoPlay.h" #include "xrMessages.h" -#include "xrserver.h" +#include "xrServer.h" #include "Level.h" #include "ai_debug.h" #include "alife_simulator.h" @@ -23,11 +23,11 @@ #include "../xrScripts/script_process.h" #include "xrServer_Objects.h" #include "ui/UIMainIngameWnd.h" -#include "../xrPhysics/iphworld.h" +#include "../xrPhysics/IPHWorld.h" #include "../xrEngine/string_table.h" #include "autosave_manager.h" #include "ai_space.h" -#include "ai/monsters/BaseMonster/base_monster.h" +#include "ai/monsters/basemonster/base_monster.h" #include "../xrEngine/date_time.h" #include "mt_config.h" #include "ui/UIOptConCom.h" @@ -44,7 +44,7 @@ #include "character_hit_animations_params.h" #include "inventory_upgrade_manager.h" -#include "GameSpy/GameSpy_Full.h" +#include "gamespy/GameSpy_Full.h" #include "ai_debug_variables.h" #include "../xrPhysics/console_vars.h" @@ -2160,7 +2160,7 @@ class CCC_GSpawnToInventory : public IConsole_Command { } }; -#include "../include/xrrender/particles_systems_library_interface.hpp" +#include "../Include/xrRender/particles_systems_library_interface.hpp" #include "../Layers/xrRender/PSLibrary.h" #include "GamePersistent.h" class CCC_Particle_TEST : public IConsole_Command diff --git a/src/xrGame/console_commands_mp.cpp b/src/xrGame/console_commands_mp.cpp index 6ecd24b7ab..95e56c553d 100644 --- a/src/xrGame/console_commands_mp.cpp +++ b/src/xrGame/console_commands_mp.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "../xrEngine/xr_ioconsole.h" +#include "StdAfx.h" +#include "../xrEngine/XR_IOConsole.h" #include "../xrEngine/xr_ioc_cmd.h" #include "Level.h" #include "xrServer.h" @@ -8,7 +8,7 @@ #include "Actor.h" #include "xrServer_Object_base.h" #include "RegistryFuncs.h" -#include "gamepersistent.h" +#include "GamePersistent.h" #include "MainMenu.h" #include "UIGameCustom.h" #include "game_sv_deathmatch.h" diff --git a/src/xrGame/console_registrator_script.cpp b/src/xrGame/console_registrator_script.cpp index b0026183b4..1f5ad71c53 100644 --- a/src/xrGame/console_registrator_script.cpp +++ b/src/xrGame/console_registrator_script.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "console_registrator.h" -#include "../xrEngine/xr_ioconsole.h" +#include "../xrEngine/XR_IOConsole.h" using namespace luabind; diff --git a/src/xrGame/cover_evaluators.cpp b/src/xrGame/cover_evaluators.cpp index 856658a1a6..42e547fb5c 100644 --- a/src/xrGame/cover_evaluators.cpp +++ b/src/xrGame/cover_evaluators.cpp @@ -6,7 +6,7 @@ // Description : Cover evaluators //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "cover_evaluators.h" #include "cover_point.h" #include "ai_space.h" diff --git a/src/xrGame/cover_manager.cpp b/src/xrGame/cover_manager.cpp index f4d6ec2574..7f9b3577a0 100644 --- a/src/xrGame/cover_manager.cpp +++ b/src/xrGame/cover_manager.cpp @@ -6,7 +6,7 @@ // Description : Cover manager class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "level_graph.h" #include "cover_manager.h" #include "ai_space.h" diff --git a/src/xrGame/cover_point_script.cpp b/src/xrGame/cover_point_script.cpp index cfe02783ea..872393ff95 100644 --- a/src/xrGame/cover_point_script.cpp +++ b/src/xrGame/cover_point_script.cpp @@ -6,7 +6,7 @@ // Description : Cover point class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "cover_point.h" diff --git a/src/xrGame/cta_game_artefact.cpp b/src/xrGame/cta_game_artefact.cpp index d0f4be3d6e..cd5b1aac3c 100644 --- a/src/xrGame/cta_game_artefact.cpp +++ b/src/xrGame/cta_game_artefact.cpp @@ -6,7 +6,7 @@ // Description : Artefact object for Capture The Artefact game mode //////////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "cta_game_artefact.h" #include "cta_game_artefact_activation.h" #include "game_cl_capture_the_artefact.h" diff --git a/src/xrGame/cta_game_artefact_activation.cpp b/src/xrGame/cta_game_artefact_activation.cpp index 1e41f78c4e..d4c1e55cc2 100644 --- a/src/xrGame/cta_game_artefact_activation.cpp +++ b/src/xrGame/cta_game_artefact_activation.cpp @@ -5,7 +5,7 @@ // Autor : Alexander Maniluk // Description : Artefact object for Capture The Artefact game mode //////////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "cta_game_artefact_activation.h" #include "../xrPhysics/PhysicsShell.h" @@ -19,7 +19,7 @@ #include "Level.h" #include "ai_object_location.h" #include "xrServer_Objects_ALife_Monsters.h" -#include "../xrPhysics/iphworld.h" +#include "../xrPhysics/IPHWorld.h" #include "restriction_space.h" #include "../xrEngine/IGame_Persistent.h" diff --git a/src/xrGame/damage_manager.cpp b/src/xrGame/damage_manager.cpp index 0c5a0c6a5f..9a251398f0 100644 --- a/src/xrGame/damage_manager.cpp +++ b/src/xrGame/damage_manager.cpp @@ -7,7 +7,7 @@ //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "damage_manager.h" #include "../xrEngine/xr_object.h" #include "../Include/xrRender/Kinematics.h" diff --git a/src/xrGame/danger_cover_location.cpp b/src/xrGame/danger_cover_location.cpp index 629aadd9ab..5e252e9ea4 100644 --- a/src/xrGame/danger_cover_location.cpp +++ b/src/xrGame/danger_cover_location.cpp @@ -6,7 +6,7 @@ // Description : Danger cover location //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "danger_cover_location.h" #include "cover_point.h" diff --git a/src/xrGame/danger_explosive.cpp b/src/xrGame/danger_explosive.cpp index 638e5a8a9e..8bb638df58 100644 --- a/src/xrGame/danger_explosive.cpp +++ b/src/xrGame/danger_explosive.cpp @@ -6,10 +6,10 @@ // Description : Danger explosive class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "danger_explosive.h" -#include "gameobject.h" -#include "explosive.h" +#include "GameObject.h" +#include "Explosive.h" bool CDangerExplosive::operator== (const u16 &object_id) const { diff --git a/src/xrGame/danger_explosive.h b/src/xrGame/danger_explosive.h index 367118af02..8b05d93a09 100644 --- a/src/xrGame/danger_explosive.h +++ b/src/xrGame/danger_explosive.h @@ -8,8 +8,8 @@ #pragma once -#include "gameobject.h" -#include "explosive.h" +#include "GameObject.h" +#include "Explosive.h" class CExplosive; class CGameObject; diff --git a/src/xrGame/danger_location.cpp b/src/xrGame/danger_location.cpp index 0a0e0fde46..cd78d16320 100644 --- a/src/xrGame/danger_location.cpp +++ b/src/xrGame/danger_location.cpp @@ -6,7 +6,7 @@ // Description : Danger location //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "danger_location.h" bool CDangerLocation::useful () const diff --git a/src/xrGame/danger_manager.cpp b/src/xrGame/danger_manager.cpp index cecd459009..94ddaa1909 100644 --- a/src/xrGame/danger_manager.cpp +++ b/src/xrGame/danger_manager.cpp @@ -6,10 +6,10 @@ // Description : Danger manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "danger_manager.h" -#include "custommonster.h" +#include "CustomMonster.h" #include "memory_space.h" #include "memory_manager.h" #include "enemy_manager.h" diff --git a/src/xrGame/danger_object.cpp b/src/xrGame/danger_object.cpp index 0b1efcf925..b6924737b3 100644 --- a/src/xrGame/danger_object.cpp +++ b/src/xrGame/danger_object.cpp @@ -6,7 +6,7 @@ // Description : Danger object //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "danger_object.h" CDangerObject::~CDangerObject () diff --git a/src/xrGame/danger_object_location.cpp b/src/xrGame/danger_object_location.cpp index 59862339a1..f2a901678c 100644 --- a/src/xrGame/danger_object_location.cpp +++ b/src/xrGame/danger_object_location.cpp @@ -6,9 +6,9 @@ // Description : Danger object location //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "danger_object_location.h" -#include "gameobject.h" +#include "GameObject.h" const Fvector &CDangerObjectLocation::position () const { diff --git a/src/xrGame/dbg_draw_frustum.cpp b/src/xrGame/dbg_draw_frustum.cpp index 346f58b7d5..30ae952fa0 100644 --- a/src/xrGame/dbg_draw_frustum.cpp +++ b/src/xrGame/dbg_draw_frustum.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Level.h" -#include "../xrCDB/frustum.h" +#include "../xrCDB/Frustum.h" #ifdef DEBUG_DRAW # include "debug_renderer.h" diff --git a/src/xrGame/death_anims.cpp b/src/xrGame/death_anims.cpp index 152bcd6a59..b70b5d5634 100644 --- a/src/xrGame/death_anims.cpp +++ b/src/xrGame/death_anims.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "death_anims.h" diff --git a/src/xrGame/death_anims.h b/src/xrGame/death_anims.h index 1b69fc6bbd..c4c297e8e4 100644 --- a/src/xrGame/death_anims.h +++ b/src/xrGame/death_anims.h @@ -1,7 +1,7 @@ #pragma once struct SHit; -#include "../include/xrRender/animation_motion.h" +#include "../Include/xrRender/animation_motion.h" struct MotionID; class CInifile; diff --git a/src/xrGame/death_anims_predicates.cpp b/src/xrGame/death_anims_predicates.cpp index 118f717539..68ce567843 100644 --- a/src/xrGame/death_anims_predicates.cpp +++ b/src/xrGame/death_anims_predicates.cpp @@ -1,13 +1,13 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "death_anims.h" -#include "actor.h" +#include "Actor.h" #include "ai/stalker/ai_stalker.h" #include "stalker_movement_manager_smart_cover.h" -#include "weaponshotgun.h" -#include "explosive.h" -#include "weaponmagazined.h" +#include "WeaponShotgun.h" +#include "Explosive.h" +#include "WeaponMagazined.h" #include "CharacterPhysicsSupport.h" #include "animation_utils.h" #ifdef DEBUG diff --git a/src/xrGame/debug_renderer.cpp b/src/xrGame/debug_renderer.cpp index 06e4c90f7d..d263bf6216 100644 --- a/src/xrGame/debug_renderer.cpp +++ b/src/xrGame/debug_renderer.cpp @@ -6,7 +6,7 @@ // Description : debug renderer //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #ifdef DEBUG_DRAW # include "debug_renderer.h" diff --git a/src/xrGame/debug_text_tree.cpp b/src/xrGame/debug_text_tree.cpp index f6eab27974..b8275c04cf 100644 --- a/src/xrGame/debug_text_tree.cpp +++ b/src/xrGame/debug_text_tree.cpp @@ -6,7 +6,7 @@ // Description : Text tree for onscreen debugging //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "debug_text_tree.h" #include "Level.h" diff --git a/src/xrGame/detail_path_manager.cpp b/src/xrGame/detail_path_manager.cpp index 2d269d9bc3..5f9b3bae82 100644 --- a/src/xrGame/detail_path_manager.cpp +++ b/src/xrGame/detail_path_manager.cpp @@ -6,7 +6,7 @@ // Description : Detail path manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "detail_path_manager.h" #include "ai_space.h" #include "ai_object_location.h" diff --git a/src/xrGame/detail_path_manager_smooth.cpp b/src/xrGame/detail_path_manager_smooth.cpp index c69fdd0398..4416d14c26 100644 --- a/src/xrGame/detail_path_manager_smooth.cpp +++ b/src/xrGame/detail_path_manager_smooth.cpp @@ -6,7 +6,7 @@ // Description : Detail path manager criteria path builder //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "detail_path_manager.h" #include "ai_space.h" #include "level_graph.h" diff --git a/src/xrGame/doors_actor.cpp b/src/xrGame/doors_actor.cpp index 0ba33ff42f..3215bb2133 100644 --- a/src/xrGame/doors_actor.cpp +++ b/src/xrGame/doors_actor.cpp @@ -4,7 +4,7 @@ // Copyright (C) GSC Game World - 2009 //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "doors_actor.h" #include "doors_door.h" #include "ai/stalker/ai_stalker.h" diff --git a/src/xrGame/doors_door.cpp b/src/xrGame/doors_door.cpp index bc8538e97f..7a74308307 100644 --- a/src/xrGame/doors_door.cpp +++ b/src/xrGame/doors_door.cpp @@ -4,10 +4,10 @@ // Copyright (C) GSC Game World - 2009 //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "doors_door.h" -#include "physicobject.h" +#include "PhysicObject.h" #include "../xrScripts/script_callback_ex.h" #include "script_game_object.h" #include "doors.h" diff --git a/src/xrGame/doors_manager.cpp b/src/xrGame/doors_manager.cpp index bc8b8686cb..ec7a7d6455 100644 --- a/src/xrGame/doors_manager.cpp +++ b/src/xrGame/doors_manager.cpp @@ -4,9 +4,9 @@ // Copyright (C) GSC Game World - 2009 //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "doors_manager.h" -#include "gameobject.h" +#include "GameObject.h" #include "doors_door.h" #include "doors_actor.h" diff --git a/src/xrGame/double_shot_double_kill.cpp b/src/xrGame/double_shot_double_kill.cpp index 95913c6f59..9d37ed0f02 100644 --- a/src/xrGame/double_shot_double_kill.cpp +++ b/src/xrGame/double_shot_double_kill.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "double_shot_double_kill.h" #include "game_base.h" #include "Level.h" diff --git a/src/xrGame/dynamic_obstacles_avoider.cpp b/src/xrGame/dynamic_obstacles_avoider.cpp index 6b674ca9ad..ddd737e9ad 100644 --- a/src/xrGame/dynamic_obstacles_avoider.cpp +++ b/src/xrGame/dynamic_obstacles_avoider.cpp @@ -6,7 +6,7 @@ // Description : dynamic obstacles avoider //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "dynamic_obstacles_avoider.h" #include "ai_space.h" #include "moving_objects.h" diff --git a/src/xrGame/eatable_item.cpp b/src/xrGame/eatable_item.cpp index 75b307b904..002def23b6 100644 --- a/src/xrGame/eatable_item.cpp +++ b/src/xrGame/eatable_item.cpp @@ -6,7 +6,7 @@ // Description : Eatable item //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "eatable_item.h" #include "xrMessages.h" #include "physic_item.h" diff --git a/src/xrGame/eatable_item_object.cpp b/src/xrGame/eatable_item_object.cpp index 23f7ee1ad2..fa7f2792a3 100644 --- a/src/xrGame/eatable_item_object.cpp +++ b/src/xrGame/eatable_item_object.cpp @@ -6,7 +6,7 @@ // Description : Eatable item object implementation //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "eatable_item_object.h" CEatableItemObject::CEatableItemObject () diff --git a/src/xrGame/ef_pattern.cpp b/src/xrGame/ef_pattern.cpp index 625335d3e1..9d66f2cf95 100644 --- a/src/xrGame/ef_pattern.cpp +++ b/src/xrGame/ef_pattern.cpp @@ -6,7 +6,7 @@ // Description : Pattern based evaluation functions trained by supervised learning //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ef_pattern.h" #include "ef_primary.h" #include "ai_space.h" diff --git a/src/xrGame/ef_primary.cpp b/src/xrGame/ef_primary.cpp index e002edf614..526ebc0633 100644 --- a/src/xrGame/ef_primary.cpp +++ b/src/xrGame/ef_primary.cpp @@ -6,10 +6,10 @@ // Description : Primary evaluation function classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "Weapon.h" #include "entity_alive.h" -#include "inventoryowner.h" +#include "InventoryOwner.h" #include "alife_simulator.h" #include "ef_storage.h" #include "ai_space.h" diff --git a/src/xrGame/ef_storage.cpp b/src/xrGame/ef_storage.cpp index 298bab0ff6..35ed799cb1 100644 --- a/src/xrGame/ef_storage.cpp +++ b/src/xrGame/ef_storage.cpp @@ -6,7 +6,7 @@ // Description : Evaluation functions storage class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "ef_storage.h" #include "ef_primary.h" #include "ef_pattern.h" diff --git a/src/xrGame/ef_storage_script.cpp b/src/xrGame/ef_storage_script.cpp index 1bd81f3575..330470c9ea 100644 --- a/src/xrGame/ef_storage_script.cpp +++ b/src/xrGame/ef_storage_script.cpp @@ -6,7 +6,7 @@ // Description : Evaluation functions storage class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "ef_storage.h" #include "ai_space.h" diff --git a/src/xrGame/encyclopedia_article.cpp b/src/xrGame/encyclopedia_article.cpp index 015f32bf10..0844a380bf 100644 --- a/src/xrGame/encyclopedia_article.cpp +++ b/src/xrGame/encyclopedia_article.cpp @@ -3,7 +3,7 @@ // структура, хранящая и загружающая статьи в энциклопедию /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "encyclopedia_article.h" #include "../../xrUI/xrUIXmlParser.h" #include "../../xrUI/UIXmlInit.h" diff --git a/src/xrGame/enemy_manager.cpp b/src/xrGame/enemy_manager.cpp index 864026c4c1..13d04c4408 100644 --- a/src/xrGame/enemy_manager.cpp +++ b/src/xrGame/enemy_manager.cpp @@ -6,7 +6,7 @@ // Description : Enemy manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "enemy_manager.h" #include "memory_manager.h" diff --git a/src/xrGame/enemy_manager.h b/src/xrGame/enemy_manager.h index f934ac101f..aad2e75328 100644 --- a/src/xrGame/enemy_manager.h +++ b/src/xrGame/enemy_manager.h @@ -10,7 +10,7 @@ #include "object_manager.h" #include "entity_alive.h" -#include "custommonster.h" +#include "CustomMonster.h" #include "../xrScripts/script_callback_ex.h" class CAI_Stalker; diff --git a/src/xrGame/entity_alive.cpp b/src/xrGame/entity_alive.cpp index a8574e461f..04420205a0 100644 --- a/src/xrGame/entity_alive.cpp +++ b/src/xrGame/entity_alive.cpp @@ -1,18 +1,18 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "entity_alive.h" -#include "inventoryowner.h" +#include "InventoryOwner.h" #include "Inventory.h" -#include "../xrPhysics/physicsshell.h" -#include "../xrEngine/gamemtllib.h" -#include "phmovementcontrol.h" -#include "wound.h" +#include "../xrPhysics/PhysicsShell.h" +#include "../xrEngine/GameMtlLib.h" +#include "PHMovementControl.h" +#include "Wound.h" #include "xrMessages.h" #include "Level.h" #include "../Include/xrRender/Kinematics.h" #include "relation_registry.h" #include "monster_community.h" -#include "entitycondition.h" +#include "EntityCondition.h" #include "script_game_object.h" #include "Hit.h" #include "PHDestroyable.h" diff --git a/src/xrGame/entity_alive.h b/src/xrGame/entity_alive.h index 4973065c11..6c42a18ee1 100644 --- a/src/xrGame/entity_alive.h +++ b/src/xrGame/entity_alive.h @@ -1,6 +1,6 @@ #pragma once -#include "entity.h" +#include "Entity.h" // Igor diff --git a/src/xrGame/event_conditions_collection.cpp b/src/xrGame/event_conditions_collection.cpp index 63e9bb371e..ae2b9bf6c2 100644 --- a/src/xrGame/event_conditions_collection.cpp +++ b/src/xrGame/event_conditions_collection.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "event_conditions_collection.h" #include "object_broker.h" #include "game_state_accumulator.h" diff --git a/src/xrGame/faster_than_bullets_time.cpp b/src/xrGame/faster_than_bullets_time.cpp index cfda232d21..e1fb8c57d4 100644 --- a/src/xrGame/faster_than_bullets_time.cpp +++ b/src/xrGame/faster_than_bullets_time.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "faster_than_bullets_time.h" #include "hits_store.h" #include "game_state_accumulator.h" diff --git a/src/xrGame/file_transfer.cpp b/src/xrGame/file_transfer.cpp index 99c5d686e7..65e3a16fc2 100644 --- a/src/xrGame/file_transfer.cpp +++ b/src/xrGame/file_transfer.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xrMessages.h" #include "file_transfer.h" #include "Level.h" diff --git a/src/xrGame/filereceiver_node.cpp b/src/xrGame/filereceiver_node.cpp index 8f592ef9a7..8fcb6d8801 100644 --- a/src/xrGame/filereceiver_node.cpp +++ b/src/xrGame/filereceiver_node.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "filereceiver_node.h" namespace file_transfer diff --git a/src/xrGame/filetransfer_node.cpp b/src/xrGame/filetransfer_node.cpp index eab8d8cc60..eb26448a46 100644 --- a/src/xrGame/filetransfer_node.cpp +++ b/src/xrGame/filetransfer_node.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "filetransfer_node.h" #include "Level.h" #include "xrServer.h" diff --git a/src/xrGame/fire_disp_controller.cpp b/src/xrGame/fire_disp_controller.cpp index 55c1c901e4..32b10bb8ae 100644 --- a/src/xrGame/fire_disp_controller.cpp +++ b/src/xrGame/fire_disp_controller.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "fire_disp_controller.h" #include "Actor.h" #include "Inventory.h" diff --git a/src/xrGame/first_bullet_controller.cpp b/src/xrGame/first_bullet_controller.cpp index b21fa830bd..ec37878c7e 100644 --- a/src/xrGame/first_bullet_controller.cpp +++ b/src/xrGame/first_bullet_controller.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "first_bullet_controller.h" #include "Level.h" diff --git a/src/xrGame/flare.cpp b/src/xrGame/flare.cpp index 161b24e4f5..cd6e205787 100644 --- a/src/xrGame/flare.cpp +++ b/src/xrGame/flare.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "flare.h" #include "player_hud.h" #include "../xrEngine/LightAnimLibrary.h" diff --git a/src/xrGame/fs_registrator_script.cpp b/src/xrGame/fs_registrator_script.cpp index 86d6c8dd76..dc60b9298e 100644 --- a/src/xrGame/fs_registrator_script.cpp +++ b/src/xrGame/fs_registrator_script.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "fs_registrator.h" -#include "../xrcore/LocatorApi.h" +#include "../xrCore/LocatorAPI.h" using namespace luabind; diff --git a/src/xrGame/game_base.cpp b/src/xrGame/game_base.cpp index 622996cf67..15cbaf5692 100644 --- a/src/xrGame/game_base.cpp +++ b/src/xrGame/game_base.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "game_base.h" #include "ai_space.h" diff --git a/src/xrGame/game_cl_artefacthunt.cpp b/src/xrGame/game_cl_artefacthunt.cpp index 287e983575..8d4f3e0ee8 100644 --- a/src/xrGame/game_cl_artefacthunt.cpp +++ b/src/xrGame/game_cl_artefacthunt.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_cl_artefacthunt.h" #include "xrMessages.h" #include "Level.h" diff --git a/src/xrGame/game_cl_base.cpp b/src/xrGame/game_cl_base.cpp index 3f9a34345f..43ab1033a7 100644 --- a/src/xrGame/game_cl_base.cpp +++ b/src/xrGame/game_cl_base.cpp @@ -1,14 +1,14 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "game_cl_base.h" #include "Level.h" #include "GamePersistent.h" #include "UIGameCustom.h" #include "../xrScripts/script_engine.h" -#include "../xrEngine/xr_Level_controller.h" +#include "../xrEngine/xr_level_controller.h" #include "ui/UIMainIngameWnd.h" -#include "UI/UIGameTutorial.h" -#include "UI/UIMessagesWindow.h" +#include "ui/UIGameTutorial.h" +#include "ui/UIMessagesWindow.h" #include "../../xrUI/Widgets/UIDialogWnd.h" #include "../xrEngine/string_table.h" #include "game_cl_base_weapon_usage_statistic.h" diff --git a/src/xrGame/game_cl_base_weapon_usage_statistic.cpp b/src/xrGame/game_cl_base_weapon_usage_statistic.cpp index 0b58b8ecb1..488701245f 100644 --- a/src/xrGame/game_cl_base_weapon_usage_statistic.cpp +++ b/src/xrGame/game_cl_base_weapon_usage_statistic.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_cl_base.h" #include "Level.h" #include "Weapon.h" diff --git a/src/xrGame/game_cl_base_weapon_usage_statistic.h b/src/xrGame/game_cl_base_weapon_usage_statistic.h index bfa670c08d..ede0346ca2 100644 --- a/src/xrGame/game_cl_base_weapon_usage_statistic.h +++ b/src/xrGame/game_cl_base_weapon_usage_statistic.h @@ -1,5 +1,5 @@ #pragma once -#include "level_bullet_manager.h" +#include "Level_Bullet_Manager.h" #include "game_base_kill_type.h" #define STAT_TEAM_COUNT 3 diff --git a/src/xrGame/game_cl_base_weapon_usage_statistic_save.cpp b/src/xrGame/game_cl_base_weapon_usage_statistic_save.cpp index 2b2717aee1..438e087750 100644 --- a/src/xrGame/game_cl_base_weapon_usage_statistic_save.cpp +++ b/src/xrGame/game_cl_base_weapon_usage_statistic_save.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_cl_base.h" #include "Level.h" #include "game_cl_base_weapon_usage_statistic.h" diff --git a/src/xrGame/game_cl_capture_the_artefact.cpp b/src/xrGame/game_cl_capture_the_artefact.cpp index 0225619dbf..05e04a7093 100644 --- a/src/xrGame/game_cl_capture_the_artefact.cpp +++ b/src/xrGame/game_cl_capture_the_artefact.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "../xrEngine/xr_level_controller.h" #include "map_manager.h" #include "map_location.h" @@ -7,7 +7,7 @@ #include "Artefact.h" #include "ui/UIMainIngameWnd.h" #include "ui/UISkinSelector.h" -#include "ui/UIPDAWnd.h" +#include "ui/UIPdaWnd.h" #include "ui/UIMapDesc.h" #include "ui/UIVote.h" #include "ui/TeamInfo.h" diff --git a/src/xrGame/game_cl_capture_the_artefact_messages_menu.cpp b/src/xrGame/game_cl_capture_the_artefact_messages_menu.cpp index 0bf6032d36..a8d11dbf1d 100644 --- a/src/xrGame/game_cl_capture_the_artefact_messages_menu.cpp +++ b/src/xrGame/game_cl_capture_the_artefact_messages_menu.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "../xrEngine/string_table.h" #include "Level.h" #include "ui/UIMessagesWindow.h" diff --git a/src/xrGame/game_cl_capturetheartefact_buywnd.cpp b/src/xrGame/game_cl_capturetheartefact_buywnd.cpp index 19159054d5..9eed02717e 100644 --- a/src/xrGame/game_cl_capturetheartefact_buywnd.cpp +++ b/src/xrGame/game_cl_capturetheartefact_buywnd.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_cl_capture_the_artefact.h" #include "Level.h" diff --git a/src/xrGame/game_cl_deathmatch.cpp b/src/xrGame/game_cl_deathmatch.cpp index 40098eb80e..c2ee9ba1e9 100644 --- a/src/xrGame/game_cl_deathmatch.cpp +++ b/src/xrGame/game_cl_deathmatch.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_cl_deathmatch.h" #include "xrMessages.h" #include "UIGameDM.h" diff --git a/src/xrGame/game_cl_deathmatch_buywnd.cpp b/src/xrGame/game_cl_deathmatch_buywnd.cpp index e35afed465..92996d5892 100644 --- a/src/xrGame/game_cl_deathmatch_buywnd.cpp +++ b/src/xrGame/game_cl_deathmatch_buywnd.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_cl_deathmatch.h" #include "Level.h" #include "Actor.h" diff --git a/src/xrGame/game_cl_mp.cpp b/src/xrGame/game_cl_mp.cpp index a7d49cc463..0e5f6d07fa 100644 --- a/src/xrGame/game_cl_mp.cpp +++ b/src/xrGame/game_cl_mp.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_cl_mp.h" #include "../xrEngine/xr_level_controller.h" #include "xrMessages.h" @@ -26,7 +26,7 @@ #include "../xrEngine/string_table.h" #include "clsid_game.h" -#include "mainmenu.h" +#include "MainMenu.h" #include "WeaponKnife.h" #include "RegistryFuncs.h" #include "../xrGameSpy/xrGameSpy_MainDefs.h" diff --git a/src/xrGame/game_cl_mp_messages_menu.cpp b/src/xrGame/game_cl_mp_messages_menu.cpp index 787db3a0e3..79636a0abd 100644 --- a/src/xrGame/game_cl_mp_messages_menu.cpp +++ b/src/xrGame/game_cl_mp_messages_menu.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_cl_mp.h" #include "ui/UISpeechMenu.h" #include "xrMessages.h" diff --git a/src/xrGame/game_cl_mp_snd_messages.cpp b/src/xrGame/game_cl_mp_snd_messages.cpp index 53cb7a4abb..0de6d2eaa8 100644 --- a/src/xrGame/game_cl_mp_snd_messages.cpp +++ b/src/xrGame/game_cl_mp_snd_messages.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_cl_mp.h" #include "game_cl_mp_snd_messages.h" #include "Level.h" diff --git a/src/xrGame/game_cl_single.cpp b/src/xrGame/game_cl_single.cpp index 2015179389..4464afca57 100644 --- a/src/xrGame/game_cl_single.cpp +++ b/src/xrGame/game_cl_single.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "game_cl_single.h" #include "UIGameSP.h" diff --git a/src/xrGame/game_cl_teamdeathmatch.cpp b/src/xrGame/game_cl_teamdeathmatch.cpp index 7a6db0c3b0..1eddfa7f9b 100644 --- a/src/xrGame/game_cl_teamdeathmatch.cpp +++ b/src/xrGame/game_cl_teamdeathmatch.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_cl_teamdeathmatch.h" #include "xrMessages.h" #include "Level.h" @@ -9,7 +9,7 @@ #include "Actor.h" #include "ui/UIMainIngameWnd.h" #include "ui/UISkinSelector.h" -#include "ui/UIPDAWnd.h" +#include "ui/UIPdaWnd.h" #include "ui/UIMapDesc.h" #include "game_base_menu_events.h" #include "ui/TeamInfo.h" @@ -395,7 +395,7 @@ char* game_cl_TeamDeathmatch::getTeamSection(int Team) }; #include "../xrEngine/string_table.h" -#include "ui/teaminfo.h" +#include "ui/TeamInfo.h" void game_cl_TeamDeathmatch::shedule_Update (u32 dt) { diff --git a/src/xrGame/game_expression_delegates.cpp b/src/xrGame/game_expression_delegates.cpp index dd6c7d14f6..e8448ccac4 100644 --- a/src/xrGame/game_expression_delegates.cpp +++ b/src/xrGame/game_expression_delegates.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "../xrCore/XMLParser/Expression.h" +#include "StdAfx.h" +#include "../xrCore/XmlParser/Expression.h" #include "Actor.h" #include "CustomOutfit.h" #include "EntityCondition.h" diff --git a/src/xrGame/game_graph_script.cpp b/src/xrGame/game_graph_script.cpp index 89757a7193..91f5cd3fb6 100644 --- a/src/xrGame/game_graph_script.cpp +++ b/src/xrGame/game_graph_script.cpp @@ -6,7 +6,7 @@ // Description : Game graph class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include #include #include "game_graph.h" diff --git a/src/xrGame/game_level_cross_table.h b/src/xrGame/game_level_cross_table.h index fc09699441..ebdaf7939c 100644 --- a/src/xrGame/game_level_cross_table.h +++ b/src/xrGame/game_level_cross_table.h @@ -1,5 +1,5 @@ #pragma once -#include "..\XrEngine\AI\game_level_cross_table.h" +#include "../xrEngine/AI/game_level_cross_table.h" class CGameLevelCrossTable :public IGameLevelCrossTable { diff --git a/src/xrGame/game_news.cpp b/src/xrGame/game_news.cpp index 07fc06d862..aeb53e07a2 100644 --- a/src/xrGame/game_news.cpp +++ b/src/xrGame/game_news.cpp @@ -3,7 +3,7 @@ // реестр новостей: новости симул€ции + сюжетные /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "game_news.h" #include "object_broker.h" diff --git a/src/xrGame/game_state_accumulator.cpp b/src/xrGame/game_state_accumulator.cpp index 0f6f93b057..803ea6de37 100644 --- a/src/xrGame/game_state_accumulator.cpp +++ b/src/xrGame/game_state_accumulator.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_state_accumulator.h" #include "Level.h" #include "actor_mp_client.h" diff --git a/src/xrGame/game_state_accumulator_state_register.cpp b/src/xrGame/game_state_accumulator_state_register.cpp index ddf6c75817..bf4889a77c 100644 --- a/src/xrGame/game_state_accumulator_state_register.cpp +++ b/src/xrGame/game_state_accumulator_state_register.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_state_accumulator.h" //typelist: diff --git a/src/xrGame/game_sv_artefacthunt.cpp b/src/xrGame/game_sv_artefacthunt.cpp index df3184c826..26435da7fa 100644 --- a/src/xrGame/game_sv_artefacthunt.cpp +++ b/src/xrGame/game_sv_artefacthunt.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" -#include "game_sv_ArtefactHunt.h" +#include "StdAfx.h" +#include "game_sv_artefacthunt.h" #include "xrServer_Objects_ALife_Monsters.h" -#include "xrserver.h" +#include "xrServer.h" #include "Level.h" #include "LevelGameDef.h" #include "Actor.h" diff --git a/src/xrGame/game_sv_artefacthunt_process_event.cpp b/src/xrGame/game_sv_artefacthunt_process_event.cpp index 7a90cd1247..3db8c4ba85 100644 --- a/src/xrGame/game_sv_artefacthunt_process_event.cpp +++ b/src/xrGame/game_sv_artefacthunt_process_event.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_sv_artefacthunt.h" #include "xrMessages.h" diff --git a/src/xrGame/game_sv_base.cpp b/src/xrGame/game_sv_base.cpp index 5bddfbe56f..9c7c705f72 100644 --- a/src/xrGame/game_sv_base.cpp +++ b/src/xrGame/game_sv_base.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "LevelGameDef.h" #include "../xrScripts/script_process.h" #include "xrServer_Objects_ALife_Monsters.h" #include "../xrScripts/script_engine.h" #include "../xrScripts/script_engine_space.h" #include "Level.h" -#include "xrserver.h" +#include "xrServer.h" #include "ai_space.h" #include "game_sv_event_queue.h" #include "../xrEngine/XR_IOConsole.h" diff --git a/src/xrGame/game_sv_base_console_vars.cpp b/src/xrGame/game_sv_base_console_vars.cpp index a27b824da7..9b13c1ca1b 100644 --- a/src/xrGame/game_sv_base_console_vars.cpp +++ b/src/xrGame/game_sv_base_console_vars.cpp @@ -1 +1 @@ -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/xrGame/game_sv_capture_the_artefact.cpp b/src/xrGame/game_sv_capture_the_artefact.cpp index 7eafacd3a6..7e71a25962 100644 --- a/src/xrGame/game_sv_capture_the_artefact.cpp +++ b/src/xrGame/game_sv_capture_the_artefact.cpp @@ -1,17 +1,17 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_sv_capture_the_artefact.h" #include "xrServer_Objects_ALife_Monsters.h" #include "Level.h" -#include "xrserver.h" +#include "xrServer.h" #include "Inventory.h" #include "CustomZone.h" -#include "../xrEngine/igame_persistent.h" +#include "../xrEngine/IGame_Persistent.h" #include "../xrEngine/CameraManager.h" #include "Actor.h" #include "Artefact.h" #include "game_cl_base.h" #include "../xrEngine/xr_level_controller.h" -#include "hudItem.h" +#include "HudItem.h" #include "Weapon.h" #include "eatable_item_object.h" #include "Missile.h" @@ -21,7 +21,7 @@ #include "ui/UIBuyWndShared.h" #include "UIGameCTA.h" #include "../xrEngine/string_table.h" -#include "../xrEngine/xr_ioconsole.h" +#include "../xrEngine/XR_IOConsole.h" #include //------------------------------------------------------------- diff --git a/src/xrGame/game_sv_capture_the_artefact_buy_event.cpp b/src/xrGame/game_sv_capture_the_artefact_buy_event.cpp index 5a56fbf468..c7c0306a7f 100644 --- a/src/xrGame/game_sv_capture_the_artefact_buy_event.cpp +++ b/src/xrGame/game_sv_capture_the_artefact_buy_event.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_sv_capture_the_artefact.h" void game_sv_CaptureTheArtefact::OnPlayerBuyFinished(ClientID id_who, NET_Packet& P) diff --git a/src/xrGame/game_sv_capture_the_artefact_myteam_impl.cpp b/src/xrGame/game_sv_capture_the_artefact_myteam_impl.cpp index 04b42cf7af..11399575b9 100644 --- a/src/xrGame/game_sv_capture_the_artefact_myteam_impl.cpp +++ b/src/xrGame/game_sv_capture_the_artefact_myteam_impl.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Level.h" #include "game_sv_capture_the_artefact.h" diff --git a/src/xrGame/game_sv_capture_the_artefact_process_event.cpp b/src/xrGame/game_sv_capture_the_artefact_process_event.cpp index 4627af2dd6..e5547ab25b 100644 --- a/src/xrGame/game_sv_capture_the_artefact_process_event.cpp +++ b/src/xrGame/game_sv_capture_the_artefact_process_event.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_sv_capture_the_artefact.h" #include "xrServer.h" #include "xrMessages.h" diff --git a/src/xrGame/game_sv_deathmatch.cpp b/src/xrGame/game_sv_deathmatch.cpp index 44177f09ae..d27d5081c4 100644 --- a/src/xrGame/game_sv_deathmatch.cpp +++ b/src/xrGame/game_sv_deathmatch.cpp @@ -1,15 +1,15 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_sv_deathmatch.h" #include "xrServer_Objects_ALife_Monsters.h" #include "Level.h" -#include "xrserver.h" +#include "xrServer.h" #include "Inventory.h" #include "CustomZone.h" -#include "../xrEngine/igame_persistent.h" +#include "../xrEngine/IGame_Persistent.h" #include "Actor.h" #include "game_cl_base.h" #include "../xrEngine/xr_level_controller.h" -#include "hudItem.h" +#include "HudItem.h" #include "Weapon.h" #include "eatable_item_object.h" #include "Missile.h" @@ -18,7 +18,7 @@ //#define DELAYED_ROUND_TIME 7000 #include "ui/UIBuyWndShared.h" -#include "../xrEngine/xr_ioconsole.h" +#include "../xrEngine/XR_IOConsole.h" #include #define UNBUYABLESLOT 20 diff --git a/src/xrGame/game_sv_deathmatch_process_event.cpp b/src/xrGame/game_sv_deathmatch_process_event.cpp index f7283be2ff..f3ef966daf 100644 --- a/src/xrGame/game_sv_deathmatch_process_event.cpp +++ b/src/xrGame/game_sv_deathmatch_process_event.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_sv_deathmatch.h" #include "xrServer.h" #include "xrMessages.h" diff --git a/src/xrGame/game_sv_event_queue.cpp b/src/xrGame/game_sv_event_queue.cpp index 518532ab5c..36590293e5 100644 --- a/src/xrGame/game_sv_event_queue.cpp +++ b/src/xrGame/game_sv_event_queue.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_sv_event_queue.h" diff --git a/src/xrGame/game_sv_item_respawner.cpp b/src/xrGame/game_sv_item_respawner.cpp index 5f072f3e82..1c4a6eb37c 100644 --- a/src/xrGame/game_sv_item_respawner.cpp +++ b/src/xrGame/game_sv_item_respawner.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_sv_item_respawner.h" #include "game_sv_base.h" #include "Level.h" diff --git a/src/xrGame/game_sv_mp.cpp b/src/xrGame/game_sv_mp.cpp index ed28aee16d..149d948096 100644 --- a/src/xrGame/game_sv_mp.cpp +++ b/src/xrGame/game_sv_mp.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_sv_mp.h" #include "xrServer.h" #include "xrMessages.h" @@ -8,7 +8,7 @@ #include "xrServer_Objects_ALife_Monsters.h" #include "Actor.h" #include "../xrEngine/XR_IOConsole.h" -#include "../xrEngine/igame_persistent.h" +#include "../xrEngine/IGame_Persistent.h" #include "../xrEngine/date_time.h" #include "game_cl_base.h" #include "Spectator.h" diff --git a/src/xrGame/game_sv_single.cpp b/src/xrGame/game_sv_single.cpp index 028fb7d6ca..bb710aae9b 100644 --- a/src/xrGame/game_sv_single.cpp +++ b/src/xrGame/game_sv_single.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_sv_single.h" #include "xrServer_Objects_ALife_Monsters.h" #include "alife_simulator.h" @@ -6,7 +6,7 @@ #include "alife_graph_registry.h" #include "alife_time_manager.h" #include "object_broker.h" -#include "gamepersistent.h" +#include "GamePersistent.h" #include "xrServer.h" #include "../xrEngine/x_ray.h" #include "ui/UILoadingScreen.h" diff --git a/src/xrGame/game_sv_teamdeathmatch.cpp b/src/xrGame/game_sv_teamdeathmatch.cpp index b7682921cd..9951ae1cb9 100644 --- a/src/xrGame/game_sv_teamdeathmatch.cpp +++ b/src/xrGame/game_sv_teamdeathmatch.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_sv_teamdeathmatch.h" #include "xrServer_Objects_ALife_Monsters.h" -#include "xrserver.h" +#include "xrServer.h" #include "Level.h" #include "game_cl_mp.h" #include "../xrEngine/string_table.h" diff --git a/src/xrGame/game_sv_teamdeathmatch_process_event.cpp b/src/xrGame/game_sv_teamdeathmatch_process_event.cpp index 6fc99c1e5b..5de21c0e99 100644 --- a/src/xrGame/game_sv_teamdeathmatch_process_event.cpp +++ b/src/xrGame/game_sv_teamdeathmatch_process_event.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_sv_teamdeathmatch.h" #include "xrServer.h" #include "xrMessages.h" diff --git a/src/xrGame/gamespy/GameSpy_FuncDefs.h b/src/xrGame/gamespy/GameSpy_FuncDefs.h index 1c897b3174..db0ead13c9 100644 --- a/src/xrGame/gamespy/GameSpy_FuncDefs.h +++ b/src/xrGame/gamespy/GameSpy_FuncDefs.h @@ -1,18 +1,18 @@ #pragma once -#include "../../xrGameSpy/GameSpy/Common/gsCommon.h" -#include "../../xrGameSpy/GameSpy/Common/gsAvailable.h" -#include "../../xrGameSpy/GameSpy/ghttp/ghttp.h" +#include "../../xrGameSpy/gamespy/common/gsCommon.h" +#include "../../xrGameSpy/gamespy/common/gsAvailable.h" +#include "../../xrGameSpy/gamespy/ghttp/ghttp.h" -#include "../../xrGameSpy/GameSpy/qr2/qr2.h" -#include "../../xrGameSpy/GameSpy/gcdkey/gcdkeyc.h" -#include "../../xrGameSpy/GameSpy/gcdkey/gcdkeys.h" -#include "../../xrGameSpy/GameSpy/serverbrowsing/sb_serverbrowsing.h" +#include "../../xrGameSpy/gamespy/qr2/qr2.h" +#include "../../xrGameSpy/gamespy/gcdkey/gcdkeyc.h" +#include "../../xrGameSpy/gamespy/gcdkey/gcdkeys.h" +#include "../../xrGameSpy/gamespy/serverbrowsing/sb_serverbrowsing.h" //#include "../../xrGameSpy/GameSpy/pt/pt.h" -#include "../../xrGameSpy/GameSpy/gp/gp.h" -#include "../../xrGameSpy/GameSpy/sake/sake.h" -#include "../../xrGameSpy/GameSpy/sc/sc.h" +#include "../../xrGameSpy/gamespy/GP/gp.h" +#include "../../xrGameSpy/gamespy/sake/sake.h" +#include "../../xrGameSpy/gamespy/sc/sc.h" #undef max diff --git a/src/xrGame/gamespy/GameSpy_GP.h b/src/xrGame/gamespy/GameSpy_GP.h index dadef626db..e649511cc1 100644 --- a/src/xrGame/gamespy/GameSpy_GP.h +++ b/src/xrGame/gamespy/GameSpy_GP.h @@ -3,7 +3,7 @@ #include "GameSpy_FuncDefs.h" -#include "../../xrGameSpy/GameSpy/GP/gp.h" +#include "../../xrGameSpy/gamespy/GP/gp.h" class CGameSpy_GP { diff --git a/src/xrGame/group_hierarchy_holder.cpp b/src/xrGame/group_hierarchy_holder.cpp index f6a565718f..aaf5d6ad6e 100644 --- a/src/xrGame/group_hierarchy_holder.cpp +++ b/src/xrGame/group_hierarchy_holder.cpp @@ -6,10 +6,10 @@ // Description : Group hierarchy holder //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "group_hierarchy_holder.h" #include "squad_hierarchy_holder.h" -#include "entity.h" +#include "Entity.h" #include "agent_manager.h" #include "agent_member_manager.h" #include "agent_memory_manager.h" diff --git a/src/xrGame/gsc_dsigned_ltx.cpp b/src/xrGame/gsc_dsigned_ltx.cpp index 81ee4bac87..133ee75c1a 100644 --- a/src/xrGame/gsc_dsigned_ltx.cpp +++ b/src/xrGame/gsc_dsigned_ltx.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "gsc_dsigned_ltx.h" #include "../xrCore/xr_ini.h" diff --git a/src/xrGame/harvest_time.cpp b/src/xrGame/harvest_time.cpp index a0fdef5ec5..629f2e6e31 100644 --- a/src/xrGame/harvest_time.cpp +++ b/src/xrGame/harvest_time.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "harvest_time.h" #include "kills_store.h" #include "game_base.h" diff --git a/src/xrGame/helicopter.h b/src/xrGame/helicopter.h index 569ab7f215..1e719a9ffb 100644 --- a/src/xrGame/helicopter.h +++ b/src/xrGame/helicopter.h @@ -1,10 +1,10 @@ #pragma once -#include "shootingobject.h" -#include "weaponammo.h" -#include "rocketlauncher.h" -#include "entity.h" -#include "phskeleton.h" +#include "ShootingObject.h" +#include "WeaponAmmo.h" +#include "RocketLauncher.h" +#include "Entity.h" +#include "PHSkeleton.h" #include "hit_immunity.h" #include "../xrScripts/script_export_space.h" #include "memory_manager.h" diff --git a/src/xrGame/helicopter_script.cpp b/src/xrGame/helicopter_script.cpp index 798d7d50d6..5487c57636 100644 --- a/src/xrGame/helicopter_script.cpp +++ b/src/xrGame/helicopter_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "helicopter.h" #include "script_game_object.h" diff --git a/src/xrGame/hit_immunity.cpp b/src/xrGame/hit_immunity.cpp index 1c09fd23e6..541edd370c 100644 --- a/src/xrGame/hit_immunity.cpp +++ b/src/xrGame/hit_immunity.cpp @@ -2,7 +2,7 @@ // коэффициенты иммунитета для разных типов хитов ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "hit_immunity.h" diff --git a/src/xrGame/hit_memory_manager.cpp b/src/xrGame/hit_memory_manager.cpp index 0408c6248d..9d3c109898 100644 --- a/src/xrGame/hit_memory_manager.cpp +++ b/src/xrGame/hit_memory_manager.cpp @@ -6,11 +6,11 @@ // Description : Hit memory manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "hit_memory_manager.h" #include "memory_space_impl.h" -#include "custommonster.h" +#include "CustomMonster.h" #include "ai_object_location.h" #include "level_graph.h" #include "script_game_object.h" diff --git a/src/xrGame/hits_store.cpp b/src/xrGame/hits_store.cpp index c52e886f7c..9b07473160 100644 --- a/src/xrGame/hits_store.cpp +++ b/src/xrGame/hits_store.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "hits_store.h" #include "../xrServerEntities/object_broker.h" diff --git a/src/xrGame/holder_custom.cpp b/src/xrGame/holder_custom.cpp index fac7253eb2..7d464e1671 100644 --- a/src/xrGame/holder_custom.cpp +++ b/src/xrGame/holder_custom.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "holder_custom.h" #include "Actor.h" diff --git a/src/xrGame/holder_custom_script.cpp b/src/xrGame/holder_custom_script.cpp index e00e2d8165..08d856350f 100644 --- a/src/xrGame/holder_custom_script.cpp +++ b/src/xrGame/holder_custom_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "holder_custom.h" diff --git a/src/xrGame/hud_item_object.cpp b/src/xrGame/hud_item_object.cpp index 08511ed577..98997f7eb7 100644 --- a/src/xrGame/hud_item_object.cpp +++ b/src/xrGame/hud_item_object.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "hud_item_object.h" CHudItemObject::CHudItemObject () diff --git a/src/xrGame/hud_item_object.h b/src/xrGame/hud_item_object.h index 0ae7c32630..815db66570 100644 --- a/src/xrGame/hud_item_object.h +++ b/src/xrGame/hud_item_object.h @@ -1,7 +1,7 @@ #pragma once #include "inventory_item_object.h" -#include "huditem.h" +#include "HudItem.h" class CHudItemObject : public CInventoryItemObject, diff --git a/src/xrGame/ik/Dof7control.cpp b/src/xrGame/ik/Dof7control.cpp index 5a66a0a324..9813c5c9ae 100644 --- a/src/xrGame/ik/Dof7control.cpp +++ b/src/xrGame/ik/Dof7control.cpp @@ -31,7 +31,7 @@ */ #include "StdAfx.h" -#include "dof7control.h" +#include "Dof7control.h" #include "mathTrig.h" diff --git a/src/xrGame/ik/IKLimb.cpp b/src/xrGame/ik/IKLimb.cpp index 792762259f..c0796c5080 100644 --- a/src/xrGame/ik/IKLimb.cpp +++ b/src/xrGame/ik/IKLimb.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "IKLimb.h" -#include "../../include/xrrender/Kinematics.h" +#include "../../Include/xrRender/Kinematics.h" #include "gameobject.h" diff --git a/src/xrGame/ik/IKLimb.h b/src/xrGame/ik/IKLimb.h index b60d301754..7afe29ebc6 100644 --- a/src/xrGame/ik/IKLimb.h +++ b/src/xrGame/ik/IKLimb.h @@ -4,7 +4,7 @@ #include "limb.h" #include "ikfoot.h" -#include "../../include/xrrender/KinematicsAnimated.h" +#include "../../Include/xrRender/KinematicsAnimated.h" #include "../ik_anim_state.h" #include "../ik_calculate_data.h" #include "../ik_limb_state.h" diff --git a/src/xrGame/ik_anim_state.cpp b/src/xrGame/ik_anim_state.cpp index c3a0989bd7..78bb0df385 100644 --- a/src/xrGame/ik_anim_state.cpp +++ b/src/xrGame/ik_anim_state.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "ik_anim_state.h" diff --git a/src/xrGame/ik_calculate_data.cpp b/src/xrGame/ik_calculate_data.cpp index 87460c4bac..07b64d96a2 100644 --- a/src/xrGame/ik_calculate_data.cpp +++ b/src/xrGame/ik_calculate_data.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "ik_calculate_data.h" -#include "ik/iklimb.h" +#include "ik/IKLimb.h" SCalculateData::SCalculateData( CIKLimb& l, const Fmatrix &o ): state( ) , diff --git a/src/xrGame/ik_dbg_matrix.cpp b/src/xrGame/ik_dbg_matrix.cpp index 5274db31d8..8472b265fd 100644 --- a/src/xrGame/ik_dbg_matrix.cpp +++ b/src/xrGame/ik_dbg_matrix.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "ik_dbg_matrix.h" -#include "ik/iklimb.h" +#include "ik/IKLimb.h" u32 sdbg_state_sequence_number = 130; diff --git a/src/xrGame/ik_foot_collider.cpp b/src/xrGame/ik_foot_collider.cpp index 25b4f3a70d..c55daa49fe 100644 --- a/src/xrGame/ik_foot_collider.cpp +++ b/src/xrGame/ik_foot_collider.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "ik_foot_collider.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" #include "../xrEngine/cl_intersect.h" -#include "../include/xrrender/Kinematics.h" +#include "../Include/xrRender/Kinematics.h" #include "Level.h" #include "GameObject.h" diff --git a/src/xrGame/ik_limb_state.cpp b/src/xrGame/ik_limb_state.cpp index 0a3020abf8..372738b257 100644 --- a/src/xrGame/ik_limb_state.cpp +++ b/src/xrGame/ik_limb_state.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "ik_limb_state.h" -#include "ik\iklimb.h" +#include "ik/IKLimb.h" void ik_limb_state::set_limb ( CIKLimb *l ) { VERIFY( l ); diff --git a/src/xrGame/ik_limb_state.h b/src/xrGame/ik_limb_state.h index ed288418f8..fa563bc3c7 100644 --- a/src/xrGame/ik_limb_state.h +++ b/src/xrGame/ik_limb_state.h @@ -2,7 +2,7 @@ #include "ik_calculate_data.h" -#include "../include/xrrender/Kinematics.h" +#include "../Include/xrRender/Kinematics.h" class CIKLimb; IC bool state_valide( const calculate_state &prev_state ); diff --git a/src/xrGame/ik_object_shift.cpp b/src/xrGame/ik_object_shift.cpp index 4f1c0cafc0..2e936b994b 100644 --- a/src/xrGame/ik_object_shift.cpp +++ b/src/xrGame/ik_object_shift.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "ik_object_shift.h" #include "pose_extrapolation.h" -#include "../xrPhysics/mathutils.h" +#include "../xrPhysics/MathUtils.h" #ifdef DEBUG -#include "phdebug.h" +#include "PHDebug.h" #endif #ifdef DEBUG diff --git a/src/xrGame/imotion_position.cpp b/src/xrGame/imotion_position.cpp index 4b4c2670dc..2cf1d5f47a 100644 --- a/src/xrGame/imotion_position.cpp +++ b/src/xrGame/imotion_position.cpp @@ -1,19 +1,19 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "imotion_position.h" -#include "../xrPhysics/physicsshell.h" +#include "../xrPhysics/PhysicsShell.h" #include "../xrPhysics/MathUtils.h" -#include "../xrPhysics/extendedgeom.h" +#include "../xrPhysics/ExtendedGeom.h" #include "../Include/xrRender/Kinematics.h" /////////////////////////////////////////////////////////////////////////////////////// -#include "physicsshellholder.h" +#include "PhysicsShellHolder.h" #include "game_object_space.h" #include "animation_utils.h" #ifdef DEBUG -#include "phdebug.h" +#include "PHDebug.h" #endif #ifdef DEBUG diff --git a/src/xrGame/imotion_velocity.cpp b/src/xrGame/imotion_velocity.cpp index 2765f32810..b743aab4d9 100644 --- a/src/xrGame/imotion_velocity.cpp +++ b/src/xrGame/imotion_velocity.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "imotion_velocity.h" -#include "../xrPhysics/physicsshell.h" +#include "../xrPhysics/PhysicsShell.h" void imotion_velocity::state_start( ) { diff --git a/src/xrGame/interactive_animation.cpp b/src/xrGame/interactive_animation.cpp index 4a36e7587b..3063d17a89 100644 --- a/src/xrGame/interactive_animation.cpp +++ b/src/xrGame/interactive_animation.cpp @@ -1,10 +1,10 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "interactive_animation.h" -#include "../xrPhysics/physicsshell.h" +#include "../xrPhysics/PhysicsShell.h" #include "../xrPhysics/ExtendedGeom.h" -#include "../xrPhysics/mathutils.h" +#include "../xrPhysics/MathUtils.h" //#include "phobject.h" #include "../Include/xrRender/KinematicsAnimated.h" diff --git a/src/xrGame/interactive_motion.cpp b/src/xrGame/interactive_motion.cpp index 3b1e3c0109..cb0bd86e09 100644 --- a/src/xrGame/interactive_motion.cpp +++ b/src/xrGame/interactive_motion.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "interactive_motion.h" -#include "../xrPhysics/physicsshell.h" +#include "../xrPhysics/PhysicsShell.h" #include "PhysicsShellHolder.h" #include "../Include/xrRender/Kinematics.h" diff --git a/src/xrGame/inventory_item.cpp b/src/xrGame/inventory_item.cpp index 97deba66bc..4e13c37900 100644 --- a/src/xrGame/inventory_item.cpp +++ b/src/xrGame/inventory_item.cpp @@ -7,13 +7,13 @@ //////////////////////////////////////////////////////////////////////////// //#include "stdafx.h" -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "inventory_item.h" #include "inventory_item_impl.h" #include "Inventory.h" //#include "Physics.h" -#include "physicsshellholder.h" +#include "PhysicsShellHolder.h" #include "entity_alive.h" #include "Level.h" #include "game_cl_base.h" @@ -24,7 +24,7 @@ #include "../Include/xrRender/Kinematics.h" #include "ai_object_location.h" #include "object_broker.h" -#include "../xrEngine/igame_persistent.h" +#include "../xrEngine/IGame_Persistent.h" #ifdef DEBUG_DRAW # include "debug_renderer.h" diff --git a/src/xrGame/inventory_item_object.cpp b/src/xrGame/inventory_item_object.cpp index 1d0f5f0090..e89572728a 100644 --- a/src/xrGame/inventory_item_object.cpp +++ b/src/xrGame/inventory_item_object.cpp @@ -7,7 +7,7 @@ //////////////////////////////////////////////////////////////////////////// //#include "stdafx.h" -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "inventory_item_object.h" diff --git a/src/xrGame/inventory_item_upgrade.cpp b/src/xrGame/inventory_item_upgrade.cpp index 585e34a4be..54f7a1a720 100644 --- a/src/xrGame/inventory_item_upgrade.cpp +++ b/src/xrGame/inventory_item_upgrade.cpp @@ -6,7 +6,7 @@ // Description : Inventory item upgrades class impl //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "inventory_item.h" #include "inventory_item_impl.h" diff --git a/src/xrGame/inventory_owner_info.cpp b/src/xrGame/inventory_owner_info.cpp index 171f756a6b..7209de6a6b 100644 --- a/src/xrGame/inventory_owner_info.cpp +++ b/src/xrGame/inventory_owner_info.cpp @@ -3,7 +3,7 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "InventoryOwner.h" #include "GameObject.h" @@ -14,7 +14,7 @@ #include "alife_registry_container.h" #include "script_game_object.h" #include "Level.h" -#include "infoportion.h" +#include "InfoPortion.h" #include "alife_registry_wrappers.h" #include "../xrScripts/script_callback_ex.h" #include "game_object_space.h" diff --git a/src/xrGame/inventory_quickswitch.cpp b/src/xrGame/inventory_quickswitch.cpp index 9395d7f287..18b0de0e7b 100644 --- a/src/xrGame/inventory_quickswitch.cpp +++ b/src/xrGame/inventory_quickswitch.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Inventory.h" #include "Weapon.h" #include "Actor.h" diff --git a/src/xrGame/inventory_upgrade.cpp b/src/xrGame/inventory_upgrade.cpp index 5af0229350..8efcfa2464 100644 --- a/src/xrGame/inventory_upgrade.cpp +++ b/src/xrGame/inventory_upgrade.cpp @@ -6,7 +6,7 @@ // Description : inventory upgrade class implementation //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "ai_space.h" #include "../xrScripts/script_engine.h" diff --git a/src/xrGame/inventory_upgrade_base.cpp b/src/xrGame/inventory_upgrade_base.cpp index 7076325db2..415a015f72 100644 --- a/src/xrGame/inventory_upgrade_base.cpp +++ b/src/xrGame/inventory_upgrade_base.cpp @@ -6,7 +6,7 @@ // Description : inventory upgrade base class implementation //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "inventory_upgrade_base.h" diff --git a/src/xrGame/inventory_upgrade_group.cpp b/src/xrGame/inventory_upgrade_group.cpp index b41f3b93b3..eb69d20dbf 100644 --- a/src/xrGame/inventory_upgrade_group.cpp +++ b/src/xrGame/inventory_upgrade_group.cpp @@ -6,7 +6,7 @@ // Description : inventory upgrade group class implementation //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "inventory_upgrade_group.h" #include "inventory_upgrade.h" diff --git a/src/xrGame/inventory_upgrade_manager.cpp b/src/xrGame/inventory_upgrade_manager.cpp index fdaed4703d..08e6bf2096 100644 --- a/src/xrGame/inventory_upgrade_manager.cpp +++ b/src/xrGame/inventory_upgrade_manager.cpp @@ -5,7 +5,7 @@ // Description : inventory upgrade manager class implementation //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "inventory_upgrade_manager.h" diff --git a/src/xrGame/inventory_upgrade_property.cpp b/src/xrGame/inventory_upgrade_property.cpp index 211ba3b956..3c8bbe8410 100644 --- a/src/xrGame/inventory_upgrade_property.cpp +++ b/src/xrGame/inventory_upgrade_property.cpp @@ -6,7 +6,7 @@ // Description : inventory upgrade property class implementation //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "ai_space.h" #include "../xrScripts/script_engine.h" diff --git a/src/xrGame/inventory_upgrade_root.cpp b/src/xrGame/inventory_upgrade_root.cpp index ff8fdbf128..969a8d6a95 100644 --- a/src/xrGame/inventory_upgrade_root.cpp +++ b/src/xrGame/inventory_upgrade_root.cpp @@ -6,7 +6,7 @@ // Description : inventory upgrade root class implementation //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "inventory_upgrade.h" #include "inventory_upgrade_root.h" diff --git a/src/xrGame/invincible_fury.cpp b/src/xrGame/invincible_fury.cpp index 6508d99472..f724f73cdd 100644 --- a/src/xrGame/invincible_fury.cpp +++ b/src/xrGame/invincible_fury.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "invincible_fury.h" #include "kills_store.h" #include "game_cl_base.h" diff --git a/src/xrGame/item_manager.cpp b/src/xrGame/item_manager.cpp index 915c9575eb..c6df9bc15a 100644 --- a/src/xrGame/item_manager.cpp +++ b/src/xrGame/item_manager.cpp @@ -6,10 +6,10 @@ // Description : Item manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "item_manager.h" #include "inventory_item.h" -#include "custommonster.h" +#include "CustomMonster.h" #include "ai_object_location.h" #include "level_graph.h" #include "restricted_object.h" diff --git a/src/xrGame/item_manager.h b/src/xrGame/item_manager.h index 2390790a98..59fd3c1541 100644 --- a/src/xrGame/item_manager.h +++ b/src/xrGame/item_manager.h @@ -9,7 +9,7 @@ #pragma once #include "object_manager.h" -#include "gameobject.h" +#include "GameObject.h" class CCustomMonster; diff --git a/src/xrGame/key_binding_registrator_script.cpp b/src/xrGame/key_binding_registrator_script.cpp index 872e3d89a7..d11b6fe60c 100644 --- a/src/xrGame/key_binding_registrator_script.cpp +++ b/src/xrGame/key_binding_registrator_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "key_binding_registrator.h" #include "../xrEngine/xr_level_controller.h" diff --git a/src/xrGame/killer_victim_velocity_angle.cpp b/src/xrGame/killer_victim_velocity_angle.cpp index 04c4495fc6..7bb87fb0e9 100644 --- a/src/xrGame/killer_victim_velocity_angle.cpp +++ b/src/xrGame/killer_victim_velocity_angle.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "killer_victim_velocity_angle.h" #include "game_state_accumulator.h" #include "game_cl_base.h" diff --git a/src/xrGame/kills_store.cpp b/src/xrGame/kills_store.cpp index 27592c021a..b0520cf833 100644 --- a/src/xrGame/kills_store.cpp +++ b/src/xrGame/kills_store.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "kills_store.h" #include "../xrServerEntities/object_broker.h" diff --git a/src/xrGame/level_changer.cpp b/src/xrGame/level_changer.cpp index 935e1af35e..f32f7015a5 100644 --- a/src/xrGame/level_changer.cpp +++ b/src/xrGame/level_changer.cpp @@ -6,7 +6,7 @@ // Description : Level change object //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "level_changer.h" #include "Hit.h" #include "Actor.h" @@ -18,7 +18,7 @@ #include "game_level_cross_table.h" #include "UIGameSP.h" -#include "../xrengine/xr_collide_form.h" +#include "../xrEngine/xr_collide_form.h" xr_vector g_lchangers; diff --git a/src/xrGame/level_changer.h b/src/xrGame/level_changer.h index 7d923d59a7..47251f50f8 100644 --- a/src/xrGame/level_changer.h +++ b/src/xrGame/level_changer.h @@ -9,7 +9,7 @@ #pragma once #include "GameObject.h" -#include "../xrEngine/feel_touch.h" +#include "../xrEngine/Feel_Touch.h" #include "game_graph_space.h" class CLevelChanger : public CGameObject, public Feel::Touch { diff --git a/src/xrGame/level_debug.cpp b/src/xrGame/level_debug.cpp index 3c1a98264b..b9a8f1fd8f 100644 --- a/src/xrGame/level_debug.cpp +++ b/src/xrGame/level_debug.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "level_debug.h" #include "../xrEngine/xr_object.h" #include "Level.h" diff --git a/src/xrGame/level_graph.cpp b/src/xrGame/level_graph.cpp index 5e984acf2a..baef591a3e 100644 --- a/src/xrGame/level_graph.cpp +++ b/src/xrGame/level_graph.cpp @@ -6,9 +6,9 @@ // Description : Level graph //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "level_graph.h" -#include "../XrEngine/Editor/XrEditorSceneInterface.h" +#include "../xrEngine/Editor/XrEditorSceneInterface.h" LPCSTR LEVEL_GRAPH_NAME = "level.ai"; CLevelGraph::CLevelGraph () diff --git a/src/xrGame/level_graph_debug.cpp b/src/xrGame/level_graph_debug.cpp index 5cd9d1808d..9490f653d2 100644 --- a/src/xrGame/level_graph_debug.cpp +++ b/src/xrGame/level_graph_debug.cpp @@ -6,7 +6,7 @@ // Description : Level graph debug functions //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #ifdef DEBUG #ifndef AI_COMPILER diff --git a/src/xrGame/level_graph_debug2.cpp b/src/xrGame/level_graph_debug2.cpp index 532717d359..c6db099d4c 100644 --- a/src/xrGame/level_graph_debug2.cpp +++ b/src/xrGame/level_graph_debug2.cpp @@ -6,18 +6,18 @@ // Description : Level graph debug functions //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #ifdef DEBUG #ifndef AI_COMPILER #include "level_graph.h" -#include "../xrEngine/customhud.h" +#include "../xrEngine/CustomHUD.h" #include "ai_space.h" #include "../../xrUI/ui_base.h" #include "game_graph.h" #include "game_sv_single.h" -#include "custommonster.h" +#include "CustomMonster.h" #include "ai/stalker/ai_stalker.h" #include "xrServer_Objects_ALife_Monsters.h" #include "cover_point.h" diff --git a/src/xrGame/level_map_locations.cpp b/src/xrGame/level_map_locations.cpp index a27b824da7..9b13c1ca1b 100644 --- a/src/xrGame/level_map_locations.cpp +++ b/src/xrGame/level_map_locations.cpp @@ -1 +1 @@ -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/xrGame/level_script.cpp b/src/xrGame/level_script.cpp index e87811bd8c..54bbe8472c 100644 --- a/src/xrGame/level_script.cpp +++ b/src/xrGame/level_script.cpp @@ -6,7 +6,7 @@ // Description : Level script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "Level.h" #include "Actor.h" @@ -14,7 +14,7 @@ #include "patrol_path_storage.h" #include "xrServer.h" #include "client_spawn_manager.h" -#include "../xrEngine/igame_persistent.h" +#include "../xrEngine/IGame_Persistent.h" #include "game_cl_base.h" #include "UIGameCustom.h" #include "../xrUI/Widgets/UIDialogWnd.h" @@ -32,7 +32,7 @@ #include "physics_world_scripted.h" #include "alife_simulator.h" #include "alife_time_manager.h" -#include "UI/UIGameTutorial.h" +#include "ui/UIGameTutorial.h" #include "../xrEngine/string_table.h" #include "ui/UIInventoryUtilities.h" #include "alife_object_registry.h" @@ -634,7 +634,7 @@ void iterate_sounds2(LPCSTR prefix, u32 max_count, luabind::object object, luabi iterate_sounds(prefix, max_count, temp); } -#include "actoreffector.h" +#include "ActorEffector.h" float add_cam_effector(LPCSTR fn, int id, bool cyclic, LPCSTR cb_func) { CAnimatorCamEffectorScriptCB* e = new CAnimatorCamEffectorScriptCB(cb_func); @@ -701,7 +701,7 @@ void remove_complex_effector(int id) RemoveEffector(Actor(), id); } -#include "postprocessanimator.h" +#include "PostprocessAnimator.h" void add_pp_effector(LPCSTR fn, int id, bool cyclic) { CPostprocessAnimator* pp = new CPostprocessAnimator(id, cyclic); diff --git a/src/xrGame/level_sounds.cpp b/src/xrGame/level_sounds.cpp index e6bfd4335d..1e366565f6 100644 --- a/src/xrGame/level_sounds.cpp +++ b/src/xrGame/level_sounds.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #pragma hdrstop #include "Level.h" diff --git a/src/xrGame/location_manager.cpp b/src/xrGame/location_manager.cpp index c6a70bb20f..def84a1cf2 100644 --- a/src/xrGame/location_manager.cpp +++ b/src/xrGame/location_manager.cpp @@ -6,9 +6,9 @@ // Description : Location manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "location_manager.h" -#include "gameobject.h" +#include "GameObject.h" extern void setup_location_types (GameGraph::TERRAIN_VECTOR &m_vertex_types, CInifile const *ini, LPCSTR string); extern void setup_location_types_line (GameGraph::TERRAIN_VECTOR &m_vertex_types, LPCSTR string); diff --git a/src/xrGame/login_manager.cpp b/src/xrGame/login_manager.cpp index 1849f9b07d..94bb369c22 100644 --- a/src/xrGame/login_manager.cpp +++ b/src/xrGame/login_manager.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "login_manager.h" #include "account_manager.h" #include "MainMenu.h" diff --git a/src/xrGame/login_manager.h b/src/xrGame/login_manager.h index ad814a8616..cf9c10333e 100644 --- a/src/xrGame/login_manager.h +++ b/src/xrGame/login_manager.h @@ -2,7 +2,7 @@ #define LOGIN_MANAGER #include "mixed_delegate.h" -#include "../xrGameSpy/GameSpy/GP/gp.h" +#include "../xrGameSpy/gamespy/GP/gp.h" #include "account_manager.h" #include "../xrScripts/script_export_space.h" #include "login_manager.h" diff --git a/src/xrGame/login_manager_script.cpp b/src/xrGame/login_manager_script.cpp index 9a04109104..1f3a833539 100644 --- a/src/xrGame/login_manager_script.cpp +++ b/src/xrGame/login_manager_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "login_manager.h" using namespace luabind; diff --git a/src/xrGame/magic_box3.cpp b/src/xrGame/magic_box3.cpp index 0da0ec1cf9..0431b985be 100644 --- a/src/xrGame/magic_box3.cpp +++ b/src/xrGame/magic_box3.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "magic_box3.h" bool MagicBox3::intersects (const MagicBox3 &rkBox1) const diff --git a/src/xrGame/magic_minimize_1d.cpp b/src/xrGame/magic_minimize_1d.cpp index 7204bea004..40b9457773 100644 --- a/src/xrGame/magic_minimize_1d.cpp +++ b/src/xrGame/magic_minimize_1d.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "magic_minimize_1d.h" //---------------------------------------------------------------------------- diff --git a/src/xrGame/map_location.cpp b/src/xrGame/map_location.cpp index 4a0014d615..1de3057998 100644 --- a/src/xrGame/map_location.cpp +++ b/src/xrGame/map_location.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "map_location.h" #include "map_spot.h" #include "map_manager.h" @@ -24,8 +24,8 @@ #include "actor_memory.h" #include "visual_memory_manager.h" #include "location_manager.h" -#include "gametask.h" -#include "gametaskmanager.h" +#include "GameTask.h" +#include "GametaskManager.h" #include "ActorHelmet.h" #include "Inventory.h" //#include "CustomMonster.h" diff --git a/src/xrGame/map_manager.cpp b/src/xrGame/map_manager.cpp index 1ac1d0e72b..f4a960cb7a 100644 --- a/src/xrGame/map_manager.cpp +++ b/src/xrGame/map_manager.cpp @@ -1,14 +1,14 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "map_manager.h" #include "alife_registry_wrappers.h" -#include "inventoryowner.h" +#include "InventoryOwner.h" #include "Level.h" #include "Actor.h" #include "relation_registry.h" #include "GameObject.h" #include "map_location.h" -#include "GameTaskManager.h" +#include "GametaskManager.h" #include "xrServer.h" #include "game_object_space.h" diff --git a/src/xrGame/map_spot.cpp b/src/xrGame/map_spot.cpp index 1d850a8edb..2f44e892ed 100644 --- a/src/xrGame/map_spot.cpp +++ b/src/xrGame/map_spot.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "map_spot.h" #include "map_location.h" #include "../../xrUI/UIXmlInit.h" -#include "ui/UIMApWnd.h" +#include "ui/UIMapWnd.h" #include "Level.h" #include "ui/UIInventoryUtilities.h" #include "../xrEngine/xr_object.h" @@ -12,8 +12,8 @@ #include "../../xrUI/UIHelper.h" #include "../Include/xrRender/UIShader.h" -#include "gametaskmanager.h" -#include "gametask.h" +#include "GametaskManager.h" +#include "GameTask.h" CMapSpot::CMapSpot(CMapLocation* ml) :m_map_location(ml) diff --git a/src/xrGame/material_manager.cpp b/src/xrGame/material_manager.cpp index 8d5310916d..cca14b04df 100644 --- a/src/xrGame/material_manager.cpp +++ b/src/xrGame/material_manager.cpp @@ -6,10 +6,10 @@ // Description : Material manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "material_manager.h" #include "alife_space.h" -#include "phmovementcontrol.h" +#include "PHMovementControl.h" #include "entity_alive.h" #include "CharacterPhysicsSupport.h" #include "../Include/xrRender/Kinematics.h" diff --git a/src/xrGame/material_manager.h b/src/xrGame/material_manager.h index dc67516052..d8ccc584df 100644 --- a/src/xrGame/material_manager.h +++ b/src/xrGame/material_manager.h @@ -8,8 +8,8 @@ #pragma once -#include "../xrEngine/gamemtllib.h" -#include "phmovementcontrol.h" +#include "../xrEngine/GameMtlLib.h" +#include "PHMovementControl.h" class CPHMovementControl; class CMaterialManager { diff --git a/src/xrGame/medkit.cpp b/src/xrGame/medkit.cpp index 3957ae5980..4b66b99cf8 100644 --- a/src/xrGame/medkit.cpp +++ b/src/xrGame/medkit.cpp @@ -3,7 +3,7 @@ // Medkit - аптечка, повышающая здоровье /////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "medkit.h" #include "../xrPhysics/PhysicsShell.h" diff --git a/src/xrGame/memory_manager.cpp b/src/xrGame/memory_manager.cpp index 7f6c575f3c..83ba7f5dff 100644 --- a/src/xrGame/memory_manager.cpp +++ b/src/xrGame/memory_manager.cpp @@ -6,7 +6,7 @@ // Description : Memory manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "memory_manager.h" #include "visual_memory_manager.h" diff --git a/src/xrGame/memory_space_impl.h b/src/xrGame/memory_space_impl.h index 62686bf048..128ba9a7f5 100644 --- a/src/xrGame/memory_space_impl.h +++ b/src/xrGame/memory_space_impl.h @@ -9,7 +9,7 @@ #pragma once #include "memory_space.h" -#include "gameobject.h" +#include "GameObject.h" #include "Level.h" #include "ai_space.h" #include "ai_object_location.h" diff --git a/src/xrGame/memory_space_script.cpp b/src/xrGame/memory_space_script.cpp index 8eca474eb0..417d472404 100644 --- a/src/xrGame/memory_space_script.cpp +++ b/src/xrGame/memory_space_script.cpp @@ -6,11 +6,11 @@ // Description : Memory space script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "memory_space.h" #include "script_game_object.h" -#include "gameobject.h" +#include "GameObject.h" #include "entity_alive.h" #include "danger_object.h" diff --git a/src/xrGame/min_obb.cpp b/src/xrGame/min_obb.cpp index f8926b30c7..ae1f803155 100644 --- a/src/xrGame/min_obb.cpp +++ b/src/xrGame/min_obb.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "magic_box3.h" #include "magic_minimize_nd.h" diff --git a/src/xrGame/mincer_script.cpp b/src/xrGame/mincer_script.cpp index 273588f834..445986c081 100644 --- a/src/xrGame/mincer_script.cpp +++ b/src/xrGame/mincer_script.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "mincer.h" +#include "Mincer.h" #include "RadioactiveZone.h" using namespace luabind; diff --git a/src/xrGame/monster_community.cpp b/src/xrGame/monster_community.cpp index 08e2da3c09..023b273eed 100644 --- a/src/xrGame/monster_community.cpp +++ b/src/xrGame/monster_community.cpp @@ -3,7 +3,7 @@ // ////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "monster_community.h" #define MONSTER_RELATIONS_SECT "monster_communities" diff --git a/src/xrGame/movement_manager.cpp b/src/xrGame/movement_manager.cpp index 2d73e33f5e..dc340eb98f 100644 --- a/src/xrGame/movement_manager.cpp +++ b/src/xrGame/movement_manager.cpp @@ -6,7 +6,7 @@ // Description : Movement manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "movement_manager.h" #include "movement_manager_space.h" @@ -18,7 +18,7 @@ #include "patrol_path_manager.h" #include "xrMessages.h" #include "ai_object_location.h" -#include "custommonster.h" +#include "CustomMonster.h" #include "location_manager.h" #include "level_path_builder.h" #include "detail_path_builder.h" diff --git a/src/xrGame/movement_manager_game.cpp b/src/xrGame/movement_manager_game.cpp index ce191534f3..6e2b47a9e7 100644 --- a/src/xrGame/movement_manager_game.cpp +++ b/src/xrGame/movement_manager_game.cpp @@ -6,7 +6,7 @@ // Description : Movement manager for game paths //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "movement_manager.h" #include "alife_simulator.h" #include "alife_graph_registry.h" @@ -17,7 +17,7 @@ #include "level_path_manager.h" #include "detail_path_manager.h" #include "ai_object_location.h" -#include "custommonster.h" +#include "CustomMonster.h" #include "level_path_builder.h" #include "detail_path_builder.h" #include "mt_config.h" diff --git a/src/xrGame/movement_manager_level.cpp b/src/xrGame/movement_manager_level.cpp index cdc14c3925..fa98125a91 100644 --- a/src/xrGame/movement_manager_level.cpp +++ b/src/xrGame/movement_manager_level.cpp @@ -6,13 +6,13 @@ // Description : Movement manager for level paths //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "movement_manager.h" #include "level_location_selector.h" #include "level_path_manager.h" #include "detail_path_manager.h" #include "ai_object_location.h" -#include "custommonster.h" +#include "CustomMonster.h" #include "level_path_builder.h" #include "detail_path_builder.h" #include "mt_config.h" diff --git a/src/xrGame/movement_manager_patrol.cpp b/src/xrGame/movement_manager_patrol.cpp index 36644842e8..036e97d7a0 100644 --- a/src/xrGame/movement_manager_patrol.cpp +++ b/src/xrGame/movement_manager_patrol.cpp @@ -6,14 +6,14 @@ // Description : Movement manager for patrol paths //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "movement_manager.h" #include "patrol_path_manager.h" #include "level_path_manager.h" #include "detail_path_manager.h" #include "ai_object_location.h" -#include "custommonster.h" +#include "CustomMonster.h" #include "level_path_builder.h" #include "detail_path_builder.h" #include "mt_config.h" diff --git a/src/xrGame/movement_manager_physic.cpp b/src/xrGame/movement_manager_physic.cpp index 26bc7316d3..4d2fc2ab3a 100644 --- a/src/xrGame/movement_manager_physic.cpp +++ b/src/xrGame/movement_manager_physic.cpp @@ -6,12 +6,12 @@ // Description : Movement manager : physic character movement //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "movement_manager.h" #include "PHMovementControl.h" #include "detail_path_manager.h" #include "Level.h" -#include "custommonster.h" +#include "CustomMonster.h" #include "../xrPhysics/IColisiondamageInfo.h" // Lain: added diff --git a/src/xrGame/moving_bones_snd_player.cpp b/src/xrGame/moving_bones_snd_player.cpp index 0ddcf32207..b5ef56a36a 100644 --- a/src/xrGame/moving_bones_snd_player.cpp +++ b/src/xrGame/moving_bones_snd_player.cpp @@ -1,14 +1,14 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "moving_bones_snd_player.h" #include "../Include/xrRender/Kinematics.h" #include "../xrEngine/bone.h" -#include "gameobject.h" +#include "GameObject.h" #include "../xrPhysics/matrix_utils.h" #ifdef DEBUG -#include "phdebug.h" +#include "PHDebug.h" #endif moving_bones_snd_player::moving_bones_snd_player( IKinematics *K, CInifile* ini, LPCSTR section, const Fmatrix &object ): bone_id( BI_NONE ), diff --git a/src/xrGame/moving_object.cpp b/src/xrGame/moving_object.cpp index 400da4f5e4..202e607855 100644 --- a/src/xrGame/moving_object.cpp +++ b/src/xrGame/moving_object.cpp @@ -6,7 +6,7 @@ // Description : moving objects //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "moving_object.h" #include "ai_space.h" #include "moving_objects.h" diff --git a/src/xrGame/moving_objects.cpp b/src/xrGame/moving_objects.cpp index 960644c2ee..a6bdf90bde 100644 --- a/src/xrGame/moving_objects.cpp +++ b/src/xrGame/moving_objects.cpp @@ -6,7 +6,7 @@ // Description : moving objects //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "moving_objects.h" #include "ai_space.h" #include "level_graph.h" diff --git a/src/xrGame/moving_objects_dynamic.cpp b/src/xrGame/moving_objects_dynamic.cpp index 382d45a639..7f65d116a4 100644 --- a/src/xrGame/moving_objects_dynamic.cpp +++ b/src/xrGame/moving_objects_dynamic.cpp @@ -6,7 +6,7 @@ // Description : moving objects with dynamic objects, i.e. objects with predictable behaviour //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "moving_objects.h" #include "ai_space.h" #include "level_graph.h" diff --git a/src/xrGame/moving_objects_dynamic_collision.cpp b/src/xrGame/moving_objects_dynamic_collision.cpp index a25482c3cc..91f6391dd8 100644 --- a/src/xrGame/moving_objects_dynamic_collision.cpp +++ b/src/xrGame/moving_objects_dynamic_collision.cpp @@ -6,7 +6,7 @@ // Description : moving objects with dynamic objects collision, i.e. objects with predictable behaviour //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "moving_objects.h" #include "ai_space.h" #include "level_graph.h" diff --git a/src/xrGame/moving_objects_static.cpp b/src/xrGame/moving_objects_static.cpp index eaf5629b7c..8499a97486 100644 --- a/src/xrGame/moving_objects_static.cpp +++ b/src/xrGame/moving_objects_static.cpp @@ -6,7 +6,7 @@ // Description : moving objects with static objects, i.e stable dynamic objects //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "moving_objects.h" #include "ai_space.h" #include "level_graph.h" diff --git a/src/xrGame/mp_config_sections.cpp b/src/xrGame/mp_config_sections.cpp index d52fdb8fa9..3f34e06343 100644 --- a/src/xrGame/mp_config_sections.cpp +++ b/src/xrGame/mp_config_sections.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "mp_config_sections.h" #include "Weapon.h" diff --git a/src/xrGame/mpactor_dump_impl.cpp b/src/xrGame/mpactor_dump_impl.cpp index c846d0c37d..c29ffa5fe2 100644 --- a/src/xrGame/mpactor_dump_impl.cpp +++ b/src/xrGame/mpactor_dump_impl.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "actor_mp_client.h" void CActorMP::DumpActiveParams(shared_str const & section_name, diff --git a/src/xrGame/object_actions.cpp b/src/xrGame/object_actions.cpp index 2a64d47295..65af48ed87 100644 --- a/src/xrGame/object_actions.cpp +++ b/src/xrGame/object_actions.cpp @@ -6,15 +6,15 @@ // Description : Object actions //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "object_actions.h" #include "Inventory.h" #include "ai/stalker/ai_stalker.h" #include "../xrEngine/xr_level_controller.h" #include "xrMessages.h" -#include "fooditem.h" +#include "FoodItem.h" #include "Weapon.h" -#include "weaponmagazined.h" +#include "WeaponMagazined.h" #include "object_handler_space.h" #include "stalker_animation_manager.h" #include "object_handler_planner.h" diff --git a/src/xrGame/object_handler.cpp b/src/xrGame/object_handler.cpp index 7877336973..b2fe1aaa5e 100644 --- a/src/xrGame/object_handler.cpp +++ b/src/xrGame/object_handler.cpp @@ -6,26 +6,26 @@ // Description : Object handler //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "object_handler.h" #include "object_handler_space.h" #include "object_handler_planner.h" #include "ai_monster_space.h" #include "xrServer_Objects_ALife_Monsters.h" -#include "weaponmagazined.h" +#include "WeaponMagazined.h" #include "ef_storage.h" #include "ef_pattern.h" #include "ai/stalker/ai_stalker.h" #include "Inventory.h" -#include "torch.h" +#include "Torch.h" #include "../Include/xrRender/Kinematics.h" #include "memory_manager.h" #include "enemy_manager.h" #include "ai_object_location.h" #include "stalker_animation_manager.h" #include "object_handler_planner_impl.h" -#include "effectorshot.h" +#include "EffectorShot.h" CObjectHandler::CObjectHandler () { diff --git a/src/xrGame/object_handler.h b/src/xrGame/object_handler.h index a599789010..55ebadbe7e 100644 --- a/src/xrGame/object_handler.h +++ b/src/xrGame/object_handler.h @@ -8,7 +8,7 @@ #pragma once -#include "inventoryowner.h" +#include "InventoryOwner.h" #include "graph_engine_space.h" namespace MonsterSpace { diff --git a/src/xrGame/object_handler_planner.cpp b/src/xrGame/object_handler_planner.cpp index 59d84071a4..52e7b86958 100644 --- a/src/xrGame/object_handler_planner.cpp +++ b/src/xrGame/object_handler_planner.cpp @@ -6,7 +6,7 @@ // Description : Object handler action planner //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "object_handler_planner.h" #include "object_property_evaluators.h" #include "object_actions.h" @@ -15,8 +15,8 @@ #include "ai/stalker/ai_stalker.h" #include "Inventory.h" #include "object_handler_planner_impl.h" -#include "weaponmagazined.h" -#include "missile.h" +#include "WeaponMagazined.h" +#include "Missile.h" #include "ai_monster_space.h" using namespace ObjectHandlerSpace; diff --git a/src/xrGame/object_handler_planner_missile.cpp b/src/xrGame/object_handler_planner_missile.cpp index 6f0eaa309e..3649b6bcfc 100644 --- a/src/xrGame/object_handler_planner_missile.cpp +++ b/src/xrGame/object_handler_planner_missile.cpp @@ -6,12 +6,12 @@ // Description : Object handler action planner missile handling //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "object_handler_planner.h" #include "object_property_evaluators.h" #include "object_actions.h" #include "object_handler_space.h" -#include "missile.h" +#include "Missile.h" #include "object_handler_planner_impl.h" #include "ai/stalker/ai_stalker.h" diff --git a/src/xrGame/object_handler_planner_weapon.cpp b/src/xrGame/object_handler_planner_weapon.cpp index 7f2eed8e37..ac9c60da24 100644 --- a/src/xrGame/object_handler_planner_weapon.cpp +++ b/src/xrGame/object_handler_planner_weapon.cpp @@ -6,7 +6,7 @@ // Description : Object handler action planner weapon handling //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "object_handler_planner.h" #include "object_property_evaluators.h" #include "object_actions.h" diff --git a/src/xrGame/object_property_evaluators.cpp b/src/xrGame/object_property_evaluators.cpp index 4ee133187e..92d97b3d76 100644 --- a/src/xrGame/object_property_evaluators.cpp +++ b/src/xrGame/object_property_evaluators.cpp @@ -6,14 +6,14 @@ // Description : Object property evaluators //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "object_property_evaluators.h" #include "Weapon.h" #include "ai/stalker/ai_stalker.h" #include "Inventory.h" -#include "missile.h" -#include "fooditem.h" -#include "weaponmagazined.h" +#include "Missile.h" +#include "FoodItem.h" +#include "WeaponMagazined.h" ////////////////////////////////////////////////////////////////////////// // CObjectPropertyEvaluatorState diff --git a/src/xrGame/obstacles_query.cpp b/src/xrGame/obstacles_query.cpp index e52554636c..0f5614e950 100644 --- a/src/xrGame/obstacles_query.cpp +++ b/src/xrGame/obstacles_query.cpp @@ -6,7 +6,7 @@ // Description : obstacles query //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "obstacles_query.h" #include "GameObject.h" #include "ai_obstacle.h" diff --git a/src/xrGame/particle_params.cpp b/src/xrGame/particle_params.cpp index 9400e0ffa3..c656f104f7 100644 --- a/src/xrGame/particle_params.cpp +++ b/src/xrGame/particle_params.cpp @@ -6,7 +6,7 @@ // Description : Particle parameters class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "particle_params.h" CParticleParams::~CParticleParams () diff --git a/src/xrGame/particle_params_script.cpp b/src/xrGame/particle_params_script.cpp index f58c4155c4..9c90859c22 100644 --- a/src/xrGame/particle_params_script.cpp +++ b/src/xrGame/particle_params_script.cpp @@ -6,7 +6,7 @@ // Description : Particle parameters class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "particle_params.h" diff --git a/src/xrGame/patrol_path.cpp b/src/xrGame/patrol_path.cpp index 0e78243fd2..ea32df04a7 100644 --- a/src/xrGame/patrol_path.cpp +++ b/src/xrGame/patrol_path.cpp @@ -6,7 +6,7 @@ // Description : Patrol path //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "patrol_path.h" #include "levelgamedef.h" diff --git a/src/xrGame/patrol_path_manager.cpp b/src/xrGame/patrol_path_manager.cpp index 5bd2c381e9..c0031e9dd5 100644 --- a/src/xrGame/patrol_path_manager.cpp +++ b/src/xrGame/patrol_path_manager.cpp @@ -6,9 +6,9 @@ // Description : Patrol path manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "gameobject.h" +#include "GameObject.h" #include "patrol_path_manager.h" #include "script_game_object.h" #include "restricted_object.h" diff --git a/src/xrGame/patrol_path_params.cpp b/src/xrGame/patrol_path_params.cpp index a2141a0e1f..1e50cd0fd3 100644 --- a/src/xrGame/patrol_path_params.cpp +++ b/src/xrGame/patrol_path_params.cpp @@ -6,7 +6,7 @@ // Description : Patrol path parameters class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "patrol_path_params.h" #include "patrol_path_manager.h" diff --git a/src/xrGame/patrol_path_params_script.cpp b/src/xrGame/patrol_path_params_script.cpp index 929fd27794..8d08a81714 100644 --- a/src/xrGame/patrol_path_params_script.cpp +++ b/src/xrGame/patrol_path_params_script.cpp @@ -6,7 +6,7 @@ // Description : Patrol path parameters class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "patrol_path_params.h" diff --git a/src/xrGame/patrol_path_storage.cpp b/src/xrGame/patrol_path_storage.cpp index 836f534de2..814a43b33c 100644 --- a/src/xrGame/patrol_path_storage.cpp +++ b/src/xrGame/patrol_path_storage.cpp @@ -6,7 +6,7 @@ // Description : Patrol path storage //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "patrol_path_storage.h" #include "patrol_path.h" #include "patrol_point.h" diff --git a/src/xrGame/patrol_point.cpp b/src/xrGame/patrol_point.cpp index 87c834c069..38984dff8a 100644 --- a/src/xrGame/patrol_point.cpp +++ b/src/xrGame/patrol_point.cpp @@ -6,7 +6,7 @@ // Description : Patrol point //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "patrol_point.h" #include "level_graph.h" #include "level_graph.h" diff --git a/src/xrGame/physic_item.cpp b/src/xrGame/physic_item.cpp index 7c7b106505..39545a164d 100644 --- a/src/xrGame/physic_item.cpp +++ b/src/xrGame/physic_item.cpp @@ -6,9 +6,9 @@ // Description : Physic item //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "physic_item.h" -#include "../xrPhysics/physicsshell.h" +#include "../xrPhysics/PhysicsShell.h" #include "xrserver_objects.h" #include "../Include/xrRender/RenderVisual.h" #include "../Include/xrRender/KinematicsAnimated.h" diff --git a/src/xrGame/physic_item.h b/src/xrGame/physic_item.h index 0761cd26c2..bc2c15c7d6 100644 --- a/src/xrGame/physic_item.h +++ b/src/xrGame/physic_item.h @@ -8,7 +8,7 @@ #pragma once -#include "gameobject.h" +#include "GameObject.h" #include "PHShellCreator.h" #include "PhysicsShellHolder.h" class CPhysicItem : diff --git a/src/xrGame/physics_element_scripted.cpp b/src/xrGame/physics_element_scripted.cpp index 69ea73f1d4..9752ae6539 100644 --- a/src/xrGame/physics_element_scripted.cpp +++ b/src/xrGame/physics_element_scripted.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "physics_element_scripted.h" diff --git a/src/xrGame/physics_element_scripted.h b/src/xrGame/physics_element_scripted.h index b3f9413d1e..126903fbce 100644 --- a/src/xrGame/physics_element_scripted.h +++ b/src/xrGame/physics_element_scripted.h @@ -1,6 +1,6 @@ #pragma once #include "../xrPhysics/iphysics_scripted.h" -#include "../xrPhysics/physicsshell.h" +#include "../xrPhysics/PhysicsShell.h" #include "../xrScripts/script_export_space.h" class CPhysicsElement; diff --git a/src/xrGame/physics_game.cpp b/src/xrGame/physics_game.cpp index 8cccf94d1f..f2036eeb71 100644 --- a/src/xrGame/physics_game.cpp +++ b/src/xrGame/physics_game.cpp @@ -1,19 +1,19 @@ -#include "stdafx.h" -#include "../xrEngine/gamemtllib.h" +#include "StdAfx.h" +#include "../xrEngine/GameMtlLib.h" #include "Level.h" -#include "gamepersistent.h" -#include "../xrPhysics/Extendedgeom.h" +#include "GamePersistent.h" +#include "../xrPhysics/ExtendedGeom.h" #include "PhysicsGamePars.h" //#include "PhysicsCommon.h" #include "../xrPhysics/PhysicsExternalCommon.h" -#include "PhSoundPlayer.h" +#include "PHSoundPlayer.h" #include "PhysicsShellHolder.h" #include "PHCommander.h" #include "../xrPhysics/MathUtils.h" -#include "../xrPhysics/iPHWorld.h" +#include "../xrPhysics/IPHWorld.h" //#include "../xrPhysics/physicsshell.h" -#include "phreqcomparer.h" +#include "PHReqComparer.h" #include "../Include/xrRender/FactoryPtr.h" #include "../Include/xrRender/WallMarkArray.h" diff --git a/src/xrGame/physics_joint_scripted.cpp b/src/xrGame/physics_joint_scripted.cpp index 8b31c656ae..503f592065 100644 --- a/src/xrGame/physics_joint_scripted.cpp +++ b/src/xrGame/physics_joint_scripted.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "physics_joint_scripted.h" diff --git a/src/xrGame/physics_joint_scripted.h b/src/xrGame/physics_joint_scripted.h index 6028863e85..9ed41289fc 100644 --- a/src/xrGame/physics_joint_scripted.h +++ b/src/xrGame/physics_joint_scripted.h @@ -1,7 +1,7 @@ #pragma once #include "../xrPhysics/iphysics_scripted.h" -#include "../xrPhysics/physicsshell.h" +#include "../xrPhysics/PhysicsShell.h" #include "../xrScripts/script_export_space.h" class cphysics_element_scripted; class CPhysicsJoint; diff --git a/src/xrGame/physics_shell_animated.cpp b/src/xrGame/physics_shell_animated.cpp index a36e4e6c1a..f65f5ab23a 100644 --- a/src/xrGame/physics_shell_animated.cpp +++ b/src/xrGame/physics_shell_animated.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "physics_shell_animated.h" -#include "../xrPhysics/physicsshell.h" +#include "../xrPhysics/PhysicsShell.h" #include "PhysicsShellHolder.h" #include "../Include/xrRender/Kinematics.h" diff --git a/src/xrGame/physics_shell_scripted.cpp b/src/xrGame/physics_shell_scripted.cpp index 4b63fb433b..a15799d101 100644 --- a/src/xrGame/physics_shell_scripted.cpp +++ b/src/xrGame/physics_shell_scripted.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "physics_shell_scripted.h" diff --git a/src/xrGame/physics_shell_scripted.h b/src/xrGame/physics_shell_scripted.h index 54b8cbcb79..ce0c4d05a0 100644 --- a/src/xrGame/physics_shell_scripted.h +++ b/src/xrGame/physics_shell_scripted.h @@ -1,7 +1,7 @@ #pragma once #include "../xrPhysics/iphysics_scripted.h" -#include "../xrPhysics/physicsshell.h" +#include "../xrPhysics/PhysicsShell.h" #include "../xrScripts/script_export_space.h" class CPhysicsShell; diff --git a/src/xrGame/physics_world_scripted.cpp b/src/xrGame/physics_world_scripted.cpp index 714b92f76e..200eadd061 100644 --- a/src/xrGame/physics_world_scripted.cpp +++ b/src/xrGame/physics_world_scripted.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "physics_world_scripted.h" diff --git a/src/xrGame/physics_world_scripted.h b/src/xrGame/physics_world_scripted.h index 15382b5c1f..ce1eb541b5 100644 --- a/src/xrGame/physics_world_scripted.h +++ b/src/xrGame/physics_world_scripted.h @@ -1,7 +1,7 @@ #pragma once #include "../xrPhysics/iphysics_scripted.h" -#include "../xrPhysics/iphworld.h" +#include "../xrPhysics/IPHWorld.h" #include "../xrScripts/script_export_space.h" class CPHCondition; diff --git a/src/xrGame/player_account.cpp b/src/xrGame/player_account.cpp index afe008c3dc..c003b3c899 100644 --- a/src/xrGame/player_account.cpp +++ b/src/xrGame/player_account.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_account.h" #include "MainMenu.h" #include "login_manager.h" diff --git a/src/xrGame/player_hud.cpp b/src/xrGame/player_hud.cpp index d1534e3b00..f5d54372aa 100644 --- a/src/xrGame/player_hud.cpp +++ b/src/xrGame/player_hud.cpp @@ -1,10 +1,10 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_hud.h" #include "HudItem.h" #include "../../xrUI/ui_base.h" #include "Actor.h" #include "physic_item.h" -#include "actoreffector.h" +#include "ActorEffector.h" #include "../xrEngine/IGame_Persistent.h" #include "InertionData.h" #include "Inventory.h" diff --git a/src/xrGame/player_hud_tune.cpp b/src/xrGame/player_hud_tune.cpp index 705932f0ca..9e5d4a3935 100644 --- a/src/xrGame/player_hud_tune.cpp +++ b/src/xrGame/player_hud_tune.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_hud.h" #include "Level.h" #include "debug_renderer.h" #include "../xrEngine/xr_input.h" -#include "HudManager.h" +#include "HUDManager.h" #include "HudItem.h" #include "../xrEngine/Effector.h" #include "../xrEngine/CameraManager.h" diff --git a/src/xrGame/player_name_modifyer.cpp b/src/xrGame/player_name_modifyer.cpp index 549abe5ef5..415476a5b9 100644 --- a/src/xrGame/player_name_modifyer.cpp +++ b/src/xrGame/player_name_modifyer.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" LPCSTR modify_player_name(LPCSTR src_name, string256 & dest) { diff --git a/src/xrGame/player_spot_params.cpp b/src/xrGame/player_spot_params.cpp index 801d1c2634..b00e7103bd 100644 --- a/src/xrGame/player_spot_params.cpp +++ b/src/xrGame/player_spot_params.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_spot_params.h" #include "game_base.h" #include "game_cl_capture_the_artefact.h" diff --git a/src/xrGame/player_state_achilles_heel.cpp b/src/xrGame/player_state_achilles_heel.cpp index c7bbfdbd44..2c8a0062d8 100644 --- a/src/xrGame/player_state_achilles_heel.cpp +++ b/src/xrGame/player_state_achilles_heel.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_state_achilles_heel.h" #include "game_state_accumulator.h" #include "game_cl_base.h" diff --git a/src/xrGame/player_state_ambassador.cpp b/src/xrGame/player_state_ambassador.cpp index bea70c8a1e..42b468992a 100644 --- a/src/xrGame/player_state_ambassador.cpp +++ b/src/xrGame/player_state_ambassador.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_state_ambassador.h" #include "game_cl_base.h" #include "game_state_accumulator.h" diff --git a/src/xrGame/player_state_ammo_elapsed.cpp b/src/xrGame/player_state_ammo_elapsed.cpp index ca6d69503a..2250a9b32a 100644 --- a/src/xrGame/player_state_ammo_elapsed.cpp +++ b/src/xrGame/player_state_ammo_elapsed.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_state_ammo_elapsed.h" #include "game_state_accumulator.h" #include "Weapon.h" diff --git a/src/xrGame/player_state_avenger.cpp b/src/xrGame/player_state_avenger.cpp index 5a0c3bef75..8bf8729453 100644 --- a/src/xrGame/player_state_avenger.cpp +++ b/src/xrGame/player_state_avenger.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_state_avenger.h" #include "kills_store.h" #include "game_cl_base.h" diff --git a/src/xrGame/player_state_blitzkrieg.cpp b/src/xrGame/player_state_blitzkrieg.cpp index a71109874b..f9527c71f0 100644 --- a/src/xrGame/player_state_blitzkrieg.cpp +++ b/src/xrGame/player_state_blitzkrieg.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_cl_base.h" #include "player_state_blitzkrieg.h" #include "game_state_accumulator.h" diff --git a/src/xrGame/player_state_cherub.cpp b/src/xrGame/player_state_cherub.cpp index 713976d45a..a5547a6614 100644 --- a/src/xrGame/player_state_cherub.cpp +++ b/src/xrGame/player_state_cherub.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_state_cherub.h" #include "kills_store.h" #include "game_cl_base.h" diff --git a/src/xrGame/player_state_climber.cpp b/src/xrGame/player_state_climber.cpp index 2b5ac6fe87..85a327c92b 100644 --- a/src/xrGame/player_state_climber.cpp +++ b/src/xrGame/player_state_climber.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_state_climber.h" #include "game_cl_base.h" #include "Level.h" diff --git a/src/xrGame/player_state_mad.cpp b/src/xrGame/player_state_mad.cpp index 45d414b9a5..613c2025ff 100644 --- a/src/xrGame/player_state_mad.cpp +++ b/src/xrGame/player_state_mad.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_state_mad.h" #include "game_base.h" #include "game_state_accumulator.h" diff --git a/src/xrGame/player_state_marksman.cpp b/src/xrGame/player_state_marksman.cpp index ac18f3396d..4198cd42ce 100644 --- a/src/xrGame/player_state_marksman.cpp +++ b/src/xrGame/player_state_marksman.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_state_marksman.h" #include "kills_store.h" #include "game_cl_base.h" diff --git a/src/xrGame/player_state_multichampion.cpp b/src/xrGame/player_state_multichampion.cpp index 446ea4b7fb..32e84e92f1 100644 --- a/src/xrGame/player_state_multichampion.cpp +++ b/src/xrGame/player_state_multichampion.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_state_multichampion.h" #include "player_spot_params.h" #include "game_cl_base.h" diff --git a/src/xrGame/player_state_opener.cpp b/src/xrGame/player_state_opener.cpp index d8ffe603fc..a3bb4d3692 100644 --- a/src/xrGame/player_state_opener.cpp +++ b/src/xrGame/player_state_opener.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_state_opener.h" #include "game_cl_base.h" #include "Level.h" diff --git a/src/xrGame/player_state_params.cpp b/src/xrGame/player_state_params.cpp index 2fe21dbb4f..4fe01814cf 100644 --- a/src/xrGame/player_state_params.cpp +++ b/src/xrGame/player_state_params.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_state_params.h" #include "game_cl_base.h" #include "game_state_accumulator.h" diff --git a/src/xrGame/player_state_remembrance.cpp b/src/xrGame/player_state_remembrance.cpp index ebf35c417e..2cce7130af 100644 --- a/src/xrGame/player_state_remembrance.cpp +++ b/src/xrGame/player_state_remembrance.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_state_remembrance.h" #include "kills_store.h" #include "game_cl_base.h" diff --git a/src/xrGame/player_state_skewer.cpp b/src/xrGame/player_state_skewer.cpp index e9702cdfd3..8fc5605290 100644 --- a/src/xrGame/player_state_skewer.cpp +++ b/src/xrGame/player_state_skewer.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_state_skewer.h" #include "game_base.h" #include "game_state_accumulator.h" diff --git a/src/xrGame/player_state_toughy.cpp b/src/xrGame/player_state_toughy.cpp index 7a17f590b9..f8a0ab47d4 100644 --- a/src/xrGame/player_state_toughy.cpp +++ b/src/xrGame/player_state_toughy.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_state_toughy.h" #include "game_cl_base.h" #include "game_state_accumulator.h" #include "Actor.h" -#include "actorcondition.h" +#include "ActorCondition.h" namespace award_system { diff --git a/src/xrGame/player_team_win_score.cpp b/src/xrGame/player_team_win_score.cpp index db264e4d95..c39360eca6 100644 --- a/src/xrGame/player_team_win_score.cpp +++ b/src/xrGame/player_team_win_score.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "player_team_win_score.h" #include "game_cl_capture_the_artefact.h" #include "game_cl_artefacthunt.h" diff --git a/src/xrGame/pose_extrapolation.cpp b/src/xrGame/pose_extrapolation.cpp index ff4a2a22c2..3d82c98623 100644 --- a/src/xrGame/pose_extrapolation.cpp +++ b/src/xrGame/pose_extrapolation.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pose_extrapolation.h" diff --git a/src/xrGame/poses_blending.cpp b/src/xrGame/poses_blending.cpp index 94b7393999..4aee19bb5b 100644 --- a/src/xrGame/poses_blending.cpp +++ b/src/xrGame/poses_blending.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "poses_blending.h" diff --git a/src/xrGame/pp_effector_custom.cpp b/src/xrGame/pp_effector_custom.cpp index a3db610f0f..2835360ca1 100644 --- a/src/xrGame/pp_effector_custom.cpp +++ b/src/xrGame/pp_effector_custom.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pp_effector_custom.h" #include "Actor.h" #include "ActorEffector.h" diff --git a/src/xrGame/pp_effector_custom.h b/src/xrGame/pp_effector_custom.h index 4160b8de6a..d2d46c6bcc 100644 --- a/src/xrGame/pp_effector_custom.h +++ b/src/xrGame/pp_effector_custom.h @@ -1,6 +1,6 @@ #pragma once -#include "../xrEngine/effectorPP.h" -#include "../xrEngine/cameramanager.h" +#include "../xrEngine/EffectorPP.h" +#include "../xrEngine/CameraManager.h" ////////////////////////////////////////////////////////////////////////// diff --git a/src/xrGame/pp_effector_distance.cpp b/src/xrGame/pp_effector_distance.cpp index 003ed369e0..2aaa154386 100644 --- a/src/xrGame/pp_effector_distance.cpp +++ b/src/xrGame/pp_effector_distance.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pp_effector_distance.h" //////////////////////////////////////////////////////////////////////////////////// diff --git a/src/xrGame/profile_data_types.cpp b/src/xrGame/profile_data_types.cpp index 63384b50d9..f4718ed1da 100644 --- a/src/xrGame/profile_data_types.cpp +++ b/src/xrGame/profile_data_types.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "profile_data_types.h" namespace gamespy_profile diff --git a/src/xrGame/profile_data_types_script.cpp b/src/xrGame/profile_data_types_script.cpp index 1c425606e2..313b9c9355 100644 --- a/src/xrGame/profile_data_types_script.cpp +++ b/src/xrGame/profile_data_types_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "profile_data_types.h" using namespace luabind; diff --git a/src/xrGame/profile_store.cpp b/src/xrGame/profile_store.cpp index fc42dc2911..0c79ee8327 100644 --- a/src/xrGame/profile_store.cpp +++ b/src/xrGame/profile_store.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "profile_store.h" -#include "GameSpy/GameSpy_Full.h" -#include "GameSpy/GAmeSpy_SAKE.h" +#include "gamespy/GameSpy_Full.h" +#include "gamespy/GameSpy_SAKE.h" #include "MainMenu.h" #include "login_manager.h" #include "awards_store.h" diff --git a/src/xrGame/profile_store_script.cpp b/src/xrGame/profile_store_script.cpp index 07d0839d87..e110944685 100644 --- a/src/xrGame/profile_store_script.cpp +++ b/src/xrGame/profile_store_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "profile_store.h" using namespace luabind; diff --git a/src/xrGame/property_evaluator_script.cpp b/src/xrGame/property_evaluator_script.cpp index de45ad68e5..52f21bd5ab 100644 --- a/src/xrGame/property_evaluator_script.cpp +++ b/src/xrGame/property_evaluator_script.cpp @@ -6,7 +6,7 @@ // Description : Property evaluator script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_property_evaluator_wrapper.h" #include "script_game_object.h" diff --git a/src/xrGame/property_storage_script.cpp b/src/xrGame/property_storage_script.cpp index c01eb86cde..91af511480 100644 --- a/src/xrGame/property_storage_script.cpp +++ b/src/xrGame/property_storage_script.cpp @@ -6,7 +6,7 @@ // Description : Property storage class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "property_storage.h" diff --git a/src/xrGame/purchase_list.cpp b/src/xrGame/purchase_list.cpp index 7ddc9cf513..a4ae157ebd 100644 --- a/src/xrGame/purchase_list.cpp +++ b/src/xrGame/purchase_list.cpp @@ -6,10 +6,10 @@ // Description : purchase list class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "purchase_list.h" -#include "inventoryowner.h" -#include "gameobject.h" +#include "InventoryOwner.h" +#include "GameObject.h" #include "ai_object_location.h" #include "Level.h" diff --git a/src/xrGame/random32.cpp b/src/xrGame/random32.cpp index 3f7f7f12f6..2e8858ed8d 100644 --- a/src/xrGame/random32.cpp +++ b/src/xrGame/random32.cpp @@ -6,7 +6,7 @@ // Description : 32-bit peudo random number generator //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "random32.h" CRandom32 Random32; \ No newline at end of file diff --git a/src/xrGame/rat_state_base.cpp b/src/xrGame/rat_state_base.cpp index a896814e7c..a195fafb57 100644 --- a/src/xrGame/rat_state_base.cpp +++ b/src/xrGame/rat_state_base.cpp @@ -6,7 +6,7 @@ // Description : rat state base class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "rat_state_base.h" void rat_state_base::construct (CAI_Rat *object) diff --git a/src/xrGame/rat_state_manager.cpp b/src/xrGame/rat_state_manager.cpp index df4a5bce9c..2030360d92 100644 --- a/src/xrGame/rat_state_manager.cpp +++ b/src/xrGame/rat_state_manager.cpp @@ -6,7 +6,7 @@ // Description : rat state manager class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "rat_state_manager.h" #include "object_broker.h" #include "rat_state_base.h" diff --git a/src/xrGame/rat_states.cpp b/src/xrGame/rat_states.cpp index d99685437e..9a1865a145 100644 --- a/src/xrGame/rat_states.cpp +++ b/src/xrGame/rat_states.cpp @@ -7,7 +7,7 @@ // Description : rat states classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "rat_states.h" #include "ai/monsters/rats/ai_rat.h" #include "ai/monsters/ai_monster_squad_manager.h" diff --git a/src/xrGame/relation_registry.cpp b/src/xrGame/relation_registry.cpp index be63f78b11..24748d60cd 100644 --- a/src/xrGame/relation_registry.cpp +++ b/src/xrGame/relation_registry.cpp @@ -3,7 +3,7 @@ // другим персонажам ////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "relation_registry.h" #include "alife_registry_wrappers.h" diff --git a/src/xrGame/relation_registry_actions.cpp b/src/xrGame/relation_registry_actions.cpp index e9f57c22c9..7ac419230e 100644 --- a/src/xrGame/relation_registry_actions.cpp +++ b/src/xrGame/relation_registry_actions.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "relation_registry.h" #include "alife_registry_wrappers.h" diff --git a/src/xrGame/relation_registry_fights.cpp b/src/xrGame/relation_registry_fights.cpp index 572ea0f91a..21f6b12646 100644 --- a/src/xrGame/relation_registry_fights.cpp +++ b/src/xrGame/relation_registry_fights.cpp @@ -3,7 +3,7 @@ // другим персонажам ////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "relation_registry.h" diff --git a/src/xrGame/restricted_object.cpp b/src/xrGame/restricted_object.cpp index e7b2d934a0..743858b180 100644 --- a/src/xrGame/restricted_object.cpp +++ b/src/xrGame/restricted_object.cpp @@ -6,7 +6,7 @@ // Description : Restricted object //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "restricted_object.h" #include "space_restriction_manager.h" #include "xrServer_Objects_ALife_Monsters.h" @@ -19,7 +19,7 @@ #include "alife_simulator.h" #include "alife_object_registry.h" #include "game_graph.h" -#include "custommonster.h" +#include "CustomMonster.h" CRestrictedObject::~CRestrictedObject () { diff --git a/src/xrGame/restricted_object_obstacle.cpp b/src/xrGame/restricted_object_obstacle.cpp index c443515669..a5c5bf7a4c 100644 --- a/src/xrGame/restricted_object_obstacle.cpp +++ b/src/xrGame/restricted_object_obstacle.cpp @@ -6,7 +6,7 @@ // Description : Restricted object with obstacles' avoidance //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "restricted_object_obstacle.h" #include "ai_space.h" #include "level_graph.h" diff --git a/src/xrGame/reward_event_generator.cpp b/src/xrGame/reward_event_generator.cpp index a26eea5b88..c105ef038d 100644 --- a/src/xrGame/reward_event_generator.cpp +++ b/src/xrGame/reward_event_generator.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "reward_event_generator.h" #include "game_state_accumulator.h" #include "game_base.h" diff --git a/src/xrGame/reward_manager.cpp b/src/xrGame/reward_manager.cpp index 843aa7d2e9..c6f49f6050 100644 --- a/src/xrGame/reward_manager.cpp +++ b/src/xrGame/reward_manager.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "reward_manager.h" #include "game_cl_mp.h" #include "UIGameMP.h" diff --git a/src/xrGame/rewarding_events_handlers.cpp b/src/xrGame/rewarding_events_handlers.cpp index 329729d98c..f1d8f4c586 100644 --- a/src/xrGame/rewarding_events_handlers.cpp +++ b/src/xrGame/rewarding_events_handlers.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "rewarding_events_handlers.h" #include "reward_event_handler.h" #include "../xrServerEntities/object_broker.h" diff --git a/src/xrGame/rewarding_state_events.cpp b/src/xrGame/rewarding_state_events.cpp index eaffcec6af..577d1d4ec2 100644 --- a/src/xrGame/rewarding_state_events.cpp +++ b/src/xrGame/rewarding_state_events.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "rewarding_state_events.h" #include "game_state_accumulator.h" #include "profile_data_types.h" diff --git a/src/xrGame/saved_game_wrapper.cpp b/src/xrGame/saved_game_wrapper.cpp index a798a4dfe8..e706428a9a 100644 --- a/src/xrGame/saved_game_wrapper.cpp +++ b/src/xrGame/saved_game_wrapper.cpp @@ -6,7 +6,7 @@ // Description : saved game wrapper class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "saved_game_wrapper.h" #include "alife_time_manager.h" #include "alife_object_registry.h" diff --git a/src/xrGame/saved_game_wrapper_script.cpp b/src/xrGame/saved_game_wrapper_script.cpp index 97ce96250d..15934823a5 100644 --- a/src/xrGame/saved_game_wrapper_script.cpp +++ b/src/xrGame/saved_game_wrapper_script.cpp @@ -6,7 +6,7 @@ // Description : saved game wrapper class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "saved_game_wrapper.h" #include "ai_space.h" diff --git a/src/xrGame/screenshot_manager.cpp b/src/xrGame/screenshot_manager.cpp index 6f8586582c..a20cb039cb 100644 --- a/src/xrGame/screenshot_manager.cpp +++ b/src/xrGame/screenshot_manager.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "screenshot_manager.h" #include "Level.h" #include "game_cl_mp.h" @@ -12,8 +12,8 @@ #ifdef XR_MP_BUILD #include -#include "../3rd party/cximage/cximage/ximage.h" -#include "../3rd party/cximage/cximage/xmemfile.h" +#include "../3rd party/cximage/CxImage/ximage.h" +#include "../3rd party/cximage/CxImage/xmemfile.h" void* cxalloc(size_t size) { diff --git a/src/xrGame/screenshot_server.cpp b/src/xrGame/screenshot_server.cpp index 16109cd9d0..557418e169 100644 --- a/src/xrGame/screenshot_server.cpp +++ b/src/xrGame/screenshot_server.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "screenshot_server.h" #include "xrMessages.h" #include "Level.h" diff --git a/src/xrGame/screenshots_common.cpp b/src/xrGame/screenshots_common.cpp index 7951ccf38f..8831031acd 100644 --- a/src/xrGame/screenshots_common.cpp +++ b/src/xrGame/screenshots_common.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "screenshots_common.h" namespace screenshots diff --git a/src/xrGame/screenshots_writer.cpp b/src/xrGame/screenshots_writer.cpp index 7dadf1469c..0d6ef27d96 100644 --- a/src/xrGame/screenshots_writer.cpp +++ b/src/xrGame/screenshots_writer.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "screenshots_writer.h" #include "screenshots_common.h" diff --git a/src/xrGame/script_abstract_action.cpp b/src/xrGame/script_abstract_action.cpp index a2d2a4fa4b..c9fdf4f992 100644 --- a/src/xrGame/script_abstract_action.cpp +++ b/src/xrGame/script_abstract_action.cpp @@ -6,7 +6,7 @@ // Description : Script abstract action //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "script_abstract_action.h" CScriptAbstractAction::~CScriptAbstractAction () diff --git a/src/xrGame/script_action_condition.cpp b/src/xrGame/script_action_condition.cpp index 7f6092ecbe..2243b825d5 100644 --- a/src/xrGame/script_action_condition.cpp +++ b/src/xrGame/script_action_condition.cpp @@ -6,7 +6,7 @@ // Description : Script action condition class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "script_action_condition.h" CScriptActionCondition::~CScriptActionCondition () diff --git a/src/xrGame/script_action_condition_script.cpp b/src/xrGame/script_action_condition_script.cpp index 76e22ef7e3..1e84477160 100644 --- a/src/xrGame/script_action_condition_script.cpp +++ b/src/xrGame/script_action_condition_script.cpp @@ -6,7 +6,7 @@ // Description : Script action condition class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_action_condition.h" diff --git a/src/xrGame/script_action_planner_action_wrapper.cpp b/src/xrGame/script_action_planner_action_wrapper.cpp index 640afd0ac9..885241561e 100644 --- a/src/xrGame/script_action_planner_action_wrapper.cpp +++ b/src/xrGame/script_action_planner_action_wrapper.cpp @@ -6,7 +6,7 @@ // Description : Script action planner action wrapper //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_action_planner_action_wrapper.h" #include "script_game_object.h" diff --git a/src/xrGame/script_action_planner_wrapper.cpp b/src/xrGame/script_action_planner_wrapper.cpp index 61b3d210f9..f4f5311148 100644 --- a/src/xrGame/script_action_planner_wrapper.cpp +++ b/src/xrGame/script_action_planner_wrapper.cpp @@ -6,7 +6,7 @@ // Description : Script action planner wrapper //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_action_planner_wrapper.h" #include "script_game_object.h" diff --git a/src/xrGame/script_action_wrapper.cpp b/src/xrGame/script_action_wrapper.cpp index 23b42aa7b9..f55690b2b8 100644 --- a/src/xrGame/script_action_wrapper.cpp +++ b/src/xrGame/script_action_wrapper.cpp @@ -6,7 +6,7 @@ // Description : Script action wrapper //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_action_wrapper.h" #include "script_game_object.h" diff --git a/src/xrGame/script_animation_action.cpp b/src/xrGame/script_animation_action.cpp index 57e59dbaca..a3087b4cf0 100644 --- a/src/xrGame/script_animation_action.cpp +++ b/src/xrGame/script_animation_action.cpp @@ -6,7 +6,7 @@ // Description : Script animation action class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "script_animation_action.h" CScriptAnimationAction::~CScriptAnimationAction () diff --git a/src/xrGame/script_animation_action_script.cpp b/src/xrGame/script_animation_action_script.cpp index b6573c9b12..d57bb911d7 100644 --- a/src/xrGame/script_animation_action_script.cpp +++ b/src/xrGame/script_animation_action_script.cpp @@ -6,7 +6,7 @@ // Description : Script animation action class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_animation_action.h" diff --git a/src/xrGame/script_binder.cpp b/src/xrGame/script_binder.cpp index 8be57598bd..89fcab1502 100644 --- a/src/xrGame/script_binder.cpp +++ b/src/xrGame/script_binder.cpp @@ -6,7 +6,7 @@ // Description : Script objects binder //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "ai_space.h" #include "../xrScripts/script_engine.h" @@ -14,7 +14,7 @@ #include "xrServer_Objects_ALife.h" #include "script_binder_object.h" #include "script_game_object.h" -#include "gameobject.h" +#include "GameObject.h" #include "Level.h" // comment next string when commiting diff --git a/src/xrGame/script_binder_object.cpp b/src/xrGame/script_binder_object.cpp index 67e8029f84..9696347cc1 100644 --- a/src/xrGame/script_binder_object.cpp +++ b/src/xrGame/script_binder_object.cpp @@ -6,7 +6,7 @@ // Description : Script object binder //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "script_binder_object.h" #include "script_game_object.h" diff --git a/src/xrGame/script_binder_object_script.cpp b/src/xrGame/script_binder_object_script.cpp index 2457761126..cad968e966 100644 --- a/src/xrGame/script_binder_object_script.cpp +++ b/src/xrGame/script_binder_object_script.cpp @@ -6,7 +6,7 @@ // Description : Script object binder script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_binder_object.h" #include "../xrScripts/script_export_space.h" diff --git a/src/xrGame/script_binder_object_wrapper.cpp b/src/xrGame/script_binder_object_wrapper.cpp index d95393560f..bd09403997 100644 --- a/src/xrGame/script_binder_object_wrapper.cpp +++ b/src/xrGame/script_binder_object_wrapper.cpp @@ -6,7 +6,7 @@ // Description : Script object binder wrapper //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_binder_object_wrapper.h" #include "script_game_object.h" diff --git a/src/xrGame/script_effector.cpp b/src/xrGame/script_effector.cpp index 2df7632b62..6b4ef2ba13 100644 --- a/src/xrGame/script_effector.cpp +++ b/src/xrGame/script_effector.cpp @@ -6,7 +6,7 @@ // Description : XRay Script effector class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "script_effector.h" #include "Actor.h" #include "ActorEffector.h" diff --git a/src/xrGame/script_effector.h b/src/xrGame/script_effector.h index 8a8d895b2f..e0265291a7 100644 --- a/src/xrGame/script_effector.h +++ b/src/xrGame/script_effector.h @@ -8,9 +8,9 @@ #pragma once -#include "../xrEngine/effectorpp.h" +#include "../xrEngine/EffectorPP.h" #include "../xrScripts/script_export_space.h" -#include "../xrEngine/cameramanager.h" +#include "../xrEngine/CameraManager.h" class CScriptEffector : public CEffectorPP { public: diff --git a/src/xrGame/script_effector_script.cpp b/src/xrGame/script_effector_script.cpp index 81c8534420..118928679d 100644 --- a/src/xrGame/script_effector_script.cpp +++ b/src/xrGame/script_effector_script.cpp @@ -6,7 +6,7 @@ // Description : XRay Script effector class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_effector.h" #include "script_effector_wrapper.h" diff --git a/src/xrGame/script_effector_wrapper.cpp b/src/xrGame/script_effector_wrapper.cpp index 7bcda3d502..9df51794b4 100644 --- a/src/xrGame/script_effector_wrapper.cpp +++ b/src/xrGame/script_effector_wrapper.cpp @@ -6,7 +6,7 @@ // Description : XRay Script effector wrapper class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_effector_wrapper.h" diff --git a/src/xrGame/script_engine_help.cpp b/src/xrGame/script_engine_help.cpp index 1debce87e3..28939567ff 100644 --- a/src/xrGame/script_engine_help.cpp +++ b/src/xrGame/script_engine_help.cpp @@ -6,7 +6,7 @@ // Description : Script Engine help //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" void print_help(lua_State* L) diff --git a/src/xrGame/script_entity.cpp b/src/xrGame/script_entity.cpp index 3a56ab374d..cb2e25e13a 100644 --- a/src/xrGame/script_entity.cpp +++ b/src/xrGame/script_entity.cpp @@ -6,11 +6,11 @@ // Description : Script entity class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_entity.h" #include "CustomMonster.h" -#include "../xrEngine/feel_vision.h" +#include "../xrEngine/Feel_Vision.h" #include "../xrEngine/motion.h" #include "../Include/xrRender/Kinematics.h" #include "script_entity_action.h" diff --git a/src/xrGame/script_entity_action.cpp b/src/xrGame/script_entity_action.cpp index 0d926b55e9..e0e96181f0 100644 --- a/src/xrGame/script_entity_action.cpp +++ b/src/xrGame/script_entity_action.cpp @@ -6,7 +6,7 @@ // Description : Script entity action class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "script_entity_action.h" CScriptEntityAction::~CScriptEntityAction () diff --git a/src/xrGame/script_entity_action_script.cpp b/src/xrGame/script_entity_action_script.cpp index 874d016cd1..b7b67b9ed5 100644 --- a/src/xrGame/script_entity_action_script.cpp +++ b/src/xrGame/script_entity_action_script.cpp @@ -6,7 +6,7 @@ // Description : Script entity action class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_entity_action.h" diff --git a/src/xrGame/script_game_object.cpp b/src/xrGame/script_game_object.cpp index a2eb4d137a..a3f7840833 100644 --- a/src/xrGame/script_game_object.cpp +++ b/src/xrGame/script_game_object.cpp @@ -6,20 +6,20 @@ // Description : Script game object class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_game_object.h" #include "script_entity_action.h" #include "ai_space.h" #include "../xrScripts/script_engine.h" #include "script_entity.h" -#include "physicsshellholder.h" +#include "PhysicsShellHolder.h" #include "helicopter.h" #include "holder_custom.h" -#include "inventoryowner.h" +#include "InventoryOwner.h" #include "movement_manager.h" #include "entity_alive.h" -#include "weaponmagazined.h" +#include "WeaponMagazined.h" #include "xrMessages.h" #include "Inventory.h" //#include "script_ini_file.h" @@ -27,8 +27,8 @@ #include "HangingLamp.h" #include "patrol_path_manager.h" #include "ai_object_location.h" -#include "custommonster.h" -#include "entitycondition.h" +#include "CustomMonster.h" +#include "EntityCondition.h" #include "space_restrictor.h" #include "detail_path_manager.h" #include "level_graph.h" diff --git a/src/xrGame/script_game_object2.cpp b/src/xrGame/script_game_object2.cpp index 0ba210a06d..9995496e0a 100644 --- a/src/xrGame/script_game_object2.cpp +++ b/src/xrGame/script_game_object2.cpp @@ -6,22 +6,22 @@ // Description : Script game object class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_game_object.h" #include "ai_space.h" #include "../xrScripts/script_engine.h" -#include "explosive.h" +#include "Explosive.h" #include "script_zone.h" #include "object_handler.h" #include "script_hit.h" #include "../Include/xrRender/Kinematics.h" -#include "pda.h" +#include "PDA.h" #include "InfoPortion.h" #include "memory_manager.h" -#include "ai_phrasedialogmanager.h" +#include "AI_PhraseDialogManager.h" #include "xrMessages.h" -#include "custommonster.h" +#include "CustomMonster.h" #include "memory_manager.h" #include "visual_memory_manager.h" #include "sound_memory_manager.h" @@ -34,7 +34,7 @@ #include "../Include/xrRender/Kinematics.h" #include "../xrEngine/CameraBase.h" #include "ai/stalker/ai_stalker.h" -#include "car.h" +#include "Car.h" #include "movement_manager.h" #include "detail_path_manager.h" diff --git a/src/xrGame/script_game_object3.cpp b/src/xrGame/script_game_object3.cpp index 4e5d6b49bd..2bf94025a2 100644 --- a/src/xrGame/script_game_object3.cpp +++ b/src/xrGame/script_game_object3.cpp @@ -6,7 +6,7 @@ // Description : Script game object class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_game_object.h" #include "ai_space.h" @@ -32,7 +32,7 @@ #include "movement_manager_space.h" #include "detail_path_manager_space.h" #include "level_debug.h" -#include "ai/monsters/BaseMonster/base_monster.h" +#include "ai/monsters/basemonster/base_monster.h" #include "trade_parameters.h" #include "../xrScripts/exports/script_ini_file.h" #include "sound_player.h" diff --git a/src/xrGame/script_game_object4.cpp b/src/xrGame/script_game_object4.cpp index 2dd0a7e889..d1fab104ad 100644 --- a/src/xrGame/script_game_object4.cpp +++ b/src/xrGame/script_game_object4.cpp @@ -2,7 +2,7 @@ // script_game_object_trader.сpp : функции для торговли и торговцев ////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_game_object.h" @@ -18,9 +18,9 @@ #include "sight_manager_space.h" #include "sight_control_action.h" #include "sight_manager.h" -#include "inventoryBox.h" +#include "InventoryBox.h" #include "ZoneCampfire.h" -#include "physicobject.h" +#include "PhysicObject.h" #include "Artefact.h" #include "stalker_sound_data.h" diff --git a/src/xrGame/script_game_object_inventory_owner.cpp b/src/xrGame/script_game_object_inventory_owner.cpp index fa17d6afe9..b06db1cb9c 100644 --- a/src/xrGame/script_game_object_inventory_owner.cpp +++ b/src/xrGame/script_game_object_inventory_owner.cpp @@ -2,18 +2,18 @@ // script_game_object_inventory_owner.сpp : функции для inventory owner ////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_game_object.h" #include "InventoryOwner.h" -#include "Pda.h" +#include "PDA.h" #include "xrMessages.h" #include "character_info.h" -#include "gametask.h" +#include "GameTask.h" #include "Actor.h" #include "Level.h" #include "../xrEngine/date_time.h" -#include "uigamesp.h" +#include "UIGameSP.h" #include "restricted_object.h" #include "../xrScripts/script_engine.h" #include "attachable_item.h" @@ -21,15 +21,15 @@ #include "../xrEngine/string_table.h" #include "alife_registry_wrappers.h" #include "relation_registry.h" -#include "custommonster.h" -#include "actorcondition.h" +#include "CustomMonster.h" +#include "ActorCondition.h" #include "level_graph.h" -#include "huditem.h" -#include "ui/UItalkWnd.h" +#include "HudItem.h" +#include "ui/UITalkWnd.h" #include "Inventory.h" -#include "infoportion.h" -#include "AI/Monsters/BaseMonster/base_monster.h" -#include "weaponmagazined.h" +#include "InfoPortion.h" +#include "ai/monsters/basemonster/base_monster.h" +#include "WeaponMagazined.h" #include "ai/stalker/ai_stalker.h" #include "agent_manager.h" #include "agent_member_manager.h" @@ -45,7 +45,7 @@ #include "doors_manager.h" #include "doors_door.h" #include "Torch.h" -#include "physicobject.h" +#include "PhysicObject.h" bool CScriptGameObject::GiveInfoPortion(LPCSTR info_id) { @@ -724,7 +724,7 @@ LPCSTR CScriptGameObject::sound_voice_prefix () const return pInventoryOwner->SpecificCharacter().sound_voice_prefix(); } -#include "GameTaskManager.h" +#include "GametaskManager.h" ETaskState CScriptGameObject::GetGameTaskState (LPCSTR task_id) { shared_str shared_name = task_id; diff --git a/src/xrGame/script_game_object_script.cpp b/src/xrGame/script_game_object_script.cpp index 551ac48010..0674ca33c4 100644 --- a/src/xrGame/script_game_object_script.cpp +++ b/src/xrGame/script_game_object_script.cpp @@ -6,7 +6,7 @@ // Description : XRay Script game object script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_game_object.h" #include "game_object_space.h" diff --git a/src/xrGame/script_game_object_script2.cpp b/src/xrGame/script_game_object_script2.cpp index 7ab82fba0a..3cf686f8e8 100644 --- a/src/xrGame/script_game_object_script2.cpp +++ b/src/xrGame/script_game_object_script2.cpp @@ -6,7 +6,7 @@ // Description : XRay Script game object script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_game_object.h" #include "alife_space.h" diff --git a/src/xrGame/script_game_object_script3.cpp b/src/xrGame/script_game_object_script3.cpp index d52c797854..4aefb82dc2 100644 --- a/src/xrGame/script_game_object_script3.cpp +++ b/src/xrGame/script_game_object_script3.cpp @@ -6,7 +6,7 @@ // Description : XRay Script game object script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_game_object.h" #include "alife_space.h" @@ -28,9 +28,9 @@ #include "script_zone.h" #include "relation_registry.h" #include "GameTask.h" -#include "car.h" +#include "Car.h" #include "ZoneCampfire.h" -#include "physicobject.h" +#include "PhysicObject.h" #include "Artefact.h" #include "sight_manager_space.h" #include "../xrScripts/exports/script_ini_file.h" diff --git a/src/xrGame/script_game_object_script_trader.cpp b/src/xrGame/script_game_object_script_trader.cpp index 97861786d5..eebde79ebe 100644 --- a/src/xrGame/script_game_object_script_trader.cpp +++ b/src/xrGame/script_game_object_script_trader.cpp @@ -6,7 +6,7 @@ // Description : XRay Script game object script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_game_object.h" diff --git a/src/xrGame/script_game_object_smart_covers.cpp b/src/xrGame/script_game_object_smart_covers.cpp index 6915dd4a27..5920ceca0f 100644 --- a/src/xrGame/script_game_object_smart_covers.cpp +++ b/src/xrGame/script_game_object_smart_covers.cpp @@ -6,7 +6,7 @@ // Description : script game object class smart covers stuff //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_game_object.h" #include "ai/stalker/ai_stalker.h" diff --git a/src/xrGame/script_game_object_trader.cpp b/src/xrGame/script_game_object_trader.cpp index a3880f3644..4ae6d8431b 100644 --- a/src/xrGame/script_game_object_trader.cpp +++ b/src/xrGame/script_game_object_trader.cpp @@ -2,7 +2,7 @@ // script_game_object_trader.сpp : функции для торговли и торговцев ////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_game_object.h" #include "ai/trader/ai_trader.h" diff --git a/src/xrGame/script_game_object_use.cpp b/src/xrGame/script_game_object_use.cpp index c9436f81aa..d62ebf0401 100644 --- a/src/xrGame/script_game_object_use.cpp +++ b/src/xrGame/script_game_object_use.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_game_object.h" #include "UsableScriptObject.h" @@ -16,7 +16,7 @@ #include "PHCommander.h" #include "PHScriptCall.h" #include "PHSimpleCalls.h" -#include "../xrPhysics/iphworld.h" +#include "../xrPhysics/IPHWorld.h" #include "doors_manager.h" void CScriptGameObject::SetTipText (LPCSTR tip_text) diff --git a/src/xrGame/script_game_object_use2.cpp b/src/xrGame/script_game_object_use2.cpp index f1c7a0b221..4c53059b73 100644 --- a/src/xrGame/script_game_object_use2.cpp +++ b/src/xrGame/script_game_object_use2.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_game_object.h" #include "ai/monsters/bloodsucker/bloodsucker.h" diff --git a/src/xrGame/script_hit.cpp b/src/xrGame/script_hit.cpp index 79fb644c7a..79bf34c245 100644 --- a/src/xrGame/script_hit.cpp +++ b/src/xrGame/script_hit.cpp @@ -6,7 +6,7 @@ // Description : XRay Script hit class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "script_hit.h" CScriptHit::~CScriptHit () diff --git a/src/xrGame/script_hit_script.cpp b/src/xrGame/script_hit_script.cpp index afe313edaa..e0d6ff6a74 100644 --- a/src/xrGame/script_hit_script.cpp +++ b/src/xrGame/script_hit_script.cpp @@ -6,7 +6,7 @@ // Description : XRay Script hit class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_hit.h" #include "script_game_object.h" diff --git a/src/xrGame/script_lanim.cpp b/src/xrGame/script_lanim.cpp index 53cf2c5873..41a2902a5c 100644 --- a/src/xrGame/script_lanim.cpp +++ b/src/xrGame/script_lanim.cpp @@ -6,7 +6,7 @@ // Description : Script ini file class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_lanim.h" #include "../xrEngine/LightAnimLibrary.h" diff --git a/src/xrGame/script_monster_action.cpp b/src/xrGame/script_monster_action.cpp index 1fa23226a9..1c55778b04 100644 --- a/src/xrGame/script_monster_action.cpp +++ b/src/xrGame/script_monster_action.cpp @@ -6,7 +6,7 @@ // Description : Script monster action class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "script_monster_action.h" #include "script_game_object.h" diff --git a/src/xrGame/script_monster_action_script.cpp b/src/xrGame/script_monster_action_script.cpp index 529246c13b..cb2b765447 100644 --- a/src/xrGame/script_monster_action_script.cpp +++ b/src/xrGame/script_monster_action_script.cpp @@ -6,7 +6,7 @@ // Description : Script monster action class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_monster_action.h" #include "script_game_object.h" diff --git a/src/xrGame/script_monster_hit_info_script.cpp b/src/xrGame/script_monster_hit_info_script.cpp index 09c4b78ffc..ef8d465658 100644 --- a/src/xrGame/script_monster_hit_info_script.cpp +++ b/src/xrGame/script_monster_hit_info_script.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_monster_hit_info.h" #include "script_game_object.h" #include "ai_monster_space.h" -#include "AI/Monsters/monster_sound_defs.h" +#include "ai/monsters/monster_sound_defs.h" using namespace luabind; diff --git a/src/xrGame/script_movement_action.cpp b/src/xrGame/script_movement_action.cpp index 7e18cb8d1c..cf67e9ee18 100644 --- a/src/xrGame/script_movement_action.cpp +++ b/src/xrGame/script_movement_action.cpp @@ -6,7 +6,7 @@ // Description : Script movement action class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "script_movement_action.h" #include "script_game_object.h" #include "detail_path_manager_space.h" diff --git a/src/xrGame/script_movement_action_script.cpp b/src/xrGame/script_movement_action_script.cpp index 2768b349fe..fef456d59f 100644 --- a/src/xrGame/script_movement_action_script.cpp +++ b/src/xrGame/script_movement_action_script.cpp @@ -6,7 +6,7 @@ // Description : Script movement action class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_movement_action.h" #include "script_game_object.h" diff --git a/src/xrGame/script_object.cpp b/src/xrGame/script_object.cpp index 63c3da3ded..ef37d2e7c5 100644 --- a/src/xrGame/script_object.cpp +++ b/src/xrGame/script_object.cpp @@ -6,7 +6,7 @@ // Description : Script object class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "script_object.h" CScriptObject::CScriptObject () diff --git a/src/xrGame/script_object.h b/src/xrGame/script_object.h index 11bd6ed8af..a0747ee1b5 100644 --- a/src/xrGame/script_object.h +++ b/src/xrGame/script_object.h @@ -8,7 +8,7 @@ #pragma once -#include "gameobject.h" +#include "GameObject.h" #include "script_entity.h" class CScriptObject : diff --git a/src/xrGame/script_object_action.cpp b/src/xrGame/script_object_action.cpp index 4429e48d65..f2ae6ceb7e 100644 --- a/src/xrGame/script_object_action.cpp +++ b/src/xrGame/script_object_action.cpp @@ -6,7 +6,7 @@ // Description : Script object action class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "script_object_action.h" #include "script_game_object.h" diff --git a/src/xrGame/script_object_action_script.cpp b/src/xrGame/script_object_action_script.cpp index 052450b4f7..6078d0dec1 100644 --- a/src/xrGame/script_object_action_script.cpp +++ b/src/xrGame/script_object_action_script.cpp @@ -6,7 +6,7 @@ // Description : Script object action class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_object_action.h" #include "script_game_object.h" diff --git a/src/xrGame/script_particle_action.cpp b/src/xrGame/script_particle_action.cpp index 25acac9b90..15c2340364 100644 --- a/src/xrGame/script_particle_action.cpp +++ b/src/xrGame/script_particle_action.cpp @@ -6,7 +6,7 @@ // Description : Script particle action class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "script_particle_action.h" #include "../xrParticles/stdafx.h" #include "../xrParticles/ParticlesObject.h" diff --git a/src/xrGame/script_particle_action_script.cpp b/src/xrGame/script_particle_action_script.cpp index f46976545f..0ddaff32f5 100644 --- a/src/xrGame/script_particle_action_script.cpp +++ b/src/xrGame/script_particle_action_script.cpp @@ -6,7 +6,7 @@ // Description : Script particle action class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_particle_action.h" diff --git a/src/xrGame/script_particles.cpp b/src/xrGame/script_particles.cpp index 425924cee6..a952fd103e 100644 --- a/src/xrGame/script_particles.cpp +++ b/src/xrGame/script_particles.cpp @@ -6,9 +6,9 @@ // Description : XRay Script sound class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "script_particles.h" -#include "../xrEngine/objectanimator.h" +#include "../xrEngine/ObjectAnimator.h" CScriptParticlesCustom::CScriptParticlesCustom(CScriptParticles* owner, LPCSTR caParticlesName):CParticlesObject(caParticlesName,FALSE,true) { diff --git a/src/xrGame/script_particles_script.cpp b/src/xrGame/script_particles_script.cpp index bc3fc249f0..1570d72af5 100644 --- a/src/xrGame/script_particles_script.cpp +++ b/src/xrGame/script_particles_script.cpp @@ -6,7 +6,7 @@ // Description : XRay Script sound class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_particles.h" diff --git a/src/xrGame/script_property_evaluator_wrapper.cpp b/src/xrGame/script_property_evaluator_wrapper.cpp index fffadeaa62..f0f4a604c2 100644 --- a/src/xrGame/script_property_evaluator_wrapper.cpp +++ b/src/xrGame/script_property_evaluator_wrapper.cpp @@ -6,7 +6,7 @@ // Description : Script property evaluator wrapper //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_property_evaluator_wrapper.h" #include "script_game_object.h" diff --git a/src/xrGame/script_render_device_script.cpp b/src/xrGame/script_render_device_script.cpp index 29a11df34f..e7a2859dd0 100644 --- a/src/xrGame/script_render_device_script.cpp +++ b/src/xrGame/script_render_device_script.cpp @@ -6,7 +6,7 @@ // Description : Script render device script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_render_device.h" diff --git a/src/xrGame/script_sound.cpp b/src/xrGame/script_sound.cpp index 70a454327e..62023d3e5a 100644 --- a/src/xrGame/script_sound.cpp +++ b/src/xrGame/script_sound.cpp @@ -6,10 +6,10 @@ // Description : XRay Script sound class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "script_sound.h" #include "script_game_object.h" -#include "gameobject.h" +#include "GameObject.h" #include "ai_space.h" #include "../xrScripts/script_engine.h" diff --git a/src/xrGame/script_sound_action.cpp b/src/xrGame/script_sound_action.cpp index 6d2daefccc..53e12e4bc9 100644 --- a/src/xrGame/script_sound_action.cpp +++ b/src/xrGame/script_sound_action.cpp @@ -6,7 +6,7 @@ // Description : Script sound action class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "script_sound_action.h" #include "ai_space.h" #include "../xrScripts/script_engine.h" diff --git a/src/xrGame/script_sound_action.h b/src/xrGame/script_sound_action.h index 468412829e..6f71b481ae 100644 --- a/src/xrGame/script_sound_action.h +++ b/src/xrGame/script_sound_action.h @@ -13,7 +13,7 @@ #include "../xrSound/ai_sounds.h" #include "ai_monster_space.h" #include "script_sound.h" -#include "AI/monsters/monster_sound_defs.h" +#include "ai/monsters/monster_sound_defs.h" class CScriptSoundAction : public CScriptAbstractAction { public: diff --git a/src/xrGame/script_sound_action_script.cpp b/src/xrGame/script_sound_action_script.cpp index e49ad136a6..fdaa2ed7f8 100644 --- a/src/xrGame/script_sound_action_script.cpp +++ b/src/xrGame/script_sound_action_script.cpp @@ -6,7 +6,7 @@ // Description : Script sound action class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_sound_action.h" diff --git a/src/xrGame/script_sound_info_script.cpp b/src/xrGame/script_sound_info_script.cpp index 2c7181475c..4fd640ac74 100644 --- a/src/xrGame/script_sound_info_script.cpp +++ b/src/xrGame/script_sound_info_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_sound_info.h" #include "script_game_object.h" diff --git a/src/xrGame/script_sound_script.cpp b/src/xrGame/script_sound_script.cpp index 555ba89b4f..1711eb073e 100644 --- a/src/xrGame/script_sound_script.cpp +++ b/src/xrGame/script_sound_script.cpp @@ -6,7 +6,7 @@ // Description : XRay Script sound class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_sound.h" #include "script_game_object.h" diff --git a/src/xrGame/script_watch_action.cpp b/src/xrGame/script_watch_action.cpp index f4688123ec..f5cbcb8bff 100644 --- a/src/xrGame/script_watch_action.cpp +++ b/src/xrGame/script_watch_action.cpp @@ -6,7 +6,7 @@ // Description : Script watch action class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "script_watch_action.h" #include "script_game_object.h" #include "sight_manager_space.h" diff --git a/src/xrGame/script_watch_action_script.cpp b/src/xrGame/script_watch_action_script.cpp index acd76fa77f..65277881a6 100644 --- a/src/xrGame/script_watch_action_script.cpp +++ b/src/xrGame/script_watch_action_script.cpp @@ -6,7 +6,7 @@ // Description : Script watch action class script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_watch_action.h" #include "script_game_object.h" diff --git a/src/xrGame/script_world_property_script.cpp b/src/xrGame/script_world_property_script.cpp index ec1eac7d56..8a7ddd2e78 100644 --- a/src/xrGame/script_world_property_script.cpp +++ b/src/xrGame/script_world_property_script.cpp @@ -6,7 +6,7 @@ // Description : Script world property script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_world_property.h" #include "operator_abstract.h" diff --git a/src/xrGame/script_world_state_script.cpp b/src/xrGame/script_world_state_script.cpp index 6de01c4d77..a16e264744 100644 --- a/src/xrGame/script_world_state_script.cpp +++ b/src/xrGame/script_world_state_script.cpp @@ -6,7 +6,7 @@ // Description : Script world state script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_world_state.h" #include "condition_state.h" diff --git a/src/xrGame/script_zone.cpp b/src/xrGame/script_zone.cpp index f5e82ac3c2..23bc7efeb7 100644 --- a/src/xrGame/script_zone.cpp +++ b/src/xrGame/script_zone.cpp @@ -6,7 +6,7 @@ // Description : Script zone object //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_zone.h" #include "script_game_object.h" diff --git a/src/xrGame/script_zone.h b/src/xrGame/script_zone.h index d5581727c3..27bb307788 100644 --- a/src/xrGame/script_zone.h +++ b/src/xrGame/script_zone.h @@ -9,7 +9,7 @@ #pragma once #include "space_restrictor.h" -#include "../xrEngine/feel_touch.h" +#include "../xrEngine/Feel_Touch.h" #include "../xrScripts/script_space_forward.h" #include "../xrScripts/script_export_space.h" diff --git a/src/xrGame/script_zone_script.cpp b/src/xrGame/script_zone_script.cpp index 33515c5b7c..87224a34ed 100644 --- a/src/xrGame/script_zone_script.cpp +++ b/src/xrGame/script_zone_script.cpp @@ -6,7 +6,7 @@ // Description : Script zone object script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_zone.h" #include "smart_zone.h" diff --git a/src/xrGame/searchlight.cpp b/src/xrGame/searchlight.cpp index 0f981c3b98..e9069ac733 100644 --- a/src/xrGame/searchlight.cpp +++ b/src/xrGame/searchlight.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "searchlight.h" #include "../xrEngine/LightAnimLibrary.h" #include "script_entity_action.h" diff --git a/src/xrGame/secure_messaging.cpp b/src/xrGame/secure_messaging.cpp index 268003a5d8..36bc75871e 100644 --- a/src/xrGame/secure_messaging.cpp +++ b/src/xrGame/secure_messaging.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "secure_messaging.h" namespace secure_messaging diff --git a/src/xrGame/seniority_hierarchy_holder.cpp b/src/xrGame/seniority_hierarchy_holder.cpp index 09ea16b95c..df51bd9ab3 100644 --- a/src/xrGame/seniority_hierarchy_holder.cpp +++ b/src/xrGame/seniority_hierarchy_holder.cpp @@ -6,7 +6,7 @@ // Description : Seniority hierarchy holder //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "seniority_hierarchy_holder.h" #include "team_hierarchy_holder.h" #include "object_broker.h" diff --git a/src/xrGame/server_entity_wrapper.cpp b/src/xrGame/server_entity_wrapper.cpp index eb7d14721a..ccbc5bb25a 100644 --- a/src/xrGame/server_entity_wrapper.cpp +++ b/src/xrGame/server_entity_wrapper.cpp @@ -6,7 +6,7 @@ // Description : Server entity wrapper //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "server_entity_wrapper.h" #include "xrServer_Objects.h" #include "xrMessages.h" diff --git a/src/xrGame/shootingObject_dump_impl.cpp b/src/xrGame/shootingObject_dump_impl.cpp index 27ee6e5f61..7b9c5253f9 100644 --- a/src/xrGame/shootingObject_dump_impl.cpp +++ b/src/xrGame/shootingObject_dump_impl.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "ShootingObject.h" #include "GameObject.h" diff --git a/src/xrGame/sight_action.cpp b/src/xrGame/sight_action.cpp index 5e604ddac5..6d6792ba43 100644 --- a/src/xrGame/sight_action.cpp +++ b/src/xrGame/sight_action.cpp @@ -6,7 +6,7 @@ // Description : Sight action //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "sight_action.h" #include "ai/stalker/ai_stalker.h" #include "sight_manager.h" diff --git a/src/xrGame/sight_manager.cpp b/src/xrGame/sight_manager.cpp index 31ca1d86a2..f949000eaf 100644 --- a/src/xrGame/sight_manager.cpp +++ b/src/xrGame/sight_manager.cpp @@ -6,7 +6,7 @@ // Description : Sight manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "sight_manager.h" #include "ai/stalker/ai_stalker.h" #include "stalker_movement_manager_smart_cover.h" diff --git a/src/xrGame/sight_manager_target.cpp b/src/xrGame/sight_manager_target.cpp index 394f1a03ef..41a07743bc 100644 --- a/src/xrGame/sight_manager_target.cpp +++ b/src/xrGame/sight_manager_target.cpp @@ -6,7 +6,7 @@ // Description : sight manager target functions //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "sight_manager.h" #include "ai/stalker/ai_stalker.h" #include "stalker_movement_manager_smart_cover.h" diff --git a/src/xrGame/silent_shots.cpp b/src/xrGame/silent_shots.cpp index 68be2b01e1..90bdd03a03 100644 --- a/src/xrGame/silent_shots.cpp +++ b/src/xrGame/silent_shots.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "silent_shots.h" #include "game_base.h" #include "game_state_accumulator.h" #include "Weapon.h" -#include "weaponknife.h" +#include "WeaponKnife.h" namespace award_system { diff --git a/src/xrGame/smart_cover.cpp b/src/xrGame/smart_cover.cpp index 495b3d47f3..851f53fd60 100644 --- a/src/xrGame/smart_cover.cpp +++ b/src/xrGame/smart_cover.cpp @@ -5,7 +5,7 @@ // Description : Smart cover class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover.h" #include "smart_cover_storage.h" diff --git a/src/xrGame/smart_cover_action.cpp b/src/xrGame/smart_cover_action.cpp index 1c1e1befda..b7ccb1aa73 100644 --- a/src/xrGame/smart_cover_action.cpp +++ b/src/xrGame/smart_cover_action.cpp @@ -5,7 +5,7 @@ // Description : Action class for smart cover //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover_action.h" #include "ai_monster_space.h" diff --git a/src/xrGame/smart_cover_animation_planner.cpp b/src/xrGame/smart_cover_animation_planner.cpp index 4eab6ec05d..f1fce4adb8 100644 --- a/src/xrGame/smart_cover_animation_planner.cpp +++ b/src/xrGame/smart_cover_animation_planner.cpp @@ -5,7 +5,7 @@ // Description : Smart cover planner class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover_animation_planner.h" #include "script_game_object.h" diff --git a/src/xrGame/smart_cover_animation_selector.cpp b/src/xrGame/smart_cover_animation_selector.cpp index 392dc4737d..105e1f1c6b 100644 --- a/src/xrGame/smart_cover_animation_selector.cpp +++ b/src/xrGame/smart_cover_animation_selector.cpp @@ -5,20 +5,20 @@ // Description : Animation selector for smart covers //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover_animation_selector.h" #include "ai/stalker/ai_stalker.h" #include "smart_cover_animation_planner.h" #include "smart_cover_planner_actions.h" #include "script_game_object.h" -#include "../include/xrrender/kinematicsanimated.h" +#include "../Include/xrRender/KinematicsAnimated.h" #include "stalker_animation_manager.h" #include "smart_cover_planner_actions.h" #include "stalker_movement_manager_smart_cover.h" #include "Inventory.h" #include "smart_cover.h" -#include "huditem.h" +#include "HudItem.h" float g_smart_cover_animation_speed_factor = 1.f; diff --git a/src/xrGame/smart_cover_animation_selector.h b/src/xrGame/smart_cover_animation_selector.h index 47cfdbc8c8..7b8a7bd971 100644 --- a/src/xrGame/smart_cover_animation_selector.h +++ b/src/xrGame/smart_cover_animation_selector.h @@ -9,7 +9,7 @@ #define SMART_COVER_ANIMATION_SELECTOR_H_INCLUDED #include "smart_cover_detail.h" -#include "../include/xrRender/KinematicsAnimated.h" +#include "../Include/xrRender/KinematicsAnimated.h" #include "smart_cover_animation_planner.h" class CAI_Stalker; diff --git a/src/xrGame/smart_cover_default_behaviour_planner.cpp b/src/xrGame/smart_cover_default_behaviour_planner.cpp index 9fd5a8bfbd..1fe1133378 100644 --- a/src/xrGame/smart_cover_default_behaviour_planner.cpp +++ b/src/xrGame/smart_cover_default_behaviour_planner.cpp @@ -5,7 +5,7 @@ // Description : Default behaviour planner for target selector //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover_default_behaviour_planner.hpp" #include "script_game_object.h" diff --git a/src/xrGame/smart_cover_description.cpp b/src/xrGame/smart_cover_description.cpp index 9ca66d753c..ec107ca237 100644 --- a/src/xrGame/smart_cover_description.cpp +++ b/src/xrGame/smart_cover_description.cpp @@ -5,7 +5,7 @@ // Description : Smart cover description class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover_description.h" #include "ai_space.h" diff --git a/src/xrGame/smart_cover_detail.cpp b/src/xrGame/smart_cover_detail.cpp index ca4641c090..f013389e08 100644 --- a/src/xrGame/smart_cover_detail.cpp +++ b/src/xrGame/smart_cover_detail.cpp @@ -5,7 +5,7 @@ // Description : detail namespace functions //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover_detail.h" diff --git a/src/xrGame/smart_cover_evaluators.cpp b/src/xrGame/smart_cover_evaluators.cpp index accdf73c81..fd6b60dced 100644 --- a/src/xrGame/smart_cover_evaluators.cpp +++ b/src/xrGame/smart_cover_evaluators.cpp @@ -5,7 +5,7 @@ // Description : Smart cover evaluators classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover_evaluators.h" #include "stalker_property_evaluators.h" diff --git a/src/xrGame/smart_cover_loophole.cpp b/src/xrGame/smart_cover_loophole.cpp index 32874f1e6d..fbfcc53d8e 100644 --- a/src/xrGame/smart_cover_loophole.cpp +++ b/src/xrGame/smart_cover_loophole.cpp @@ -5,7 +5,7 @@ // Description : Loophole class for smart cover //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover_loophole.h" #include "object_broker.h" diff --git a/src/xrGame/smart_cover_loophole_planner_actions.cpp b/src/xrGame/smart_cover_loophole_planner_actions.cpp index 9cab60555c..d9583b40bd 100644 --- a/src/xrGame/smart_cover_loophole_planner_actions.cpp +++ b/src/xrGame/smart_cover_loophole_planner_actions.cpp @@ -5,7 +5,7 @@ // Description : Smart cover loophole planner action classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover_loophole_planner_actions.h" #include "script_game_object.h" diff --git a/src/xrGame/smart_cover_object.cpp b/src/xrGame/smart_cover_object.cpp index db3d691035..31820b7c09 100644 --- a/src/xrGame/smart_cover_object.cpp +++ b/src/xrGame/smart_cover_object.cpp @@ -6,10 +6,10 @@ // Description : smart cover object class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover_object.h" -#include "../xrServerEntities/xrServer_Objects_ALife_Smartcovers.h" +#include "../xrServerEntities/xrServer_Objects_Alife_Smartcovers.h" #include "Level.h" #include "debug_renderer.h" #include "ai_space.h" @@ -18,7 +18,7 @@ #include "smart_cover.h" #include "smart_cover_description.h" #include "smart_cover_loophole.h" -#include "../xrengine/xr_collide_form.h" +#include "../xrEngine/xr_collide_form.h" void smart_cover::object::Load (LPCSTR section) { diff --git a/src/xrGame/smart_cover_object.h b/src/xrGame/smart_cover_object.h index 9f5167bbf7..b52e1c07e4 100644 --- a/src/xrGame/smart_cover_object.h +++ b/src/xrGame/smart_cover_object.h @@ -7,7 +7,7 @@ //////////////////////////////////////////////////////////////////////////// #pragma once -#include "gameobject.h" +#include "GameObject.h" #include "../xrScripts/script_export_space.h" namespace smart_cover { diff --git a/src/xrGame/smart_cover_object_script.cpp b/src/xrGame/smart_cover_object_script.cpp index 228a4c7f4f..95ddeb3592 100644 --- a/src/xrGame/smart_cover_object_script.cpp +++ b/src/xrGame/smart_cover_object_script.cpp @@ -6,7 +6,7 @@ // Description : smart cover script export //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover.h" diff --git a/src/xrGame/smart_cover_planner_actions.cpp b/src/xrGame/smart_cover_planner_actions.cpp index 6e4d132ed3..40704c9446 100644 --- a/src/xrGame/smart_cover_planner_actions.cpp +++ b/src/xrGame/smart_cover_planner_actions.cpp @@ -5,7 +5,7 @@ // Description : Smart cover planner action classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover_planner_actions.h" #include "script_game_object.h" diff --git a/src/xrGame/smart_cover_planner_target_provider.cpp b/src/xrGame/smart_cover_planner_target_provider.cpp index ad648ef679..34d63278c5 100644 --- a/src/xrGame/smart_cover_planner_target_provider.cpp +++ b/src/xrGame/smart_cover_planner_target_provider.cpp @@ -5,7 +5,7 @@ // Description : Target provider for target selector //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover_planner_target_provider.h" #include "script_game_object.h" diff --git a/src/xrGame/smart_cover_planner_target_selector.cpp b/src/xrGame/smart_cover_planner_target_selector.cpp index 4ffaee83fa..3ebb8b60de 100644 --- a/src/xrGame/smart_cover_planner_target_selector.cpp +++ b/src/xrGame/smart_cover_planner_target_selector.cpp @@ -5,7 +5,7 @@ // Description : Target selector for smart covers animation planner //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover_planner_target_selector.h" #include "smart_cover_animation_planner.h" diff --git a/src/xrGame/smart_cover_storage.cpp b/src/xrGame/smart_cover_storage.cpp index 8a8d5b550e..12f3145287 100644 --- a/src/xrGame/smart_cover_storage.cpp +++ b/src/xrGame/smart_cover_storage.cpp @@ -5,7 +5,7 @@ // Description : Smart cover storage class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover_storage.h" #include "smart_cover_description.h" diff --git a/src/xrGame/smart_cover_transition.cpp b/src/xrGame/smart_cover_transition.cpp index 57ecc2c9e8..1193b8edb5 100644 --- a/src/xrGame/smart_cover_transition.cpp +++ b/src/xrGame/smart_cover_transition.cpp @@ -5,7 +5,7 @@ // Description : Transition class for smart_cover //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover_transition.hpp" #include "smart_cover_transition_animation.hpp" diff --git a/src/xrGame/smart_cover_transition_animation.cpp b/src/xrGame/smart_cover_transition_animation.cpp index 358468fede..42e65644ad 100644 --- a/src/xrGame/smart_cover_transition_animation.cpp +++ b/src/xrGame/smart_cover_transition_animation.cpp @@ -5,7 +5,7 @@ // Description : Animation transition class for smart_cover //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "smart_cover_transition_animation.hpp" diff --git a/src/xrGame/sound_collection_storage.cpp b/src/xrGame/sound_collection_storage.cpp index 23125b8779..c5ead59b04 100644 --- a/src/xrGame/sound_collection_storage.cpp +++ b/src/xrGame/sound_collection_storage.cpp @@ -6,7 +6,7 @@ // Description : sound collection storage //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "sound_collection_storage.h" #include "object_broker.h" diff --git a/src/xrGame/sound_memory_manager.cpp b/src/xrGame/sound_memory_manager.cpp index 68a9f3f590..7b2c9ac889 100644 --- a/src/xrGame/sound_memory_manager.cpp +++ b/src/xrGame/sound_memory_manager.cpp @@ -6,7 +6,7 @@ // Description : Sound memory manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "sound_memory_manager.h" #include "memory_manager.h" @@ -14,7 +14,7 @@ #include "visual_memory_manager.h" #include "enemy_manager.h" #include "memory_space_impl.h" -#include "custommonster.h" +#include "CustomMonster.h" #include "ai_object_location.h" #include "level_graph.h" #include "sound_user_data_visitor.h" diff --git a/src/xrGame/sound_player.cpp b/src/xrGame/sound_player.cpp index f5f9bead42..c2d1f92b33 100644 --- a/src/xrGame/sound_player.cpp +++ b/src/xrGame/sound_player.cpp @@ -6,7 +6,7 @@ // Description : Sound player //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "sound_player.h" #include "../xrScripts/script_engine.h" #include "ai/stalker/ai_stalker_space.h" diff --git a/src/xrGame/space_restriction.cpp b/src/xrGame/space_restriction.cpp index 8bf5bb1af9..f51592a852 100644 --- a/src/xrGame/space_restriction.cpp +++ b/src/xrGame/space_restriction.cpp @@ -6,7 +6,7 @@ // Description : Space restriction //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "space_restriction.h" #include "space_restriction_manager.h" #include "ai_space.h" diff --git a/src/xrGame/space_restriction_base.cpp b/src/xrGame/space_restriction_base.cpp index c0e2aa0567..376356549c 100644 --- a/src/xrGame/space_restriction_base.cpp +++ b/src/xrGame/space_restriction_base.cpp @@ -6,7 +6,7 @@ // Description : Space restriction base //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "space_restriction_base.h" #include "ai_space.h" #include "level_graph.h" diff --git a/src/xrGame/space_restriction_bridge.cpp b/src/xrGame/space_restriction_bridge.cpp index d38501208b..9d0a685ccb 100644 --- a/src/xrGame/space_restriction_bridge.cpp +++ b/src/xrGame/space_restriction_bridge.cpp @@ -6,7 +6,7 @@ // Description : Space restriction bridge //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "space_restriction_bridge.h" #include "space_restriction_base.h" #include "ai_space.h" diff --git a/src/xrGame/space_restriction_composition.cpp b/src/xrGame/space_restriction_composition.cpp index 7f879b201f..9c59d5cff1 100644 --- a/src/xrGame/space_restriction_composition.cpp +++ b/src/xrGame/space_restriction_composition.cpp @@ -6,7 +6,7 @@ // Description : Space restriction composition //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "space_restriction_composition.h" #include "space_restriction_holder.h" #include "space_restriction_bridge.h" diff --git a/src/xrGame/space_restriction_holder.cpp b/src/xrGame/space_restriction_holder.cpp index b08ba69ac9..b289d0d4e5 100644 --- a/src/xrGame/space_restriction_holder.cpp +++ b/src/xrGame/space_restriction_holder.cpp @@ -6,7 +6,7 @@ // Description : Space restriction holder //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "space_restriction_holder.h" #include "object_broker.h" #include "space_restrictor.h" diff --git a/src/xrGame/space_restriction_manager.cpp b/src/xrGame/space_restriction_manager.cpp index 58ab89f688..423b7c3df5 100644 --- a/src/xrGame/space_restriction_manager.cpp +++ b/src/xrGame/space_restriction_manager.cpp @@ -6,7 +6,7 @@ // Description : Space restriction manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "space_restriction.h" #include "restriction_space.h" #include "space_restriction_manager.h" diff --git a/src/xrGame/space_restriction_shape.cpp b/src/xrGame/space_restriction_shape.cpp index 638cc5e51c..ad86ebf976 100644 --- a/src/xrGame/space_restriction_shape.cpp +++ b/src/xrGame/space_restriction_shape.cpp @@ -6,7 +6,7 @@ // Description : Space restriction shape //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "space_restriction_shape.h" #include "ai_space.h" #include "level_graph.h" diff --git a/src/xrGame/space_restrictor.cpp b/src/xrGame/space_restrictor.cpp index c537c08d45..faee26f8a7 100644 --- a/src/xrGame/space_restrictor.cpp +++ b/src/xrGame/space_restrictor.cpp @@ -6,7 +6,7 @@ // Description : Space restrictor //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "space_restrictor.h" #include "xrServer_Objects_ALife.h" @@ -15,7 +15,7 @@ #include "restriction_space.h" #include "ai_space.h" #include "CustomZone.h" -#include "../xrengine/xr_collide_form.h" +#include "../xrEngine/xr_collide_form.h" #ifdef DEBUG # include "debug_renderer.h" #endif diff --git a/src/xrGame/space_restrictor.h b/src/xrGame/space_restrictor.h index b686c7bd78..433549010a 100644 --- a/src/xrGame/space_restrictor.h +++ b/src/xrGame/space_restrictor.h @@ -8,7 +8,7 @@ #pragma once -#include "gameobject.h" +#include "GameObject.h" #include "restriction_space.h" #include "../xrScripts/script_export_space.h" diff --git a/src/xrGame/space_restrictor_script.cpp b/src/xrGame/space_restrictor_script.cpp index 5fe29ffc80..9177ddcf30 100644 --- a/src/xrGame/space_restrictor_script.cpp +++ b/src/xrGame/space_restrictor_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "space_restrictor.h" diff --git a/src/xrGame/spectator_camera_first_eye.cpp b/src/xrGame/spectator_camera_first_eye.cpp index 81ea536047..d8b471ce95 100644 --- a/src/xrGame/spectator_camera_first_eye.cpp +++ b/src/xrGame/spectator_camera_first_eye.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "spectator_camera_first_eye.h" #include "../xrEngine/xr_level_controller.h" #include "../xrEngine/xr_object.h" diff --git a/src/xrGame/spectator_camera_first_eye.h b/src/xrGame/spectator_camera_first_eye.h index d3b9bfce4f..5a4679f50d 100644 --- a/src/xrGame/spectator_camera_first_eye.h +++ b/src/xrGame/spectator_camera_first_eye.h @@ -1,7 +1,7 @@ #ifndef SPECTATOR_CAMERA_FIRST_EYE #define SPECTATOR_CAMERA_FIRST_EYE -#include "../xrcore/ftimer.h" +#include "../xrCore/FTimer.h" #include "CameraFirstEye.h" class CSpectrCameraFirstEye : public CCameraFirstEye diff --git a/src/xrGame/sprinter_stopper.cpp b/src/xrGame/sprinter_stopper.cpp index 166f62eec5..12ca526d88 100644 --- a/src/xrGame/sprinter_stopper.cpp +++ b/src/xrGame/sprinter_stopper.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "sprinter_stopper.h" #include "game_state_accumulator.h" #include "game_cl_base.h" diff --git a/src/xrGame/squad_hierarchy_holder.cpp b/src/xrGame/squad_hierarchy_holder.cpp index b509809cea..7647977268 100644 --- a/src/xrGame/squad_hierarchy_holder.cpp +++ b/src/xrGame/squad_hierarchy_holder.cpp @@ -6,7 +6,7 @@ // Description : Squad hierarchy holder //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "squad_hierarchy_holder.h" #include "group_hierarchy_holder.h" #include "object_broker.h" diff --git a/src/xrGame/stalker_alife_actions.cpp b/src/xrGame/stalker_alife_actions.cpp index ef133e2323..96e211f728 100644 --- a/src/xrGame/stalker_alife_actions.cpp +++ b/src/xrGame/stalker_alife_actions.cpp @@ -6,14 +6,14 @@ // Description : Stalker alife action classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_alife_actions.h" #include "ai/stalker/ai_stalker.h" #include "inventory_item.h" #include "script_game_object.h" #include "Inventory.h" -#include "weaponmagazined.h" +#include "WeaponMagazined.h" #include "movement_manager_space.h" #include "detail_path_manager_space.h" #include "memory_manager.h" diff --git a/src/xrGame/stalker_alife_planner.cpp b/src/xrGame/stalker_alife_planner.cpp index 1b85235c53..c5b6369873 100644 --- a/src/xrGame/stalker_alife_planner.cpp +++ b/src/xrGame/stalker_alife_planner.cpp @@ -6,7 +6,7 @@ // Description : Stalker ALife planner //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_alife_planner.h" #include "stalker_alife_actions.h" #include "stalker_alife_task_actions.h" diff --git a/src/xrGame/stalker_alife_task_actions.cpp b/src/xrGame/stalker_alife_task_actions.cpp index 3d94f72302..c27d382a8e 100644 --- a/src/xrGame/stalker_alife_task_actions.cpp +++ b/src/xrGame/stalker_alife_task_actions.cpp @@ -6,7 +6,7 @@ // Description : Stalker alife task action classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_alife_task_actions.h" #include "ai/stalker/ai_stalker.h" #include "ai/trader/ai_trader.h" @@ -32,7 +32,7 @@ #include "alife_human_brain.h" #include "alife_smart_terrain_task.h" -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "patrol_path_manager.h" diff --git a/src/xrGame/stalker_animation_callbacks.cpp b/src/xrGame/stalker_animation_callbacks.cpp index 805fc76608..ba47914c02 100644 --- a/src/xrGame/stalker_animation_callbacks.cpp +++ b/src/xrGame/stalker_animation_callbacks.cpp @@ -6,13 +6,13 @@ // Description : Stalker animation manager : bone callbacks //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_animation_manager.h" #include "ai/stalker/ai_stalker.h" #include "sight_manager.h" #include "stalker_movement_manager_smart_cover.h" #include "game_object_space.h" -#include "effectorshot.h" +#include "EffectorShot.h" typedef CStalkerAnimationManager::callback_params callback_params; diff --git a/src/xrGame/stalker_animation_data.cpp b/src/xrGame/stalker_animation_data.cpp index 2b4ffdf3fa..9c2a944e5e 100644 --- a/src/xrGame/stalker_animation_data.cpp +++ b/src/xrGame/stalker_animation_data.cpp @@ -6,7 +6,7 @@ // Description : Stalker animation data //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_animation_data.h" CStalkerAnimationData::CStalkerAnimationData (IKinematicsAnimated *skeleton_animated) diff --git a/src/xrGame/stalker_animation_data_storage.cpp b/src/xrGame/stalker_animation_data_storage.cpp index ad93603951..9ba65afb6d 100644 --- a/src/xrGame/stalker_animation_data_storage.cpp +++ b/src/xrGame/stalker_animation_data_storage.cpp @@ -6,7 +6,7 @@ // Description : Stalker animation data storage //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_animation_data_storage.h" #include "stalker_animation_data.h" #include "object_broker.h" diff --git a/src/xrGame/stalker_animation_global.cpp b/src/xrGame/stalker_animation_global.cpp index 2582604503..dde50b4322 100644 --- a/src/xrGame/stalker_animation_global.cpp +++ b/src/xrGame/stalker_animation_global.cpp @@ -6,17 +6,17 @@ // Description : Stalker animation manager : global animations //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_animation_manager.h" #include "ai/stalker/ai_stalker.h" #include "Inventory.h" -#include "fooditem.h" +#include "FoodItem.h" #include "property_storage.h" #include "stalker_movement_manager_smart_cover.h" #include "ai/stalker/ai_stalker_space.h" #include "stalker_animation_data.h" #include "Weapon.h" -#include "missile.h" +#include "Missile.h" #include "stalker_animation_manager_impl.h" using namespace StalkerSpace; diff --git a/src/xrGame/stalker_animation_head.cpp b/src/xrGame/stalker_animation_head.cpp index 9995f30284..bd28731213 100644 --- a/src/xrGame/stalker_animation_head.cpp +++ b/src/xrGame/stalker_animation_head.cpp @@ -6,14 +6,14 @@ // Description : Stalker animation manager : head animations //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_animation_manager.h" #include "ai/stalker/ai_stalker.h" #include "ai/stalker/ai_stalker_space.h" #include "sound_player.h" #include "stalker_animation_data.h" -#include "uigamesp.h" -#include "ui/uitalkwnd.h" +#include "UIGameSP.h" +#include "ui/UITalkWnd.h" void CStalkerAnimationManager::head_play_callback (CBlend *blend) { diff --git a/src/xrGame/stalker_animation_legs.cpp b/src/xrGame/stalker_animation_legs.cpp index 687f9e9d25..8c38f90363 100644 --- a/src/xrGame/stalker_animation_legs.cpp +++ b/src/xrGame/stalker_animation_legs.cpp @@ -6,7 +6,7 @@ // Description : Stalker animation manager : legs animations //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_animation_manager.h" #include "ai/stalker/ai_stalker.h" #include "sight_manager.h" @@ -14,7 +14,7 @@ #include "stalker_animation_data.h" #include "Weapon.h" -#include "missile.h" +#include "Missile.h" #include "Inventory.h" #include "stalker_animation_manager_impl.h" diff --git a/src/xrGame/stalker_animation_manager.cpp b/src/xrGame/stalker_animation_manager.cpp index dfd601e85f..4ae272d44c 100644 --- a/src/xrGame/stalker_animation_manager.cpp +++ b/src/xrGame/stalker_animation_manager.cpp @@ -6,7 +6,7 @@ // Description : Stalker animation manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_animation_manager.h" #include "ai/stalker/ai_stalker.h" #include "stalker_animation_data_storage.h" diff --git a/src/xrGame/stalker_animation_manager_debug.cpp b/src/xrGame/stalker_animation_manager_debug.cpp index 26a8f60004..c18c740922 100644 --- a/src/xrGame/stalker_animation_manager_debug.cpp +++ b/src/xrGame/stalker_animation_manager_debug.cpp @@ -6,7 +6,7 @@ // Description : Stalker animation manager debug functions //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #ifdef DEBUG # include "stalker_animation_manager.h" diff --git a/src/xrGame/stalker_animation_manager_update.cpp b/src/xrGame/stalker_animation_manager_update.cpp index 8a96320270..e132dbbfe7 100644 --- a/src/xrGame/stalker_animation_manager_update.cpp +++ b/src/xrGame/stalker_animation_manager_update.cpp @@ -6,7 +6,7 @@ // Description : Stalker animation manager update cycle //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_animation_manager.h" #include "ai/stalker/ai_stalker.h" diff --git a/src/xrGame/stalker_animation_names.cpp b/src/xrGame/stalker_animation_names.cpp index 73a26cb2e6..43b2c674ca 100644 --- a/src/xrGame/stalker_animation_names.cpp +++ b/src/xrGame/stalker_animation_names.cpp @@ -6,7 +6,7 @@ // Description : Stalker animation names //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_animation_names.h" LPCSTR state_names [] = { diff --git a/src/xrGame/stalker_animation_offsets.cpp b/src/xrGame/stalker_animation_offsets.cpp index 54db8f123d..e4652551b4 100644 --- a/src/xrGame/stalker_animation_offsets.cpp +++ b/src/xrGame/stalker_animation_offsets.cpp @@ -5,7 +5,7 @@ // Description : Animation offsets class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_animation_offsets.hpp" SRotation const animation_offsets::offsets (shared_str const &animation_id) const diff --git a/src/xrGame/stalker_animation_pair.cpp b/src/xrGame/stalker_animation_pair.cpp index 1239ed4d86..e067440ab7 100644 --- a/src/xrGame/stalker_animation_pair.cpp +++ b/src/xrGame/stalker_animation_pair.cpp @@ -6,7 +6,7 @@ // Description : Stalker animation pair //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_animation_pair.h" #include "stalker_animation_manager.h" #include "../xrEngine/motion.h" @@ -15,7 +15,7 @@ #include "ai/ai_monsters_anims.h" #include "animation_movement_controller.h" #ifdef DEBUG -#include "phdebug.h" +#include "PHDebug.h" #endif #pragma warning(push) #pragma warning(disable:4995) diff --git a/src/xrGame/stalker_animation_script.cpp b/src/xrGame/stalker_animation_script.cpp index c90d92f39e..f34a86a00a 100644 --- a/src/xrGame/stalker_animation_script.cpp +++ b/src/xrGame/stalker_animation_script.cpp @@ -6,7 +6,7 @@ // Description : Stalker animation manager : script animations //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_animation_manager.h" #include "ai/stalker/ai_stalker.h" diff --git a/src/xrGame/stalker_animation_state.cpp b/src/xrGame/stalker_animation_state.cpp index d5a113fcee..d2a492a620 100644 --- a/src/xrGame/stalker_animation_state.cpp +++ b/src/xrGame/stalker_animation_state.cpp @@ -6,7 +6,7 @@ // Description : Stalker state animations //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_animation_state.h" #include "object_broker.h" #include "../Include/xrRender/Kinematics.h" diff --git a/src/xrGame/stalker_animation_torso.cpp b/src/xrGame/stalker_animation_torso.cpp index c75a32e1ee..177a1ca0dd 100644 --- a/src/xrGame/stalker_animation_torso.cpp +++ b/src/xrGame/stalker_animation_torso.cpp @@ -6,16 +6,16 @@ // Description : Torso animations for monster "Stalker" //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_animation_manager.h" #include "ai/stalker/ai_stalker.h" #include "Inventory.h" #include "Weapon.h" -#include "missile.h" +#include "Missile.h" #include "object_handler_space.h" #include "object_handler_planner.h" #include "stalker_movement_manager_smart_cover.h" -#include "entitycondition.h" +#include "EntityCondition.h" #include "stalker_animation_data.h" #include "stalker_animation_manager_impl.h" diff --git a/src/xrGame/stalker_anomaly_actions.cpp b/src/xrGame/stalker_anomaly_actions.cpp index 06bdf5ad0c..fb15d5997a 100644 --- a/src/xrGame/stalker_anomaly_actions.cpp +++ b/src/xrGame/stalker_anomaly_actions.cpp @@ -6,7 +6,7 @@ // Description : Stalker anomaly action classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_anomaly_actions.h" #include "ai/stalker/ai_stalker.h" @@ -26,7 +26,7 @@ #include "stalker_movement_manager_smart_cover.h" #include "sound_player.h" #include "ai/stalker/ai_stalker_space.h" -#include "radioactivezone.h" +#include "RadioactiveZone.h" #include "alife_simulator.h" #include "alife_object_registry.h" #include "../xrServerEntities/xrServer_Objects_ALife_Monsters.h" diff --git a/src/xrGame/stalker_anomaly_planner.cpp b/src/xrGame/stalker_anomaly_planner.cpp index 5a393e4658..98b1141fcd 100644 --- a/src/xrGame/stalker_anomaly_planner.cpp +++ b/src/xrGame/stalker_anomaly_planner.cpp @@ -6,7 +6,7 @@ // Description : Stalker anomaly planner //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_anomaly_planner.h" #include "stalker_anomaly_actions.h" #include "stalker_decision_space.h" diff --git a/src/xrGame/stalker_base_action.cpp b/src/xrGame/stalker_base_action.cpp index a4a4e3548f..2fb5b854c7 100644 --- a/src/xrGame/stalker_base_action.cpp +++ b/src/xrGame/stalker_base_action.cpp @@ -6,7 +6,7 @@ // Description : Stalker base action //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_base_action.h" #include "ai/stalker/ai_stalker.h" #include "script_game_object.h" diff --git a/src/xrGame/stalker_combat_action_base.cpp b/src/xrGame/stalker_combat_action_base.cpp index bd9833427f..a20a6e9be6 100644 --- a/src/xrGame/stalker_combat_action_base.cpp +++ b/src/xrGame/stalker_combat_action_base.cpp @@ -6,7 +6,7 @@ // Description : Stalker base combat action //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_combat_action_base.h" #include "ai/stalker/ai_stalker.h" diff --git a/src/xrGame/stalker_combat_actions.cpp b/src/xrGame/stalker_combat_actions.cpp index c783f5c73b..268152c705 100644 --- a/src/xrGame/stalker_combat_actions.cpp +++ b/src/xrGame/stalker_combat_actions.cpp @@ -6,7 +6,7 @@ // Description : Stalker combat action classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_combat_actions.h" #include "ai/stalker/ai_stalker.h" @@ -16,7 +16,7 @@ #include "cover_evaluators.h" #include "cover_point.h" #include "cover_manager.h" -#include "missile.h" +#include "Missile.h" #include "stalker_movement_restriction.h" #include "movement_manager_space.h" #include "detail_path_manager_space.h" @@ -35,7 +35,7 @@ #include "Weapon.h" #include "danger_manager.h" #include "detail_path_manager.h" -#include "weaponmagazined.h" +#include "WeaponMagazined.h" #include "stalker_animation_manager.h" #include "hit_memory_manager.h" #include "level_path_manager.h" diff --git a/src/xrGame/stalker_combat_planner.cpp b/src/xrGame/stalker_combat_planner.cpp index 35f49b2a61..127d5d5831 100644 --- a/src/xrGame/stalker_combat_planner.cpp +++ b/src/xrGame/stalker_combat_planner.cpp @@ -6,7 +6,7 @@ // Description : Stalker combat planner //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_combat_planner.h" #include "stalker_combat_actions.h" @@ -25,8 +25,8 @@ #include "enemy_manager.h" #include "danger_manager.h" #include "sound_player.h" -#include "missile.h" -#include "explosive.h" +#include "Missile.h" +#include "Explosive.h" #include "agent_manager.h" #include "agent_member_manager.h" #include "member_order.h" @@ -39,7 +39,7 @@ #include "stalker_search_planner.h" #include "smart_cover_evaluators.h" #include "Inventory.h" -#include "weaponmagazined.h" +#include "WeaponMagazined.h" using namespace StalkerSpace; using namespace StalkerDecisionSpace; diff --git a/src/xrGame/stalker_danger_by_sound_actions.cpp b/src/xrGame/stalker_danger_by_sound_actions.cpp index 7243fe72fb..5b6a781f06 100644 --- a/src/xrGame/stalker_danger_by_sound_actions.cpp +++ b/src/xrGame/stalker_danger_by_sound_actions.cpp @@ -6,7 +6,7 @@ // Description : Stalker danger by sound actions classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_danger_by_sound_actions.h" #include "ai/stalker/ai_stalker.h" #include "script_game_object.h" diff --git a/src/xrGame/stalker_danger_by_sound_planner.cpp b/src/xrGame/stalker_danger_by_sound_planner.cpp index f614ada4b9..bca65e4f17 100644 --- a/src/xrGame/stalker_danger_by_sound_planner.cpp +++ b/src/xrGame/stalker_danger_by_sound_planner.cpp @@ -6,7 +6,7 @@ // Description : Stalker danger by sound planner class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_danger_by_sound_planner.h" #include "ai/stalker/ai_stalker.h" #include "script_game_object.h" diff --git a/src/xrGame/stalker_danger_grenade_actions.cpp b/src/xrGame/stalker_danger_grenade_actions.cpp index b0b207da68..d15b185f4d 100644 --- a/src/xrGame/stalker_danger_grenade_actions.cpp +++ b/src/xrGame/stalker_danger_grenade_actions.cpp @@ -6,7 +6,7 @@ // Description : Stalker danger grenade actions classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_danger_grenade_actions.h" #include "ai/stalker/ai_stalker.h" #include "script_game_object.h" diff --git a/src/xrGame/stalker_danger_grenade_planner.cpp b/src/xrGame/stalker_danger_grenade_planner.cpp index 579bb7a840..3788ce0041 100644 --- a/src/xrGame/stalker_danger_grenade_planner.cpp +++ b/src/xrGame/stalker_danger_grenade_planner.cpp @@ -6,7 +6,7 @@ // Description : Stalker danger grenade planner class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_danger_grenade_planner.h" #include "ai/stalker/ai_stalker.h" #include "script_game_object.h" diff --git a/src/xrGame/stalker_danger_in_direction_actions.cpp b/src/xrGame/stalker_danger_in_direction_actions.cpp index 7c6006ce1b..d8a2ce6b4a 100644 --- a/src/xrGame/stalker_danger_in_direction_actions.cpp +++ b/src/xrGame/stalker_danger_in_direction_actions.cpp @@ -6,7 +6,7 @@ // Description : Stalker danger in direction actions classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_danger_in_direction_actions.h" #include "ai/stalker/ai_stalker.h" #include "script_game_object.h" diff --git a/src/xrGame/stalker_danger_in_direction_planner.cpp b/src/xrGame/stalker_danger_in_direction_planner.cpp index 04a1efbdc8..b43c1a0994 100644 --- a/src/xrGame/stalker_danger_in_direction_planner.cpp +++ b/src/xrGame/stalker_danger_in_direction_planner.cpp @@ -6,7 +6,7 @@ // Description : Stalker danger in direction planner class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_danger_in_direction_planner.h" #include "ai/stalker/ai_stalker.h" #include "script_game_object.h" diff --git a/src/xrGame/stalker_danger_planner.cpp b/src/xrGame/stalker_danger_planner.cpp index ce33e027b2..badbbc7f92 100644 --- a/src/xrGame/stalker_danger_planner.cpp +++ b/src/xrGame/stalker_danger_planner.cpp @@ -6,7 +6,7 @@ // Description : Stalker danger planner //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_danger_planner.h" #include "ai/stalker/ai_stalker.h" diff --git a/src/xrGame/stalker_danger_property_evaluators.cpp b/src/xrGame/stalker_danger_property_evaluators.cpp index 20de81bdd7..40f112a9d5 100644 --- a/src/xrGame/stalker_danger_property_evaluators.cpp +++ b/src/xrGame/stalker_danger_property_evaluators.cpp @@ -6,7 +6,7 @@ // Description : Stalker danger property evaluators classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_danger_property_evaluators.h" #include "ai/stalker/ai_stalker.h" diff --git a/src/xrGame/stalker_danger_unknown_actions.cpp b/src/xrGame/stalker_danger_unknown_actions.cpp index e55977719a..54f330cf0f 100644 --- a/src/xrGame/stalker_danger_unknown_actions.cpp +++ b/src/xrGame/stalker_danger_unknown_actions.cpp @@ -6,7 +6,7 @@ // Description : Stalker danger unknown actions classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_danger_unknown_actions.h" #include "ai/stalker/ai_stalker.h" #include "script_game_object.h" diff --git a/src/xrGame/stalker_danger_unknown_planner.cpp b/src/xrGame/stalker_danger_unknown_planner.cpp index 4b86a60a81..1afd6f181b 100644 --- a/src/xrGame/stalker_danger_unknown_planner.cpp +++ b/src/xrGame/stalker_danger_unknown_planner.cpp @@ -6,7 +6,7 @@ // Description : Stalker danger unknown planner class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_danger_unknown_planner.h" #include "ai/stalker/ai_stalker.h" #include "ai/stalker/ai_stalker_space.h" diff --git a/src/xrGame/stalker_death_actions.cpp b/src/xrGame/stalker_death_actions.cpp index 9586bc6c74..8f4a12702c 100644 --- a/src/xrGame/stalker_death_actions.cpp +++ b/src/xrGame/stalker_death_actions.cpp @@ -6,7 +6,7 @@ // Description : Stalker death action classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_death_actions.h" #include "ai/stalker/ai_stalker.h" #include "stalker_decision_space.h" @@ -18,8 +18,8 @@ #include "Weapon.h" #include "../xrEngine/xr_level_controller.h" #include "clsid_game.h" -#include "characterphysicssupport.h" -#include "weaponmagazined.h" +#include "CharacterPhysicsSupport.h" +#include "WeaponMagazined.h" using namespace StalkerDecisionSpace; diff --git a/src/xrGame/stalker_death_planner.cpp b/src/xrGame/stalker_death_planner.cpp index 042b035afd..65330ae992 100644 --- a/src/xrGame/stalker_death_planner.cpp +++ b/src/xrGame/stalker_death_planner.cpp @@ -6,7 +6,7 @@ // Description : Stalker death planner //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_death_planner.h" #include "stalker_death_actions.h" #include "stalker_decision_space.h" diff --git a/src/xrGame/stalker_flair.cpp b/src/xrGame/stalker_flair.cpp index 6e2724694f..bb2b409251 100644 --- a/src/xrGame/stalker_flair.cpp +++ b/src/xrGame/stalker_flair.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_cl_base.h" #include "stalker_flair.h" #include "game_state_accumulator.h" diff --git a/src/xrGame/stalker_get_distance_actions.cpp b/src/xrGame/stalker_get_distance_actions.cpp index 921c9c572c..16d771f758 100644 --- a/src/xrGame/stalker_get_distance_actions.cpp +++ b/src/xrGame/stalker_get_distance_actions.cpp @@ -6,7 +6,7 @@ // Description : Stalker get distance action classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_get_distance_actions.h" #include "ai/stalker/ai_stalker.h" diff --git a/src/xrGame/stalker_get_distance_planner.cpp b/src/xrGame/stalker_get_distance_planner.cpp index fb96c43cc2..42de140dd8 100644 --- a/src/xrGame/stalker_get_distance_planner.cpp +++ b/src/xrGame/stalker_get_distance_planner.cpp @@ -6,7 +6,7 @@ // Description : Stalker get distance planner //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_get_distance_planner.h" #include "ai/stalker/ai_stalker_space.h" diff --git a/src/xrGame/stalker_kill_wounded_actions.cpp b/src/xrGame/stalker_kill_wounded_actions.cpp index 5b17d65087..41228ad82a 100644 --- a/src/xrGame/stalker_kill_wounded_actions.cpp +++ b/src/xrGame/stalker_kill_wounded_actions.cpp @@ -6,12 +6,12 @@ // Description : Stalker kill wounded action classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_kill_wounded_actions.h" #include "ai/stalker/ai_stalker.h" #include "Inventory.h" -#include "weaponmagazined.h" +#include "WeaponMagazined.h" #include "stalker_movement_manager_smart_cover.h" #include "movement_manager_space.h" #include "detail_path_manager_space.h" diff --git a/src/xrGame/stalker_kill_wounded_planner.cpp b/src/xrGame/stalker_kill_wounded_planner.cpp index 6bfb5ee997..5ccad00a1d 100644 --- a/src/xrGame/stalker_kill_wounded_planner.cpp +++ b/src/xrGame/stalker_kill_wounded_planner.cpp @@ -6,7 +6,7 @@ // Description : Stalker kill wounded planner //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_kill_wounded_planner.h" #include "stalker_kill_wounded_actions.h" diff --git a/src/xrGame/stalker_low_cover_actions.cpp b/src/xrGame/stalker_low_cover_actions.cpp index 26e65ae4d8..de57f80dc6 100644 --- a/src/xrGame/stalker_low_cover_actions.cpp +++ b/src/xrGame/stalker_low_cover_actions.cpp @@ -6,7 +6,7 @@ // Description : Stalker low cover actions //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_low_cover_actions.h" #include "ai/stalker/ai_stalker.h" diff --git a/src/xrGame/stalker_low_cover_planner.cpp b/src/xrGame/stalker_low_cover_planner.cpp index dca5e3059f..0d33caf1bc 100644 --- a/src/xrGame/stalker_low_cover_planner.cpp +++ b/src/xrGame/stalker_low_cover_planner.cpp @@ -6,7 +6,7 @@ // Description : Stalker low cover planner //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_low_cover_planner.h" #include "script_game_object.h" diff --git a/src/xrGame/stalker_movement_manager_base.cpp b/src/xrGame/stalker_movement_manager_base.cpp index 6ca8bdd310..398103c7dd 100644 --- a/src/xrGame/stalker_movement_manager_base.cpp +++ b/src/xrGame/stalker_movement_manager_base.cpp @@ -6,7 +6,7 @@ // Description : stalker movement manager base class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_movement_manager_base.h" #include "stalker_movement_manager_space.h" #include "script_entity_action.h" @@ -17,7 +17,7 @@ #include "level_path_manager.h" #include "movement_manager_space.h" #include "detail_path_manager_space.h" -#include "entitycondition.h" +#include "EntityCondition.h" #include "ai_object_location.h" #include "stalker_velocity_holder.h" #include "stalker_velocity_collection.h" diff --git a/src/xrGame/stalker_movement_manager_obstacles.cpp b/src/xrGame/stalker_movement_manager_obstacles.cpp index 51e480af5a..35596bdef3 100644 --- a/src/xrGame/stalker_movement_manager_obstacles.cpp +++ b/src/xrGame/stalker_movement_manager_obstacles.cpp @@ -6,7 +6,7 @@ // Description : Stalker movement manager: dynamic obstacles avoidance //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_movement_manager_obstacles.h" #include "stalker_movement_manager_space.h" #include "ai_space.h" diff --git a/src/xrGame/stalker_movement_manager_obstacles_path.cpp b/src/xrGame/stalker_movement_manager_obstacles_path.cpp index d053f5084f..25f0d5ea59 100644 --- a/src/xrGame/stalker_movement_manager_obstacles_path.cpp +++ b/src/xrGame/stalker_movement_manager_obstacles_path.cpp @@ -6,7 +6,7 @@ // Description : Stalker movement manager: dynamic obstacles avoidance: build path //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_movement_manager_obstacles.h" #include "stalker_movement_manager_space.h" #include "ai_space.h" diff --git a/src/xrGame/stalker_movement_manager_smart_cover.cpp b/src/xrGame/stalker_movement_manager_smart_cover.cpp index 9380d3e1d0..6da7b80e34 100644 --- a/src/xrGame/stalker_movement_manager_smart_cover.cpp +++ b/src/xrGame/stalker_movement_manager_smart_cover.cpp @@ -6,7 +6,7 @@ // Description : stalker movement manager class with smart covers //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_movement_manager_smart_cover.h" #include "movement_manager_space.h" diff --git a/src/xrGame/stalker_movement_manager_smart_cover.h b/src/xrGame/stalker_movement_manager_smart_cover.h index 39a85d187a..573e460378 100644 --- a/src/xrGame/stalker_movement_manager_smart_cover.h +++ b/src/xrGame/stalker_movement_manager_smart_cover.h @@ -10,7 +10,7 @@ #define STALKER_MOVEMENT_MANAGER_SMART_COVER_H_INCLUDED #include "stalker_movement_manager_obstacles.h" -#include "../include/xrrender/animation_motion.h" +#include "../Include/xrRender/animation_motion.h" class CCoverPoint; class CPropertyStorage; diff --git a/src/xrGame/stalker_movement_manager_smart_cover_fov_range.cpp b/src/xrGame/stalker_movement_manager_smart_cover_fov_range.cpp index 90130b4bfd..cc6c33371e 100644 --- a/src/xrGame/stalker_movement_manager_smart_cover_fov_range.cpp +++ b/src/xrGame/stalker_movement_manager_smart_cover_fov_range.cpp @@ -6,7 +6,7 @@ // Description : stalker movement manager class with smart covers fov and range stuff //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_movement_manager_smart_cover.h" #include "ai/stalker/ai_stalker.h" diff --git a/src/xrGame/stalker_movement_manager_smart_cover_loopholes.cpp b/src/xrGame/stalker_movement_manager_smart_cover_loopholes.cpp index 8467e07073..2d65c662ff 100644 --- a/src/xrGame/stalker_movement_manager_smart_cover_loopholes.cpp +++ b/src/xrGame/stalker_movement_manager_smart_cover_loopholes.cpp @@ -6,7 +6,7 @@ // Description : stalker movement manager class with smart covers loopholes stuff //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_movement_manager_smart_cover.h" #include "smart_cover_loophole.h" diff --git a/src/xrGame/stalker_movement_params.cpp b/src/xrGame/stalker_movement_params.cpp index 297da79682..51ce0bdcc5 100644 --- a/src/xrGame/stalker_movement_params.cpp +++ b/src/xrGame/stalker_movement_params.cpp @@ -6,7 +6,7 @@ // Description : Stalker movement parameters class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_movement_params.h" #include "ai_monster_space.h" #include "movement_manager_space.h" diff --git a/src/xrGame/stalker_planner.cpp b/src/xrGame/stalker_planner.cpp index f2f5c4a540..24eac96354 100644 --- a/src/xrGame/stalker_planner.cpp +++ b/src/xrGame/stalker_planner.cpp @@ -6,7 +6,7 @@ // Description : Stalker motivation action manager class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_planner.h" #include "stalker_property_evaluators.h" #include "stalker_danger_property_evaluators.h" diff --git a/src/xrGame/stalker_property_evaluators.cpp b/src/xrGame/stalker_property_evaluators.cpp index 0df8993c0c..2329988df6 100644 --- a/src/xrGame/stalker_property_evaluators.cpp +++ b/src/xrGame/stalker_property_evaluators.cpp @@ -6,7 +6,7 @@ // Description : Stalker property evaluators classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_property_evaluators.h" #include "ai/stalker/ai_stalker.h" diff --git a/src/xrGame/stalker_search_actions.cpp b/src/xrGame/stalker_search_actions.cpp index daf8663c69..94fdc62205 100644 --- a/src/xrGame/stalker_search_actions.cpp +++ b/src/xrGame/stalker_search_actions.cpp @@ -6,7 +6,7 @@ // Description : stalker search enemy action classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_search_actions.h" #include "ai/stalker/ai_stalker.h" diff --git a/src/xrGame/stalker_search_planner.cpp b/src/xrGame/stalker_search_planner.cpp index a5db92561e..907b61c351 100644 --- a/src/xrGame/stalker_search_planner.cpp +++ b/src/xrGame/stalker_search_planner.cpp @@ -6,7 +6,7 @@ // Description : Stalker search planner class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_search_planner.h" #include "ai/stalker/ai_stalker.h" #include "stalker_decision_space.h" diff --git a/src/xrGame/stalker_sound_data.cpp b/src/xrGame/stalker_sound_data.cpp index acb6469118..489f7a9922 100644 --- a/src/xrGame/stalker_sound_data.cpp +++ b/src/xrGame/stalker_sound_data.cpp @@ -6,7 +6,7 @@ // Description : Stalker sound data //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_sound_data.h" #include "sound_user_data_visitor.h" #include "ai/stalker/ai_stalker.h" diff --git a/src/xrGame/stalker_sound_data_visitor.cpp b/src/xrGame/stalker_sound_data_visitor.cpp index eedc557ba6..d9e6ef1ec4 100644 --- a/src/xrGame/stalker_sound_data_visitor.cpp +++ b/src/xrGame/stalker_sound_data_visitor.cpp @@ -6,7 +6,7 @@ // Description : Stalker sound data visitor //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "stalker_sound_data_visitor.h" #include "ai/stalker/ai_stalker.h" diff --git a/src/xrGame/stalker_velocity_collection.cpp b/src/xrGame/stalker_velocity_collection.cpp index 9532100c64..aba16e702b 100644 --- a/src/xrGame/stalker_velocity_collection.cpp +++ b/src/xrGame/stalker_velocity_collection.cpp @@ -6,7 +6,7 @@ // Description : Stalker velocity collection //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_velocity_collection.h" using namespace MonsterSpace; diff --git a/src/xrGame/stalker_velocity_holder.cpp b/src/xrGame/stalker_velocity_holder.cpp index 89df673973..4fee43fc1e 100644 --- a/src/xrGame/stalker_velocity_holder.cpp +++ b/src/xrGame/stalker_velocity_holder.cpp @@ -6,7 +6,7 @@ // Description : Stalker velocity holder inline functions //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "stalker_velocity_holder.h" #include "object_broker.h" #include "stalker_velocity_collection.h" diff --git a/src/xrGame/state_arguments_functions.cpp b/src/xrGame/state_arguments_functions.cpp index 000937cb66..f81f39c7ec 100644 --- a/src/xrGame/state_arguments_functions.cpp +++ b/src/xrGame/state_arguments_functions.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "state_arguments_functions.h" namespace award_system diff --git a/src/xrGame/static_obstacles_avoider.cpp b/src/xrGame/static_obstacles_avoider.cpp index 4eabaf71df..459492ec26 100644 --- a/src/xrGame/static_obstacles_avoider.cpp +++ b/src/xrGame/static_obstacles_avoider.cpp @@ -6,7 +6,7 @@ // Description : obstacles avoider //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "static_obstacles_avoider.h" #include "ai_space.h" #include "moving_objects.h" diff --git a/src/xrGame/stats_submitter.cpp b/src/xrGame/stats_submitter.cpp index 3fbd034689..2ebcc3039e 100644 --- a/src/xrGame/stats_submitter.cpp +++ b/src/xrGame/stats_submitter.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "stats_submitter.h" #include "gamespy/GameSpy_Full.h" #include "login_manager.h" diff --git a/src/xrGame/stats_submitter_dsa_params.cpp b/src/xrGame/stats_submitter_dsa_params.cpp index c2f104cdd2..dcf728a9b9 100644 --- a/src/xrGame/stats_submitter_dsa_params.cpp +++ b/src/xrGame/stats_submitter_dsa_params.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "stats_submitter.h" namespace gamespy_profile diff --git a/src/xrGame/steering_behaviour.cpp b/src/xrGame/steering_behaviour.cpp index 295a1386d1..219855bc3c 100644 --- a/src/xrGame/steering_behaviour.cpp +++ b/src/xrGame/steering_behaviour.cpp @@ -6,7 +6,7 @@ // Description : steering behaviour classes //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "steering_behaviour.h" //---------------------------------------------------------- diff --git a/src/xrGame/step_manager.cpp b/src/xrGame/step_manager.cpp index c8ce833bc7..9b31de5ca7 100644 --- a/src/xrGame/step_manager.cpp +++ b/src/xrGame/step_manager.cpp @@ -1,9 +1,9 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "step_manager.h" #include "entity_alive.h" #include "../Include/xrRender/Kinematics.h" #include "Level.h" -#include "gamepersistent.h" +#include "GamePersistent.h" #include "material_manager.h" #include "IKLimbsController.h" diff --git a/src/xrGame/step_manager_defs.h b/src/xrGame/step_manager_defs.h index 6164ea73cd..7cad513d37 100644 --- a/src/xrGame/step_manager_defs.h +++ b/src/xrGame/step_manager_defs.h @@ -5,7 +5,7 @@ #define MIN_LEGS_COUNT 1 #define MAX_LEGS_COUNT 4 -#include "../include/xrRender/animation_motion.h" +#include "../Include/xrRender/animation_motion.h" struct SStepParam { struct{ diff --git a/src/xrGame/team_base_zone.cpp b/src/xrGame/team_base_zone.cpp index 82d2bd2c41..f8da7b13eb 100644 --- a/src/xrGame/team_base_zone.cpp +++ b/src/xrGame/team_base_zone.cpp @@ -6,18 +6,18 @@ // Description : Team base zone object //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "team_base_zone.h" #include "xrServer_Objects_ALife_Monsters.h" #include "Hit.h" #include "Actor.h" #include "Level.h" -#include "xrserver.h" +#include "xrServer.h" #include "game_cl_base.h" #include "map_manager.h" #include "map_location.h" #include "../xrEngine/IGame_Persistent.h" -#include "../xrengine/xr_collide_form.h" +#include "../xrEngine/xr_collide_form.h" #ifdef DEBUG # include "debug_renderer.h" #endif diff --git a/src/xrGame/team_base_zone.h b/src/xrGame/team_base_zone.h index fb92ce16f0..92438c6cae 100644 --- a/src/xrGame/team_base_zone.h +++ b/src/xrGame/team_base_zone.h @@ -9,7 +9,7 @@ #pragma once #include "GameObject.h" -#include "../xrEngine/feel_touch.h" +#include "../xrEngine/Feel_Touch.h" class CTeamBaseZone : public CGameObject, public Feel::Touch { protected: diff --git a/src/xrGame/team_hierarchy_holder.cpp b/src/xrGame/team_hierarchy_holder.cpp index 612dc5918f..962c89df0b 100644 --- a/src/xrGame/team_hierarchy_holder.cpp +++ b/src/xrGame/team_hierarchy_holder.cpp @@ -6,7 +6,7 @@ // Description : Team hierarchy holder //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "team_hierarchy_holder.h" #include "squad_hierarchy_holder.h" #include "object_broker.h" diff --git a/src/xrGame/torch_script.cpp b/src/xrGame/torch_script.cpp index 88d1d6991a..cdc262bc22 100644 --- a/src/xrGame/torch_script.cpp +++ b/src/xrGame/torch_script.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "torch.h" +#include "Torch.h" #include "PDA.h" #include "SimpleDetector.h" #include "EliteDetector.h" diff --git a/src/xrGame/trade.cpp b/src/xrGame/trade.cpp index 6c9fd21c97..796fb86948 100644 --- a/src/xrGame/trade.cpp +++ b/src/xrGame/trade.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "trade.h" #include "Actor.h" diff --git a/src/xrGame/trade2.cpp b/src/xrGame/trade2.cpp index 7e79bec279..700ee92268 100644 --- a/src/xrGame/trade2.cpp +++ b/src/xrGame/trade2.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "trade.h" #include "Actor.h" diff --git a/src/xrGame/trade_parameters.cpp b/src/xrGame/trade_parameters.cpp index 44d907f4b4..c28f45f015 100644 --- a/src/xrGame/trade_parameters.cpp +++ b/src/xrGame/trade_parameters.cpp @@ -6,7 +6,7 @@ // Description : trade parameters class //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "trade_parameters.h" CTradeParameters *CTradeParameters::m_instance = 0; diff --git a/src/xrGame/trajectories.cpp b/src/xrGame/trajectories.cpp index f4b9cee464..cf5af221b1 100644 --- a/src/xrGame/trajectories.cpp +++ b/src/xrGame/trajectories.cpp @@ -1,8 +1,8 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "trajectories.h" #include "Level.h" #include "../xrPhysics/IPHWorld.h" -#include "../xrGame/ai_debug_variables.h" +#include "ai_debug_variables.h" #include "../xrCore/_vector3d_ext.h" diff --git a/src/xrGame/ui/FactionState.cpp b/src/xrGame/ui/FactionState.cpp index 54e880c70d..a82df64c10 100644 --- a/src/xrGame/ui/FactionState.cpp +++ b/src/xrGame/ui/FactionState.cpp @@ -10,7 +10,7 @@ /* #include "FactionState.h" -#include "../actor.h" +#include "../Actor.h" #include "../character_community.h" #include "../character_reputation.h" #include "../relation_registry.h" diff --git a/src/xrGame/ui/FractionState.cpp b/src/xrGame/ui/FractionState.cpp index 44115077e1..63512d6c82 100644 --- a/src/xrGame/ui/FractionState.cpp +++ b/src/xrGame/ui/FractionState.cpp @@ -10,7 +10,7 @@ #include "pch_script.h" #include "FractionState.h" -#include "../actor.h" +#include "../Actor.h" #include "../character_community.h" #include "../character_reputation.h" #include "../relation_registry.h" @@ -80,9 +80,9 @@ void FractionState::update_info() CActor* pActor = smart_cast( Level().CurrentEntity() ); if ( pActor ) { - CHARACTER_COMMUNITY char_ñmm; - char_ñmm.set( m_id ); - m_actor_goodwill = RELATION_REGISTRY().GetCommunityGoodwill( char_ñmm.index(), pActor->object_id() ); + CHARACTER_COMMUNITY char_cmm; + char_cmm.set( m_id ); + m_actor_goodwill = RELATION_REGISTRY().GetCommunityGoodwill(char_cmm.index(), pActor->object_id() ); } luabind::functor m_functor; diff --git a/src/xrGame/ui/IUWpnParams.cpp b/src/xrGame/ui/IUWpnParams.cpp index 03b55814e3..3008818ad8 100644 --- a/src/xrGame/ui/IUWpnParams.cpp +++ b/src/xrGame/ui/IUWpnParams.cpp @@ -2,7 +2,7 @@ #include "pch_script.h" #include "UIWpnParams.h" #include "UIXmlInit.h" -#include "../level.h" +#include "../Level.h" #include "game_base_space.h" #include "../ai_space.h" #include "../../xrServerEntities/script_engine.h" diff --git a/src/xrGame/ui/ServerList.cpp b/src/xrGame/ui/ServerList.cpp index 44a0fd5c4d..8896ed420f 100644 --- a/src/xrGame/ui/ServerList.cpp +++ b/src/xrGame/ui/ServerList.cpp @@ -2,15 +2,15 @@ #include "ServerList.h" #include "../../xrUI/UIXmlInit.h" #include "../../xrEngine/string_table.h" -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" #include "../../xrUI/Widgets/UIEditBox.h" #include "UIMessageBoxEx.h" #include "UIMessageBox.h" #include "TeamInfo.h" #include "../MainMenu.h" #include "../login_manager.h" -#include "../GameSpy/GameSpy_Full.h" -#include "../GameSpy/GameSpy_Browser.h" +#include "../gamespy/GameSpy_Full.h" +#include "../gamespy/GameSpy_Browser.h" LPCSTR GameTypeToString(EGameIDs gt, bool bShort); diff --git a/src/xrGame/ui/UIActorMenu.cpp b/src/xrGame/ui/UIActorMenu.cpp index 938e3a7c49..4e1615f453 100644 --- a/src/xrGame/ui/UIActorMenu.cpp +++ b/src/xrGame/ui/UIActorMenu.cpp @@ -1,13 +1,13 @@ #include "stdafx.h" #include "UIActorMenu.h" #include "UIActorStateInfo.h" -#include "../actor.h" -#include "../uigamesp.h" -#include "../inventory.h" +#include "../Actor.h" +#include "../UIGameSP.h" +#include "../Inventory.h" #include "../inventory_item.h" #include "../InventoryBox.h" #include "object_broker.h" -#include "../ai/monsters/BaseMonster/base_monster.h" +#include "../ai/monsters/basemonster/base_monster.h" #include "UIInventoryUtilities.h" #include "game_cl_base.h" @@ -38,7 +38,7 @@ #include "UIMessageBoxEx.h" #include "../../xrUI/Widgets/UIPropertiesBox.h" #include "UIMainIngameWnd.h" -#include "../Trade.h" +#include "../trade.h" #include "Car.h" #include "../xrEngine/string_table.h" diff --git a/src/xrGame/ui/UIActorMenuDeadBodySearch.cpp b/src/xrGame/ui/UIActorMenuDeadBodySearch.cpp index a3e603d091..9b5d98b354 100644 --- a/src/xrGame/ui/UIActorMenuDeadBodySearch.cpp +++ b/src/xrGame/ui/UIActorMenuDeadBodySearch.cpp @@ -13,10 +13,10 @@ #include "../GameObject.h" #include "../InventoryOwner.h" #include "../Inventory.h" -#include "../Inventory_item.h" +#include "../inventory_item.h" #include "../InventoryBox.h" #include "../../xrEngine/string_table.h" -#include "../ai/monsters/BaseMonster/base_monster.h" +#include "../ai/monsters/basemonster/base_monster.h" #include "../Car.h" void move_item_from_to (u16 from_id, u16 to_id, u16 what_id) diff --git a/src/xrGame/ui/UIActorMenuInventory.cpp b/src/xrGame/ui/UIActorMenuInventory.cpp index c38f4f9ad4..245e8e63fb 100644 --- a/src/xrGame/ui/UIActorMenuInventory.cpp +++ b/src/xrGame/ui/UIActorMenuInventory.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "UIActorMenu.h" -#include "../inventory.h" -#include "../inventoryOwner.h" +#include "../Inventory.h" +#include "../InventoryOwner.h" #include "UIInventoryUtilities.h" #include "UIItemInfo.h" #include "../Level.h" @@ -17,15 +17,15 @@ #include "UIGameCustom.h" #include "eatable_item_object.h" -#include "../silencer.h" -#include "../scope.h" -#include "../grenadelauncher.h" +#include "../Silencer.h" +#include "../Scope.h" +#include "../GrenadeLauncher.h" #include "../Artefact.h" #include "../eatable_item.h" #include "../BottleItem.h" #include "../WeaponMagazined.h" -#include "../Medkit.h" -#include "../Antirad.h" +#include "../medkit.h" +#include "../antirad.h" #include "../CustomOutfit.h" #include "../ActorHelmet.h" #include "../../xrUI/UICursor.h" diff --git a/src/xrGame/ui/UIActorMenuTrade.cpp b/src/xrGame/ui/UIActorMenuTrade.cpp index 798f768a09..7a55030de7 100644 --- a/src/xrGame/ui/UIActorMenuTrade.cpp +++ b/src/xrGame/ui/UIActorMenuTrade.cpp @@ -13,14 +13,14 @@ #include "../InventoryOwner.h" #include "../Inventory.h" -#include "../Trade.h" +#include "../trade.h" #include "../Entity.h" #include "../Actor.h" #include "../Weapon.h" #include "../trade_parameters.h" #include "../inventory_item_object.h" #include "../../xrEngine/string_table.h" -#include "../ai/monsters/BaseMonster/base_monster.h" +#include "../ai/monsters/basemonster/base_monster.h" #include "../ai_space.h" #include "../../xrScripts/script_engine.h" #include "../UIGameSP.h" diff --git a/src/xrGame/ui/UIActorMenuUpgrade.cpp b/src/xrGame/ui/UIActorMenuUpgrade.cpp index 94cd68d193..f2f4a36543 100644 --- a/src/xrGame/ui/UIActorMenuUpgrade.cpp +++ b/src/xrGame/ui/UIActorMenuUpgrade.cpp @@ -14,7 +14,7 @@ #include "../InventoryOwner.h" #include "../Inventory.h" #include "../Actor.h" -#include "../uigamesp.h" +#include "../UIGameSP.h" #include "../../xrUI/Widgets/UI3tButton.h" #include "inventory_upgrade.h" diff --git a/src/xrGame/ui/UIActorMenu_action.cpp b/src/xrGame/ui/UIActorMenu_action.cpp index a8daa8f697..eedf15dc69 100644 --- a/src/xrGame/ui/UIActorMenu_action.cpp +++ b/src/xrGame/ui/UIActorMenu_action.cpp @@ -8,9 +8,9 @@ #include "stdafx.h" #include "UIActorMenu.h" #include "UIActorStateInfo.h" -#include "../actor.h" -#include "../uigamesp.h" -#include "../inventory.h" +#include "../Actor.h" +#include "../UIGameSP.h" +#include "../Inventory.h" #include "../inventory_item.h" #include "../InventoryBox.h" #include "object_broker.h" diff --git a/src/xrGame/ui/UIActorMenu_script.cpp b/src/xrGame/ui/UIActorMenu_script.cpp index e8a30e7c26..60ac71622b 100644 --- a/src/xrGame/ui/UIActorMenu_script.cpp +++ b/src/xrGame/ui/UIActorMenu_script.cpp @@ -16,7 +16,7 @@ #include "UIDragDropReferenceList.h" #include "UICellCustomItems.h" -#include "../actor.h" +#include "../Actor.h" #include "../inventory_item.h" #include "UICellItem.h" #include "../ai_space.h" diff --git a/src/xrGame/ui/UIBoosterInfo.cpp b/src/xrGame/ui/UIBoosterInfo.cpp index 60d401cd0a..b27b525a28 100644 --- a/src/xrGame/ui/UIBoosterInfo.cpp +++ b/src/xrGame/ui/UIBoosterInfo.cpp @@ -3,7 +3,7 @@ #include "../../xrUI/Widgets/UIStatic.h" #include "object_broker.h" #include "../EntityCondition.h" -#include "../actor.h" +#include "../Actor.h" #include "../ActorCondition.h" #include "../../xrUI/UIXmlInit.h" #include "../../xrUI/UIHelper.h" diff --git a/src/xrGame/ui/UIBuyWndShared.cpp b/src/xrGame/ui/UIBuyWndShared.cpp index bd0346fc6f..2e09628b43 100644 --- a/src/xrGame/ui/UIBuyWndShared.cpp +++ b/src/xrGame/ui/UIBuyWndShared.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "UIBuyWndShared.h" -#include "UIMPTradeWnd.h" +#include "UIMpTradeWnd.h" extern LPCSTR _list_names[]; diff --git a/src/xrGame/ui/UIBuyWndShared.h b/src/xrGame/ui/UIBuyWndShared.h index 1fffe00fa4..9825823698 100644 --- a/src/xrGame/ui/UIBuyWndShared.h +++ b/src/xrGame/ui/UIBuyWndShared.h @@ -13,7 +13,7 @@ #include "../xrCore/associative_vector.h" -#include "restrictions.h" +#include "Restrictions.h" struct string_lex_less { diff --git a/src/xrGame/ui/UICDkey.cpp b/src/xrGame/ui/UICDkey.cpp index 8dda871f98..41eef400d3 100644 --- a/src/xrGame/ui/UICDkey.cpp +++ b/src/xrGame/ui/UICDkey.cpp @@ -5,7 +5,7 @@ #include "../../xrEngine/line_edit_control.h" #include "../MainMenu.h" -#include "../../xrEngine/xr_IOConsole.h" +#include "../../xrEngine/XR_IOConsole.h" #include "../RegistryFuncs.h" #include "../../xrGameSpy/xrGameSpy_MainDefs.h" #include "player_name_modifyer.h" diff --git a/src/xrGame/ui/UICellItem.cpp b/src/xrGame/ui/UICellItem.cpp index a3712a870a..c16d590787 100644 --- a/src/xrGame/ui/UICellItem.cpp +++ b/src/xrGame/ui/UICellItem.cpp @@ -4,7 +4,7 @@ #include "../inventory_item.h" #include "UIDragDropListEx.h" #include "../../xrEngine/xr_input.h" -#include "../level.h" +#include "../Level.h" #include "object_broker.h" #include "../../xrUI/UIXmlInit.h" #include "../../xrUI/Widgets/UIProgressBar.h" diff --git a/src/xrGame/ui/UIChangeMap.cpp b/src/xrGame/ui/UIChangeMap.cpp index 0b1aa092b3..8ec330a8e3 100644 --- a/src/xrGame/ui/UIChangeMap.cpp +++ b/src/xrGame/ui/UIChangeMap.cpp @@ -5,9 +5,9 @@ #include "../../xrUI/Widgets/UI3tButton.h" #include "../../xrUI/Widgets/UIListBox.h" #include "../../xrUI/Widgets/UIListBoxItem.h" -#include "../level.h" +#include "../Level.h" #include "../game_cl_teamdeathmatch.h" -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" #include "UIMapList.h" #include "object_broker.h" diff --git a/src/xrGame/ui/UIChangeWeather.cpp b/src/xrGame/ui/UIChangeWeather.cpp index 54351a1020..3227d7d39e 100644 --- a/src/xrGame/ui/UIChangeWeather.cpp +++ b/src/xrGame/ui/UIChangeWeather.cpp @@ -85,7 +85,7 @@ bool CUIChangeWeather::OnKeyboardAction(int dik, EUIMessages keyboard_action){ return false; } -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" void CUIChangeWeather::OnBtn(int i) { diff --git a/src/xrGame/ui/UICharacterInfo.cpp b/src/xrGame/ui/UICharacterInfo.cpp index 3537bc3312..08da825400 100644 --- a/src/xrGame/ui/UICharacterInfo.cpp +++ b/src/xrGame/ui/UICharacterInfo.cpp @@ -2,16 +2,16 @@ #include "UIInventoryUtilities.h" -#include "uicharacterinfo.h" -#include "../actor.h" -#include "../level.h" +#include "UICharacterInfo.h" +#include "../Actor.h" +#include "../Level.h" #include "../../xrServerEntities/character_info.h" #include "../relation_registry.h" #include "../../xrUI/xrUIXmlParser.h" #include "../../xrUI/UIXmlInit.h" -#include "../../xrUI/Widgets/uistatic.h" +#include "../../xrUI/Widgets/UIStatic.h" #include "../../xrUI/Widgets/UIScrollView.h" diff --git a/src/xrGame/ui/UICharacterInfo.h b/src/xrGame/ui/UICharacterInfo.h index 6391944560..4824bb773c 100644 --- a/src/xrGame/ui/UICharacterInfo.h +++ b/src/xrGame/ui/UICharacterInfo.h @@ -3,7 +3,7 @@ ////////////////////////////////////////////////////////////////////// #pragma once -#include "../../xrUI/Widgets/uiwindow.h" +#include "../../xrUI/Widgets/UIWindow.h" #include "../../xrEngine/AI/alife_space.h" #include "character_info_defs.h" class CUIStatic; diff --git a/src/xrGame/ui/UIDragDropReferenceList.cpp b/src/xrGame/ui/UIDragDropReferenceList.cpp index 308482dc8d..929fb14aae 100644 --- a/src/xrGame/ui/UIDragDropReferenceList.cpp +++ b/src/xrGame/ui/UIDragDropReferenceList.cpp @@ -3,9 +3,9 @@ #include "UICellItem.h" #include "UICellItemFactory.h" #include "../../xrUI/Widgets/UIStatic.h" -#include "../inventory.h" -#include "../inventoryOwner.h" -#include "../actor.h" +#include "../Inventory.h" +#include "../InventoryOwner.h" +#include "../Actor.h" #include "../actor_defs.h" #include "UIInventoryUtilities.h" #include "../../xrEngine/xr_input.h" diff --git a/src/xrGame/ui/UIFactionWarWnd.cpp b/src/xrGame/ui/UIFactionWarWnd.cpp index 86d8d8463b..843ae776c5 100644 --- a/src/xrGame/ui/UIFactionWarWnd.cpp +++ b/src/xrGame/ui/UIFactionWarWnd.cpp @@ -19,7 +19,7 @@ #include "UIPdaWnd.h" #include "UICharacterInfo.h" -#include "../actor.h" +#include "../Actor.h" #include "../ai_space.h" #include "../../xrServerEntities/script_engine.h" diff --git a/src/xrGame/ui/UIGameTutorial.cpp b/src/xrGame/ui/UIGameTutorial.cpp index 25c4bd2303..8fa3aecf7d 100644 --- a/src/xrGame/ui/UIGameTutorial.cpp +++ b/src/xrGame/ui/UIGameTutorial.cpp @@ -8,7 +8,7 @@ #include "../../xrEngine/xr_input.h" #include "../../xrScripts/script_engine.h" #include "../ai_space.h" -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" #include "../UIGameCustom.h" #include "UIActorMenu.h" #include "UIPdaWnd.h" diff --git a/src/xrGame/ui/UIGameTutorialSimpleItem.cpp b/src/xrGame/ui/UIGameTutorialSimpleItem.cpp index 40c66c52a3..cafc4023f9 100644 --- a/src/xrGame/ui/UIGameTutorialSimpleItem.cpp +++ b/src/xrGame/ui/UIGameTutorialSimpleItem.cpp @@ -2,12 +2,12 @@ #include "pch_script.h" #include "UIGameTutorial.h" #include "../../xrUI/Widgets/UIStatic.h" -#include "../../xrUI/uicursor.h" +#include "../../xrUI/UICursor.h" #include "../../xrUI/UIXmlInit.h" #include "object_broker.h" #include "../../xrEngine/xr_input.h" -#include "../UIGameSp.h" -#include "../level.h" +#include "../UIGameSP.h" +#include "../Level.h" #include "UIPdaWnd.h" #include "UIActorMenu.h" #include "UITalkWnd.h" diff --git a/src/xrGame/ui/UIGameTutorialVideoItem.cpp b/src/xrGame/ui/UIGameTutorialVideoItem.cpp index d317b1d438..80c16ef43c 100644 --- a/src/xrGame/ui/UIGameTutorialVideoItem.cpp +++ b/src/xrGame/ui/UIGameTutorialVideoItem.cpp @@ -10,7 +10,7 @@ #include "../Include/xrRender/UISequenceVideoItem.h" #include "../Include/xrRender/UIShader.h" #include "../Include/xrRender/UIRender.h" -#include "../../xrUI/uicursor.h" +#include "../../xrUI/UICursor.h" extern ENGINE_API BOOL bShowPauseString; diff --git a/src/xrGame/ui/UIHudStatesWnd.cpp b/src/xrGame/ui/UIHudStatesWnd.cpp index 0ea8e35a22..7e7fcfd853 100644 --- a/src/xrGame/ui/UIHudStatesWnd.cpp +++ b/src/xrGame/ui/UIHudStatesWnd.cpp @@ -6,7 +6,7 @@ #include "../EntityCondition.h" #include "../CustomOutfit.h" #include "../ActorHelmet.h" -#include "../inventory.h" +#include "../Inventory.h" #include "../RadioactiveZone.h" #include "../../xrUI/Widgets/UIStatic.h" diff --git a/src/xrGame/ui/UIHudStatesWnd.h b/src/xrGame/ui/UIHudStatesWnd.h index 024fcd3440..f3ef0f207d 100644 --- a/src/xrGame/ui/UIHudStatesWnd.h +++ b/src/xrGame/ui/UIHudStatesWnd.h @@ -3,7 +3,7 @@ #include "../../xrUI/Widgets/UIWindow.h" #include "../../xrEngine/AI/alife_space.h" #include "../../xrServerEntities/inventory_space.h" -#include "..\actor_defs.h" +#include "../actor_defs.h" class CUIStatic; class CUITextWnd; diff --git a/src/xrGame/ui/UIInventoryUpgradeWnd.cpp b/src/xrGame/ui/UIInventoryUpgradeWnd.cpp index 90ba06ffda..fbdcac0560 100644 --- a/src/xrGame/ui/UIInventoryUpgradeWnd.cpp +++ b/src/xrGame/ui/UIInventoryUpgradeWnd.cpp @@ -14,9 +14,9 @@ #include "../../xrUI/xrUIXmlParser.h" #include "../../xrUI/UIXmlInit.h" -#include "../actor.h" +#include "../Actor.h" #include "../../xrScripts/script_process.h" -#include "../inventory.h" +#include "../Inventory.h" #include "ai_space.h" #include "alife_simulator.h" diff --git a/src/xrGame/ui/UIInventoryUtilities.cpp b/src/xrGame/ui/UIInventoryUtilities.cpp index d5c3028909..b4ff04182d 100644 --- a/src/xrGame/ui/UIInventoryUtilities.cpp +++ b/src/xrGame/ui/UIInventoryUtilities.cpp @@ -14,7 +14,7 @@ #include "../InfoPortion.h" #include "game_base_space.h" -#include "../actor.h" +#include "../Actor.h" #include "../ai_space.h" #include "../../xrScripts/script_engine.h" diff --git a/src/xrGame/ui/UIItemInfo.cpp b/src/xrGame/ui/UIItemInfo.cpp index ca5179df4c..6b86a09e99 100644 --- a/src/xrGame/ui/UIItemInfo.cpp +++ b/src/xrGame/ui/UIItemInfo.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "pch_script.h" -#include "uiiteminfo.h" -#include "../../xrUI/Widgets/uistatic.h" +#include "UIItemInfo.h" +#include "../../xrUI/Widgets/UIStatic.h" #include "../../xrUI/UIXmlInit.h" #include "../../xrUI/Widgets/UIProgressBar.h" @@ -12,7 +12,7 @@ #include "ai_space.h" #include "alife_simulator.h" #include "../../xrEngine/string_table.h" -#include "../Inventory_Item.h" +#include "../inventory_item.h" #include "UIInventoryUtilities.h" #include "../PhysicsShellHolder.h" #include "UIWpnParams.h" diff --git a/src/xrGame/ui/UIItemInfo.h b/src/xrGame/ui/UIItemInfo.h index 10991c144c..b53a6501f6 100644 --- a/src/xrGame/ui/UIItemInfo.h +++ b/src/xrGame/ui/UIItemInfo.h @@ -1,5 +1,5 @@ #pragma once -#include "../../xrUI/Widgets/uiwindow.h" +#include "../../xrUI/Widgets/UIWindow.h" class CInventoryItem; diff --git a/src/xrGame/ui/UIKickPlayer.cpp b/src/xrGame/ui/UIKickPlayer.cpp index 4431604f30..27cd5ca6a0 100644 --- a/src/xrGame/ui/UIKickPlayer.cpp +++ b/src/xrGame/ui/UIKickPlayer.cpp @@ -8,10 +8,10 @@ #include "../../xrUI/Widgets/UIListBoxItem.h" #include "../../xrUI/Widgets/UISpinNum.h" #include "UIGameCustom.h" -#include "../level.h" +#include "../Level.h" #include "../game_cl_base.h" #include "../game_cl_teamdeathmatch.h" -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" CUIKickPlayer::CUIKickPlayer() { diff --git a/src/xrGame/ui/UIKnifeParams.cpp b/src/xrGame/ui/UIKnifeParams.cpp index 3082f112d3..9fcd31cbf3 100644 --- a/src/xrGame/ui/UIKnifeParams.cpp +++ b/src/xrGame/ui/UIKnifeParams.cpp @@ -2,7 +2,7 @@ #include "pch_script.h" #include "UIKnifeParams.h" #include "../../xrUI/UIXmlInit.h" -#include "../level.h" +#include "../Level.h" #include "game_base_space.h" #include "../ai_space.h" #include "../../xrScripts/script_engine.h" diff --git a/src/xrGame/ui/UILogsWnd.cpp b/src/xrGame/ui/UILogsWnd.cpp index 91d267f43a..9a812284e3 100644 --- a/src/xrGame/ui/UILogsWnd.cpp +++ b/src/xrGame/ui/UILogsWnd.cpp @@ -20,7 +20,7 @@ #include "UICharacterInfo.h" #include "UIInventoryUtilities.h" -#include "../actor.h" +#include "../Actor.h" #include "../game_news.h" #include "../alife_time_manager.h" #include "../alife_registry_wrappers.h" diff --git a/src/xrGame/ui/UIMMShniaga.cpp b/src/xrGame/ui/UIMMShniaga.cpp index d3f42f59f8..bb10896746 100644 --- a/src/xrGame/ui/UIMMShniaga.cpp +++ b/src/xrGame/ui/UIMMShniaga.cpp @@ -5,9 +5,9 @@ #include "../../xrUI/Widgets/UIStatic.h" #include "../../xrUI/Widgets/UIScrollView.h" #include "../../xrUI/UIXmlInit.h" -#include "MMsound.h" +#include "MMSound.h" #include "game_base_space.h" -#include "../level.h" +#include "../Level.h" #include "object_broker.h" #include "../Actor.h" #include "../saved_game_wrapper.h" diff --git a/src/xrGame/ui/UIMPAdminMenu.cpp b/src/xrGame/ui/UIMPAdminMenu.cpp index e83b5e46ec..50ff6fc069 100644 --- a/src/xrGame/ui/UIMPAdminMenu.cpp +++ b/src/xrGame/ui/UIMPAdminMenu.cpp @@ -10,7 +10,7 @@ #include "../../xrUI/Widgets/UI3tButton.h" #include "UIMessageBox.h" #include "UIMessageBoxEx.h" -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" CUIMpAdminMenu::CUIMpAdminMenu() { diff --git a/src/xrGame/ui/UIMPChangeMapAdm.cpp b/src/xrGame/ui/UIMPChangeMapAdm.cpp index 2a4879303e..3e431dfc73 100644 --- a/src/xrGame/ui/UIMPChangeMapAdm.cpp +++ b/src/xrGame/ui/UIMPChangeMapAdm.cpp @@ -7,7 +7,7 @@ #include "../../xrUI/Widgets/UI3tButton.h" #include "../../xrUI/Widgets/UIDialogWnd.h" #include "../Level.h" -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" #include "../UIGameCustom.h" #include "../../xrEngine/string_table.h" diff --git a/src/xrGame/ui/UIMPPlayersAdm.cpp b/src/xrGame/ui/UIMPPlayersAdm.cpp index f15f506e2e..d894070eef 100644 --- a/src/xrGame/ui/UIMPPlayersAdm.cpp +++ b/src/xrGame/ui/UIMPPlayersAdm.cpp @@ -11,7 +11,7 @@ #include "../xrServer.h" #include "../game_cl_base.h" #include "../game_cl_mp.h" -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" #include "../../xrEngine/string_table.h" extern int g_sv_adm_menu_ping_limit; diff --git a/src/xrGame/ui/UIMPServerAdm.cpp b/src/xrGame/ui/UIMPServerAdm.cpp index b512a95308..36296b576f 100644 --- a/src/xrGame/ui/UIMPServerAdm.cpp +++ b/src/xrGame/ui/UIMPServerAdm.cpp @@ -5,7 +5,7 @@ #include "../../xrUI/Widgets/UIEditBox.h" #include "../../xrUI/Widgets/UISpinNum.h" #include "../../xrUI/Widgets/UICheckButton.h" -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" #include "../../xrUI/Widgets/UIDialogWnd.h" CUIMpServerAdm::CUIMpServerAdm() diff --git a/src/xrGame/ui/UIMainIngameWnd.cpp b/src/xrGame/ui/UIMainIngameWnd.cpp index f002273c8b..f45d1b893c 100644 --- a/src/xrGame/ui/UIMainIngameWnd.cpp +++ b/src/xrGame/ui/UIMainIngameWnd.cpp @@ -5,23 +5,23 @@ #include "../UIZoneMap.h" -#include "../actor.h" +#include "../Actor.h" #include "../ActorCondition.h" #include "../EntityCondition.h" #include "../CustomOutfit.h" #include "../ActorHelmet.h" #include "../PDA.h" #include "../xrServerEntities/character_info.h" -#include "../inventory.h" +#include "../Inventory.h" #include "../UIGameSP.h" -#include "../weaponmagazined.h" -#include "../missile.h" +#include "../WeaponMagazined.h" +#include "../Missile.h" #include "../Grenade.h" #include "../xrServerEntities/xrServer_objects_ALife.h" #include "../alife_simulator.h" #include "../alife_object_registry.h" #include "../game_cl_base.h" -#include "../level.h" +#include "../Level.h" #include "../seniority_hierarchy_holder.h" #include "../date_time.h" diff --git a/src/xrGame/ui/UIMainIngameWnd.h b/src/xrGame/ui/UIMainIngameWnd.h index 57b8d6e0fe..ed5d1a6c39 100644 --- a/src/xrGame/ui/UIMainIngameWnd.h +++ b/src/xrGame/ui/UIMainIngameWnd.h @@ -1,7 +1,7 @@ #pragma once #include "UIGameLog.h" -#include "../hudsound.h" +#include "../HudSound.h" #include "../../xrEngine/AI/alife_space.h" #include "../EntityCondition.h" #include "UICarPanel.h" diff --git a/src/xrGame/ui/UIMap.cpp b/src/xrGame/ui/UIMap.cpp index f62373d6f9..c1375c4487 100644 --- a/src/xrGame/ui/UIMap.cpp +++ b/src/xrGame/ui/UIMap.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "../level.h" +#include "../Level.h" #include "../map_location.h" #include "../map_manager.h" #include "../map_spot.h" diff --git a/src/xrGame/ui/UIMapDesc.cpp b/src/xrGame/ui/UIMapDesc.cpp index fb77a1e19e..cfda5dd20d 100644 --- a/src/xrGame/ui/UIMapDesc.cpp +++ b/src/xrGame/ui/UIMapDesc.cpp @@ -7,7 +7,7 @@ #include "../../xrUI/UIXmlInit.h" #include "../../xrUI/Widgets/UI3tButton.h" #include "UIGameCustom.h" -#include "../level.h" +#include "../Level.h" #include "../game_cl_teamdeathmatch.h" #include "UIMapInfo.h" diff --git a/src/xrGame/ui/UIMapLegend.cpp b/src/xrGame/ui/UIMapLegend.cpp index 56e414c304..1cb4b32aa2 100644 --- a/src/xrGame/ui/UIMapLegend.cpp +++ b/src/xrGame/ui/UIMapLegend.cpp @@ -21,7 +21,7 @@ #include "../../xrUI/Widgets/UIHint.h" #include "UIInventoryUtilities.h" -#include "../level.h" +#include "../Level.h" UIMapLegend::~UIMapLegend() { diff --git a/src/xrGame/ui/UIMapList.cpp b/src/xrGame/ui/UIMapList.cpp index ffcf7fd0f2..f5e67613f3 100644 --- a/src/xrGame/ui/UIMapList.cpp +++ b/src/xrGame/ui/UIMapList.cpp @@ -9,7 +9,7 @@ #include "UIMapInfo.h" #include "../../xrUI/Widgets/UIComboBox.h" #include "../../xrUI/Widgets/UIListBoxItem.h" -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" #include "../../xrEngine/string_table.h" #include "object_broker.h" @@ -308,7 +308,7 @@ void CUIMapList::SetServerParams(LPCSTR params){ m_srv_params = params; } -#include "../../xrUI/Widgets/uilistboxitem.h" +#include "../../xrUI/Widgets/UIListBoxItem.h" void CUIMapList::AddWeather(const shared_str& WeatherType, const shared_str& WeatherTime, u32 _id) { R_ASSERT2 (m_pWeatherSelector, "m_pWeatherSelector == nullptr"); diff --git a/src/xrGame/ui/UIMapWnd.cpp b/src/xrGame/ui/UIMapWnd.cpp index fbd6bf614c..313ba60eb8 100644 --- a/src/xrGame/ui/UIMapWnd.cpp +++ b/src/xrGame/ui/UIMapWnd.cpp @@ -21,7 +21,7 @@ #include "UIMapWndActionsSpace.h" #include "../../xrUI/Widgets/UIHint.h" #include "map_hint.h" -#include "../../xrUI/uicursor.h" +#include "../../xrUI/UICursor.h" #include "UIPdaSpot.h" #include "../../xrUI/Widgets/UIPropertiesBox.h" @@ -765,10 +765,10 @@ void CUIMapWnd::Reset() ResetActionPlanner (); } -#include "../gametaskmanager.h" -#include "../actor.h" +#include "../GametaskManager.h" +#include "../Actor.h" #include "../map_spot.h" -#include "../gametask.h" +#include "../GameTask.h" void CUIMapWnd::SpotSelected( CUIWindow* w ) { diff --git a/src/xrGame/ui/UIMpItemsStoreWnd.cpp b/src/xrGame/ui/UIMpItemsStoreWnd.cpp index 2f59d2dafd..04904718bf 100644 --- a/src/xrGame/ui/UIMpItemsStoreWnd.cpp +++ b/src/xrGame/ui/UIMpItemsStoreWnd.cpp @@ -3,7 +3,7 @@ #include "../../xrUI/UIXmlInit.h" #include "../../xrUI/Widgets/UITabButtonMP.h" #include "object_broker.h" -#include "restrictions.h" +#include "Restrictions.h" void CStoreHierarchy::item::destroy() { diff --git a/src/xrGame/ui/UIMpTradeWnd.cpp b/src/xrGame/ui/UIMpTradeWnd.cpp index a80cf5e217..5f68f0047a 100644 --- a/src/xrGame/ui/UIMpTradeWnd.cpp +++ b/src/xrGame/ui/UIMpTradeWnd.cpp @@ -216,7 +216,7 @@ void CUIMpTradeWnd::FillUpSubLevelItems() } } -#include "../actor.h" +#include "../Actor.h" void CUIMpTradeWnd::Show(bool status) { inherited::Show (status); diff --git a/src/xrGame/ui/UIMpTradeWnd.h b/src/xrGame/ui/UIMpTradeWnd.h index e2e3ee91e1..23288a53e8 100644 --- a/src/xrGame/ui/UIMpTradeWnd.h +++ b/src/xrGame/ui/UIMpTradeWnd.h @@ -3,7 +3,7 @@ #include "UIBuyWndShared.h" #include "UIBuyWndBase.h" #include "../../xrUI/Widgets/UIWndCallback.h" -#include "restrictions.h" +#include "Restrictions.h" #include "UIMpItemsStoreWnd.h" class CUIDragDropListEx; diff --git a/src/xrGame/ui/UIMpTradeWnd_wpn.cpp b/src/xrGame/ui/UIMpTradeWnd_wpn.cpp index ef943e6700..73229d5844 100644 --- a/src/xrGame/ui/UIMpTradeWnd_wpn.cpp +++ b/src/xrGame/ui/UIMpTradeWnd_wpn.cpp @@ -2,7 +2,7 @@ #include "UIMpTradeWnd.h" #include "UIDragDropListEx.h" #include "UICellItem.h" -#include "../weaponmagazinedwgrenade.h" +#include "../WeaponMagazinedWGrenade.h" #include "../../xrEngine/xr_input.h" #include "UIMpItemsStoreWnd.h" diff --git a/src/xrGame/ui/UIOptConCom.cpp b/src/xrGame/ui/UIOptConCom.cpp index dbc2f3b868..adb6ee9e1b 100644 --- a/src/xrGame/ui/UIOptConCom.cpp +++ b/src/xrGame/ui/UIOptConCom.cpp @@ -1,8 +1,8 @@ #include "StdAfx.h" -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" #include "../../xrEngine/xr_ioc_cmd.h" #include "UIOptConCom.h" -#include "../../xrcore/xrCore.h" +#include "../../xrCore/xrCore.h" //#include "game_base_space.h" #include "gametype_chooser.h" #include "../RegistryFuncs.h" diff --git a/src/xrGame/ui/UIPdaWnd.cpp b/src/xrGame/ui/UIPdaWnd.cpp index 492a7769ec..189b731efd 100644 --- a/src/xrGame/ui/UIPdaWnd.cpp +++ b/src/xrGame/ui/UIPdaWnd.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include "UIPdaWnd.h" -#include "../Pda.h" +#include "../PDA.h" #include "../../xrUI/xrUIXmlParser.h" #include "../../xrUI/UIXmlInit.h" #include "UIInventoryUtilities.h" -#include "../level.h" +#include "../Level.h" #include "UIGameCustom.h" #include "../../xrUI/Widgets/UIStatic.h" diff --git a/src/xrGame/ui/UIRankFaction.cpp b/src/xrGame/ui/UIRankFaction.cpp index ef6ef92457..0636a42350 100644 --- a/src/xrGame/ui/UIRankFaction.cpp +++ b/src/xrGame/ui/UIRankFaction.cpp @@ -13,7 +13,7 @@ #include "UIProgressBar.h" #include "UIHelper.h" -#include "../actor.h" +#include "../Actor.h" #include "../ai_space.h" #include "../../xrServerEntities/script_engine.h" #include "../character_community.h" diff --git a/src/xrGame/ui/UIRankFraction.cpp b/src/xrGame/ui/UIRankFraction.cpp index cf550e7d00..726a396081 100644 --- a/src/xrGame/ui/UIRankFraction.cpp +++ b/src/xrGame/ui/UIRankFraction.cpp @@ -14,7 +14,7 @@ #include "UIProgressBar.h" #include "UIHelper.h" -#include "../actor.h" +#include "../Actor.h" #include "../ai_space.h" #include "../../xrServerEntities/script_engine.h" #include "../character_community.h" diff --git a/src/xrGame/ui/UIRankingWnd.cpp b/src/xrGame/ui/UIRankingWnd.cpp index 32d988b535..c53d1527b4 100644 --- a/src/xrGame/ui/UIRankingWnd.cpp +++ b/src/xrGame/ui/UIRankingWnd.cpp @@ -17,7 +17,7 @@ #include "../../xrUI/UIHelper.h" #include "UIInventoryUtilities.h" -#include "../actor.h" +#include "../Actor.h" #include "../ai_space.h" #include "../alife_simulator.h" diff --git a/src/xrGame/ui/UISecondTaskWnd.cpp b/src/xrGame/ui/UISecondTaskWnd.cpp index f31c55ccb5..f22b9ae193 100644 --- a/src/xrGame/ui/UISecondTaskWnd.cpp +++ b/src/xrGame/ui/UISecondTaskWnd.cpp @@ -23,11 +23,11 @@ #include "UITaskWnd.h" #include "../GameTaskDefs.h" -#include "../gametask.h" +#include "../GameTask.h" #include "../map_location.h" #include "UIInventoryUtilities.h" -#include "../level.h" -#include "../gametaskmanager.h" +#include "../Level.h" +#include "../GametaskManager.h" #include "../Actor.h" diff --git a/src/xrGame/ui/UIServerInfo.cpp b/src/xrGame/ui/UIServerInfo.cpp index cb540d2a9a..47d698f69c 100644 --- a/src/xrGame/ui/UIServerInfo.cpp +++ b/src/xrGame/ui/UIServerInfo.cpp @@ -7,7 +7,7 @@ #include "../../xrUI/UIXmlInit.h" #include "../../xrUI/Widgets/UI3tButton.h" #include "UIGameCustom.h" -#include "../level.h" +#include "../Level.h" #include "../game_cl_mp.h" #ifdef XR_MP_BUILD diff --git a/src/xrGame/ui/UISkinSelector.cpp b/src/xrGame/ui/UISkinSelector.cpp index 934be8efa1..4babf37f8f 100644 --- a/src/xrGame/ui/UISkinSelector.cpp +++ b/src/xrGame/ui/UISkinSelector.cpp @@ -7,7 +7,7 @@ #include "../../xrUI/UICursor.h" #include "../UIGameCustom.h" #include "../game_cl_deathmatch.h" -#include "../level.h" +#include "../Level.h" #include "object_broker.h" diff --git a/src/xrGame/ui/UISpawnWnd.cpp b/src/xrGame/ui/UISpawnWnd.cpp index 9b27c060c8..58281fd74b 100644 --- a/src/xrGame/ui/UISpawnWnd.cpp +++ b/src/xrGame/ui/UISpawnWnd.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include "UISpawnWnd.h" #include "../../xrUI/UIXmlInit.h" -#include "../level.h" +#include "../Level.h" #include "../game_cl_teamdeathmatch.h" #include "../../xrUI/Widgets/UIStatix.h" #include "../../xrUI/Widgets/UIScrollView.h" #include "../../xrUI/Widgets/UI3tButton.h" -#include "../../xrUI/uicursor.h" +#include "../../xrUI/UICursor.h" #include "uigamecustom.h" CUISpawnWnd::CUISpawnWnd() diff --git a/src/xrGame/ui/UISpeechMenu.cpp b/src/xrGame/ui/UISpeechMenu.cpp index 6af75afb72..c857c6e601 100644 --- a/src/xrGame/ui/UISpeechMenu.cpp +++ b/src/xrGame/ui/UISpeechMenu.cpp @@ -5,7 +5,7 @@ #include "UIGameCustom.h" #include "../../xrUI/UIXmlInit.h" #include "../game_cl_mp.h" -#include "../level.h" +#include "../Level.h" #include "../../xrEngine/string_table.h" CUISpeechMenu::CUISpeechMenu(LPCSTR section_name) diff --git a/src/xrGame/ui/UIStalkersRankingWnd.cpp b/src/xrGame/ui/UIStalkersRankingWnd.cpp index d18d665b24..119d04ee57 100644 --- a/src/xrGame/ui/UIStalkersRankingWnd.cpp +++ b/src/xrGame/ui/UIStalkersRankingWnd.cpp @@ -10,8 +10,8 @@ #include "UICharacterInfo.h" #include "../InventoryOwner.h" #include "../Level.h" -#include "../pda.h" -#include "../actor.h" +#include "../PDA.h" +#include "../Actor.h" #include "../../xrServerEntities/xrServer_Objects_ALife_Monsters.h" #define STALKERS_RANKING_XML "stalkers_ranking.xml" diff --git a/src/xrGame/ui/UIStats.cpp b/src/xrGame/ui/UIStats.cpp index 8ab1ff1bea..3054e14a78 100644 --- a/src/xrGame/ui/UIStats.cpp +++ b/src/xrGame/ui/UIStats.cpp @@ -5,7 +5,7 @@ #include "UIStatsPlayerList.h" #include "../../xrUI/Widgets/UIStatic.h" #include "../../xrUI/Widgets/UIFrameWindow.h" -#include "../level.h" +#include "../Level.h" #include "game_base_space.h" diff --git a/src/xrGame/ui/UIStatsPlayerInfo.cpp b/src/xrGame/ui/UIStatsPlayerInfo.cpp index 2d4395b030..1c5c8cf1b0 100644 --- a/src/xrGame/ui/UIStatsPlayerInfo.cpp +++ b/src/xrGame/ui/UIStatsPlayerInfo.cpp @@ -5,7 +5,7 @@ #include "../game_cl_base.h" #include "UIStatsIcon.h" #include "../game_cl_artefacthunt.h" -#include "../level.h" +#include "../Level.h" #include "../../xrEngine/string_table.h" CUIStatsPlayerInfo::CUIStatsPlayerInfo(xr_vector* info, CGameFont* pF, u32 text_col) diff --git a/src/xrGame/ui/UIStatsPlayerList.cpp b/src/xrGame/ui/UIStatsPlayerList.cpp index 437c972d37..465101d6ab 100644 --- a/src/xrGame/ui/UIStatsPlayerList.cpp +++ b/src/xrGame/ui/UIStatsPlayerList.cpp @@ -4,7 +4,7 @@ #include "../game_cl_artefacthunt.h" #include "UIStatsPlayerInfo.h" #include "UIStatsIcon.h" -#include "../level.h" +#include "../Level.h" #include "../../xrEngine/string_table.h" #include "../../xrUI/Widgets/UIStatic.h" #include "../../xrUI/UIXmlInit.h" diff --git a/src/xrGame/ui/UITalkDialogWnd.cpp b/src/xrGame/ui/UITalkDialogWnd.cpp index a02197c8a8..f6d5302b23 100644 --- a/src/xrGame/ui/UITalkDialogWnd.cpp +++ b/src/xrGame/ui/UITalkDialogWnd.cpp @@ -10,7 +10,7 @@ #include "../../xrUI/Widgets/UIBtnHint.h" #include "../game_news.h" -#include "../level.h" +#include "../Level.h" #include "../Actor.h" #include "../alife_registry_wrappers.h" diff --git a/src/xrGame/ui/UITalkWnd.cpp b/src/xrGame/ui/UITalkWnd.cpp index 84d20f17fb..181620ef50 100644 --- a/src/xrGame/ui/UITalkWnd.cpp +++ b/src/xrGame/ui/UITalkWnd.cpp @@ -3,19 +3,19 @@ #include "UITalkDialogWnd.h" -#include "../actor.h" +#include "../Actor.h" #include "../trade.h" #include "../UIGameSP.h" #include "../PDA.h" #include "../../xrServerEntities/character_info.h" -#include "../level.h" +#include "../Level.h" #include "../PhraseDialog.h" #include "../PhraseDialogManager.h" #include "../game_cl_base.h" #include "../../xrEngine/string_table.h" -#include "../../xrEngine/cameraBase.h" +#include "../../xrEngine/CameraBase.h" #include "../../xrUI/UIXmlInit.h" #include "../../xrUI/Widgets/UI3tButton.h" diff --git a/src/xrGame/ui/UITaskWnd.cpp b/src/xrGame/ui/UITaskWnd.cpp index 72e1f30e38..ad620de573 100644 --- a/src/xrGame/ui/UITaskWnd.cpp +++ b/src/xrGame/ui/UITaskWnd.cpp @@ -11,14 +11,14 @@ #include "../../xrUI/UIHelper.h" #include "../../xrUI/Widgets/UIHint.h" -#include "../gametask.h" +#include "../GameTask.h" #include "../map_location.h" #include "../map_location_defs.h" #include "../map_manager.h" #include "UIInventoryUtilities.h" -#include "../level.h" -#include "../gametaskmanager.h" -#include "../actor.h" +#include "../Level.h" +#include "../GametaskManager.h" +#include "../Actor.h" #include "../../xrUI/Widgets/UICheckButton.h" CUITaskWnd::CUITaskWnd() diff --git a/src/xrGame/ui/UITextVote.cpp b/src/xrGame/ui/UITextVote.cpp index e282f03d8c..5f351e3940 100644 --- a/src/xrGame/ui/UITextVote.cpp +++ b/src/xrGame/ui/UITextVote.cpp @@ -7,10 +7,10 @@ #include "UIEditboxEx.h" //#include "UIMapList.h" -#include "../level.h" +#include "../Level.h" //#include "../game_cl_base.h" #include "../game_cl_teamdeathmatch.h" -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" diff --git a/src/xrGame/ui/UIVote.cpp b/src/xrGame/ui/UIVote.cpp index e879c4a554..e698943992 100644 --- a/src/xrGame/ui/UIVote.cpp +++ b/src/xrGame/ui/UIVote.cpp @@ -5,10 +5,10 @@ #include "../../xrUI/Widgets/UIListBox.h" #include "../../xrUI/Widgets/UIFrameWindow.h" #include "../../xrUI/UIXmlInit.h" -#include "../level.h" +#include "../Level.h" #include "../game_cl_base.h" #include "../game_cl_teamdeathmatch.h" -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" CUIVote::CUIVote() { diff --git a/src/xrGame/ui/UIVotingCategory.cpp b/src/xrGame/ui/UIVotingCategory.cpp index 9aabfecf39..e46e5ce587 100644 --- a/src/xrGame/ui/UIVotingCategory.cpp +++ b/src/xrGame/ui/UIVotingCategory.cpp @@ -103,7 +103,7 @@ bool CUIVotingCategory::OnKeyboardAction(int dik, EUIMessages keyboard_action) return false; } -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" void CUIVotingCategory::OnBtn(int i) { diff --git a/src/xrGame/ui/UIWpnParams.cpp b/src/xrGame/ui/UIWpnParams.cpp index 3b48b5e105..c36b8c9c7d 100644 --- a/src/xrGame/ui/UIWpnParams.cpp +++ b/src/xrGame/ui/UIWpnParams.cpp @@ -2,7 +2,7 @@ #include "pch_script.h" #include "UIWpnParams.h" #include "../../xrUI/UIXmlInit.h" -#include "../level.h" +#include "../Level.h" #include "game_base_space.h" #include "../ai_space.h" #include "../../xrScripts/script_engine.h" diff --git a/src/xrGame/ui/map_hint.cpp b/src/xrGame/ui/map_hint.cpp index 61c10b979b..8257d269b8 100644 --- a/src/xrGame/ui/map_hint.cpp +++ b/src/xrGame/ui/map_hint.cpp @@ -4,9 +4,9 @@ #include "../../xrUI/UIXmlInit.h" #include "../map_location.h" #include "../map_spot.h" -#include "../actor.h" -#include "../gametaskmanager.h" -#include "../gametask.h" +#include "../Actor.h" +#include "../GametaskManager.h" +#include "../GameTask.h" #include "UIInventoryUtilities.h" #include "../../xrEngine/string_table.h" diff --git a/src/xrGame/ui_export_script.cpp b/src/xrGame/ui_export_script.cpp index 3c6bc43187..02cdcd7bd0 100644 --- a/src/xrGame/ui_export_script.cpp +++ b/src/xrGame/ui_export_script.cpp @@ -1,24 +1,24 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "script_ui_registrator.h" #include "MainMenu.h" #include "UIGameCustom.h" -#include "UI/UIScriptWnd.h" +#include "ui/UIScriptWnd.h" #include "../xrUI/Widgets/UIButton.h" #include "../xrUI/Widgets/UIProgressBar.h" #include "../xrUI/Widgets/UIEditBox.h" -#include "UI/UIMessageBox.h" +#include "ui/UIMessageBox.h" #include "../xrUI/Widgets/UIPropertiesBox.h" #include "../xrUI/Widgets/UITabControl.h" -#include "UI/UIMapList.h" -#include "UI/UIMMShniaga.h" +#include "ui/UIMapList.h" +#include "ui/UIMMShniaga.h" #include "../xrUI/Widgets/UIComboBox.h" #include "../xrUI/Widgets/UIOptionsManagerScript.h" #include "ui/UIMapInfo.h" #include "map_manager.h" -#include "ScriptXmlInit.h" +#include "ScriptXMLInit.h" #include "login_manager.h" #include "account_manager.h" diff --git a/src/xrGame/vision_client.cpp b/src/xrGame/vision_client.cpp index 6ba087dc17..7d1f6e6724 100644 --- a/src/xrGame/vision_client.cpp +++ b/src/xrGame/vision_client.cpp @@ -6,9 +6,9 @@ // Description : vision client //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "vision_client.h" -#include "entity.h" +#include "Entity.h" #include "visual_memory_manager.h" IC const CEntity &vision_client::object () const diff --git a/src/xrGame/vision_client.h b/src/xrGame/vision_client.h index 1fb6d46df5..7d02691226 100644 --- a/src/xrGame/vision_client.h +++ b/src/xrGame/vision_client.h @@ -9,7 +9,7 @@ #ifndef VISION_CLIENT_H #define VISION_CLIENT_H -#include "../xrEngine/feel_vision.h" +#include "../xrEngine/Feel_Vision.h" class CObject; class CEntity; diff --git a/src/xrGame/visual_memory_manager.cpp b/src/xrGame/visual_memory_manager.cpp index f6ed21f469..dfc374635b 100644 --- a/src/xrGame/visual_memory_manager.cpp +++ b/src/xrGame/visual_memory_manager.cpp @@ -6,7 +6,7 @@ // Description : Visual memory manager //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "visual_memory_manager.h" #include "ai/stalker/ai_stalker.h" @@ -15,13 +15,13 @@ #include "ai_object_location.h" #include "level_graph.h" #include "stalker_movement_manager_smart_cover.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" #include "agent_manager.h" #include "agent_member_manager.h" #include "ai_space.h" #include "Actor.h" -#include "../xrEngine/camerabase.h" -#include "gamepersistent.h" +#include "../xrEngine/CameraBase.h" +#include "GamePersistent.h" #include "actor_memory.h" #include "client_spawn_manager.h" #include "client_spawn_manager.h" diff --git a/src/xrGame/visual_memory_params.cpp b/src/xrGame/visual_memory_params.cpp index 862e765323..b89416441a 100644 --- a/src/xrGame/visual_memory_params.cpp +++ b/src/xrGame/visual_memory_params.cpp @@ -6,7 +6,7 @@ // Description : Visual memory parameters //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "visual_memory_params.h" #include "memory_space.h" diff --git a/src/xrGame/wallmark_manager.cpp b/src/xrGame/wallmark_manager.cpp index 196c057892..4b9f1380f0 100644 --- a/src/xrGame/wallmark_manager.cpp +++ b/src/xrGame/wallmark_manager.cpp @@ -1,10 +1,10 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "wallmark_manager.h" #include "Level.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" #include "../xrPhysics/CalculateTriangle.h" #ifdef DEBUG -#include "phdebug.h" +#include "PHDebug.h" #endif CWalmarkManager::CWalmarkManager() diff --git a/src/xrGame/weaponBM16.cpp b/src/xrGame/weaponBM16.cpp index d435f1bdd7..ac37e7f32c 100644 --- a/src/xrGame/weaponBM16.cpp +++ b/src/xrGame/weaponBM16.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "weaponBM16.h" CWeaponBM16::~CWeaponBM16() diff --git a/src/xrGame/weaponBM16.h b/src/xrGame/weaponBM16.h index 2a7275285a..cf6ef841ce 100644 --- a/src/xrGame/weaponBM16.h +++ b/src/xrGame/weaponBM16.h @@ -1,6 +1,6 @@ #pragma once -#include "weaponShotgun.h" +#include "WeaponShotgun.h" #include "../xrScripts/script_export_space.h" class CWeaponBM16 :public CWeaponShotgun diff --git a/src/xrGame/weaponBM16_script.cpp b/src/xrGame/weaponBM16_script.cpp index 5a67eadc25..aadf4d9390 100644 --- a/src/xrGame/weaponBM16_script.cpp +++ b/src/xrGame/weaponBM16_script.cpp @@ -1,6 +1,6 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" -#include "WeaponBM16.h" +#include "weaponBM16.h" using namespace luabind; diff --git a/src/xrGame/weapon_ammo_dump_impl.cpp b/src/xrGame/weapon_ammo_dump_impl.cpp index c6ec6edf2b..febb11c6b6 100644 --- a/src/xrGame/weapon_ammo_dump_impl.cpp +++ b/src/xrGame/weapon_ammo_dump_impl.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "WeaponAmmo.h" void CCartridge::DumpActiveParams(shared_str const & section_name, diff --git a/src/xrGame/weapon_dump_impl.cpp b/src/xrGame/weapon_dump_impl.cpp index 691ff9c2ce..2a6b658dd4 100644 --- a/src/xrGame/weapon_dump_impl.cpp +++ b/src/xrGame/weapon_dump_impl.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Weapon.h" void CWeapon::DumpActiveParams(shared_str const & section_name, CInifile & dst_ini) const diff --git a/src/xrGame/weaponshotgun_script.cpp b/src/xrGame/weaponshotgun_script.cpp index 326dd9609a..5a44b079b0 100644 --- a/src/xrGame/weaponshotgun_script.cpp +++ b/src/xrGame/weaponshotgun_script.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "WeaponShotgun.h" #include "WeaponAutomaticShotgun.h" diff --git a/src/xrGame/xrClientsPool.cpp b/src/xrGame/xrClientsPool.cpp index 0a5fc58b86..ea63a5f619 100644 --- a/src/xrGame/xrClientsPool.cpp +++ b/src/xrGame/xrClientsPool.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xrClientsPool.h" #include "xrServer.h" diff --git a/src/xrGame/xrGame.cpp b/src/xrGame/xrGame.cpp index d7fb6488f6..9c5768c719 100644 --- a/src/xrGame/xrGame.cpp +++ b/src/xrGame/xrGame.cpp @@ -6,7 +6,7 @@ // Description : Defines the entry point for the DLL application. //////////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "object_factory.h" #include "../../xrUI/xrUIXmlParser.h" #include "../xrEngine/xr_level_controller.h" diff --git a/src/xrGame/xrGameSpyServer.cpp b/src/xrGame/xrGameSpyServer.cpp index a5d9258a6b..ac7894217d 100644 --- a/src/xrGame/xrGameSpyServer.cpp +++ b/src/xrGame/xrGameSpyServer.cpp @@ -1,10 +1,10 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xrMessages.h" #include "xrGameSpyServer.h" -#include "../xrEngine/igame_persistent.h" +#include "../xrEngine/IGame_Persistent.h" -#include "GameSpy/GameSpy_Base_Defs.h" -#include "GameSpy/GameSpy_Available.h" +#include "gamespy/GameSpy_Base_Defs.h" +#include "gamespy/GameSpy_Available.h" //#define DEMO_BUILD diff --git a/src/xrGame/xrGameSpyServer.h b/src/xrGame/xrGameSpyServer.h index fc230e8a04..877d194513 100644 --- a/src/xrGame/xrGameSpyServer.h +++ b/src/xrGame/xrGameSpyServer.h @@ -1,8 +1,8 @@ #pragma once #include "xrServer.h" -#include "GameSpy/GameSpy_GCD_Server.h" -#include "GameSpy/GameSpy_QR2.h" +#include "gamespy/GameSpy_GCD_Server.h" +#include "gamespy/GameSpy_QR2.h" class xrGameSpyClientData : public xrClientData diff --git a/src/xrGame/xrGameSpyServer_callbacks.cpp b/src/xrGame/xrGameSpyServer_callbacks.cpp index 92409c351c..a47febb0e0 100644 --- a/src/xrGame/xrGameSpyServer_callbacks.cpp +++ b/src/xrGame/xrGameSpyServer_callbacks.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xrGameSpyServer.h" #include "xrGameSpyServer_callbacks.h" -#include "../xrEngine/igame_persistent.h" +#include "../xrEngine/IGame_Persistent.h" diff --git a/src/xrGame/xrGameSpyServer_callbacks.h b/src/xrGame/xrGameSpyServer_callbacks.h index ca76669fdd..97346fdcb1 100644 --- a/src/xrGame/xrGameSpyServer_callbacks.h +++ b/src/xrGame/xrGameSpyServer_callbacks.h @@ -1 +1 @@ -#include "GameSpy/GameSpy_Keys.h" +#include "gamespy/GameSpy_Keys.h" diff --git a/src/xrGame/xrGameSpy_GameSpyFuncs.cpp b/src/xrGame/xrGameSpy_GameSpyFuncs.cpp index 04d3a10a50..5d472d0467 100644 --- a/src/xrGame/xrGameSpy_GameSpyFuncs.cpp +++ b/src/xrGame/xrGameSpy_GameSpyFuncs.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xrGameSpyServer.h" #include "xrMessages.h" /////////////////////// QR2 /////////////////////////////////////// diff --git a/src/xrGame/xrServer.cpp b/src/xrGame/xrServer.cpp index 5833f14ebc..33ac1ceaab 100644 --- a/src/xrGame/xrServer.cpp +++ b/src/xrGame/xrServer.cpp @@ -2,7 +2,7 @@ // ////////////////////////////////////////////////////////////////////// -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "xrServer.h" #include "xrMessages.h" diff --git a/src/xrGame/xrServer.h b/src/xrGame/xrServer.h index 358e69b959..e7fff152e0 100644 --- a/src/xrGame/xrServer.h +++ b/src/xrGame/xrServer.h @@ -7,7 +7,7 @@ #define AFX_XRSERVER_H__65728A25_16FC_4A7B_8CCE_D798CA5EC64E__INCLUDED_ #pragma once -#include "../xrNetServer/net_server.h" +#include "../xrNetServer/NET_Server.h" #include "game_sv_base.h" #include "id_generator.h" #include "../xrEngine/mp_logging.h" diff --git a/src/xrGame/xrServerMapSync.cpp b/src/xrGame/xrServerMapSync.cpp index 1feb9bab2f..01a46a187d 100644 --- a/src/xrGame/xrServerMapSync.cpp +++ b/src/xrGame/xrServerMapSync.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Level.h" #include "xrServer.h" #include "xrServerMapSync.h" diff --git a/src/xrGame/xrServer_CL_connect.cpp b/src/xrGame/xrServer_CL_connect.cpp index 6f51d50116..a0dc84b1ed 100644 --- a/src/xrGame/xrServer_CL_connect.cpp +++ b/src/xrGame/xrServer_CL_connect.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "xrserver.h" +#include "StdAfx.h" +#include "xrServer.h" #include "xrMessages.h" #include "xrserver_objects.h" #include "xrServer_Objects_Alife_Monsters.h" diff --git a/src/xrGame/xrServer_CL_disconnect.cpp b/src/xrGame/xrServer_CL_disconnect.cpp index 6e2234ff48..4caf05d67e 100644 --- a/src/xrGame/xrServer_CL_disconnect.cpp +++ b/src/xrGame/xrServer_CL_disconnect.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "xrserver.h" +#include "StdAfx.h" +#include "xrServer.h" #include "game_sv_single.h" #include "alife_simulator.h" #include "xrserver_objects.h" diff --git a/src/xrGame/xrServer_Connect.cpp b/src/xrGame/xrServer_Connect.cpp index b22aec8306..f22aaf91ef 100644 --- a/src/xrGame/xrServer_Connect.cpp +++ b/src/xrGame/xrServer_Connect.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "xrserver.h" +#include "StdAfx.h" +#include "xrServer.h" #include "game_sv_single.h" #include "game_sv_deathmatch.h" #include "game_sv_teamdeathmatch.h" diff --git a/src/xrGame/xrServer_Disconnect.cpp b/src/xrGame/xrServer_Disconnect.cpp index 5a42589347..455e4cf5f3 100644 --- a/src/xrGame/xrServer_Disconnect.cpp +++ b/src/xrGame/xrServer_Disconnect.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer.h" #include "file_transfer.h" #include "screenshot_server.h" diff --git a/src/xrGame/xrServer_balance.cpp b/src/xrGame/xrServer_balance.cpp index 904b85602d..e6f6229926 100644 --- a/src/xrGame/xrServer_balance.cpp +++ b/src/xrGame/xrServer_balance.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "xrserver.h" +#include "StdAfx.h" +#include "xrServer.h" class xrClientData; class CSE_Abstract; diff --git a/src/xrGame/xrServer_info.cpp b/src/xrGame/xrServer_info.cpp index db00860445..3d63219c95 100644 --- a/src/xrGame/xrServer_info.cpp +++ b/src/xrGame/xrServer_info.cpp @@ -1,7 +1,7 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer_info.h" #include "Level.h" -#include "xrserver.h" +#include "xrServer.h" #define SERVER_LOGO_FN "server_logo.jpg" #define SERVER_RULES_FN "server_rules.txt" diff --git a/src/xrGame/xrServer_perform_GameExport.cpp b/src/xrGame/xrServer_perform_GameExport.cpp index 4379c98156..2ea7eb761c 100644 --- a/src/xrGame/xrServer_perform_GameExport.cpp +++ b/src/xrGame/xrServer_perform_GameExport.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "xrserver.h" +#include "StdAfx.h" +#include "xrServer.h" #include "xrMessages.h" void xrServer::Perform_game_export () diff --git a/src/xrGame/xrServer_perform_RPgen.cpp b/src/xrGame/xrServer_perform_RPgen.cpp index fac2697a55..029d5b1ebd 100644 --- a/src/xrGame/xrServer_perform_RPgen.cpp +++ b/src/xrGame/xrServer_perform_RPgen.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "xrserver.h" +#include "StdAfx.h" +#include "xrServer.h" BOOL xrServer::PerformRP (CSE_Abstract* EEE) { diff --git a/src/xrGame/xrServer_perform_migration.cpp b/src/xrGame/xrServer_perform_migration.cpp index f3bbfde836..ea53674e43 100644 --- a/src/xrGame/xrServer_perform_migration.cpp +++ b/src/xrGame/xrServer_perform_migration.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer.h" // Initiate migration diff --git a/src/xrGame/xrServer_perform_sls_default.cpp b/src/xrGame/xrServer_perform_sls_default.cpp index a604cd8007..137ab37e67 100644 --- a/src/xrGame/xrServer_perform_sls_default.cpp +++ b/src/xrGame/xrServer_perform_sls_default.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "xrserver.h" +#include "StdAfx.h" +#include "xrServer.h" #include "xrMessages.h" #if 1//def DEBUG diff --git a/src/xrGame/xrServer_perform_sls_load.cpp b/src/xrGame/xrServer_perform_sls_load.cpp index 1903f05495..0a0566bff6 100644 --- a/src/xrGame/xrServer_perform_sls_load.cpp +++ b/src/xrGame/xrServer_perform_sls_load.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "xrserver.h" +#include "StdAfx.h" +#include "xrServer.h" #include "xrMessages.h" void xrServer::SLS_Load (IReader& fs) diff --git a/src/xrGame/xrServer_perform_sls_save.cpp b/src/xrGame/xrServer_perform_sls_save.cpp index b79ec0035b..48073f8012 100644 --- a/src/xrGame/xrServer_perform_sls_save.cpp +++ b/src/xrGame/xrServer_perform_sls_save.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "xrserver.h" +#include "StdAfx.h" +#include "xrServer.h" #include "xrMessages.h" #include "xrserver_objects.h" diff --git a/src/xrGame/xrServer_perform_transfer.cpp b/src/xrGame/xrServer_perform_transfer.cpp index e95dbaa71d..162146e0b0 100644 --- a/src/xrGame/xrServer_perform_transfer.cpp +++ b/src/xrGame/xrServer_perform_transfer.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "xrserver.h" +#include "StdAfx.h" +#include "xrServer.h" #include "xrMessages.h" #include "xrserver_objects.h" diff --git a/src/xrGame/xrServer_process_event.cpp b/src/xrGame/xrServer_process_event.cpp index 7c6d987652..591630f830 100644 --- a/src/xrGame/xrServer_process_event.cpp +++ b/src/xrGame/xrServer_process_event.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer.h" #include "game_sv_single.h" #include "alife_simulator.h" diff --git a/src/xrGame/xrServer_process_event_activate.cpp b/src/xrGame/xrServer_process_event_activate.cpp index d024dc42da..962d40d551 100644 --- a/src/xrGame/xrServer_process_event_activate.cpp +++ b/src/xrGame/xrServer_process_event_activate.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "xrserver.h" +#include "StdAfx.h" +#include "xrServer.h" #include "xrserver_objects.h" void xrServer::Process_event_activate (NET_Packet& P, const ClientID sender, const u32 time, const u16 id_parent, const u16 id_entity, bool send_message) diff --git a/src/xrGame/xrServer_process_event_destroy.cpp b/src/xrGame/xrServer_process_event_destroy.cpp index fbcb26db25..4af241731d 100644 --- a/src/xrGame/xrServer_process_event_destroy.cpp +++ b/src/xrGame/xrServer_process_event_destroy.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer.h" #include "game_sv_single.h" #include "alife_simulator.h" diff --git a/src/xrGame/xrServer_process_event_ownership.cpp b/src/xrGame/xrServer_process_event_ownership.cpp index 286d5fd22c..e32b355a78 100644 --- a/src/xrGame/xrServer_process_event_ownership.cpp +++ b/src/xrGame/xrServer_process_event_ownership.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Level.h" #include "xrServer.h" #include "xrServer_Objects.h" diff --git a/src/xrGame/xrServer_process_event_reject.cpp b/src/xrGame/xrServer_process_event_reject.cpp index 121d524090..e17a9e9dd0 100644 --- a/src/xrGame/xrServer_process_event_reject.cpp +++ b/src/xrGame/xrServer_process_event_reject.cpp @@ -1,5 +1,5 @@ -#include "stdafx.h" -#include "xrserver.h" +#include "StdAfx.h" +#include "xrServer.h" #include "xrserver_objects.h" bool xrServer::Process_event_reject (NET_Packet& P, const ClientID sender, const u32 time, const u16 id_parent, const u16 id_entity, bool send_message) diff --git a/src/xrGame/xrServer_process_spawn.cpp b/src/xrGame/xrServer_process_spawn.cpp index 6a7259f36c..6387f2dc00 100644 --- a/src/xrGame/xrServer_process_spawn.cpp +++ b/src/xrGame/xrServer_process_spawn.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer.h" #include "xrserver_objects.h" diff --git a/src/xrGame/xrServer_process_update.cpp b/src/xrGame/xrServer_process_update.cpp index 26cda42798..52478f7759 100644 --- a/src/xrGame/xrServer_process_update.cpp +++ b/src/xrGame/xrServer_process_update.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer.h" #include "xrServer_Objects.h" diff --git a/src/xrGame/xrServer_secure_messaging.cpp b/src/xrGame/xrServer_secure_messaging.cpp index 3d2abb94cc..55166e1994 100644 --- a/src/xrGame/xrServer_secure_messaging.cpp +++ b/src/xrGame/xrServer_secure_messaging.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer.h" #include "xrMessages.h" diff --git a/src/xrGame/xrServer_sls_clear.cpp b/src/xrGame/xrServer_sls_clear.cpp index 8fef8648c8..957ac6af2a 100644 --- a/src/xrGame/xrServer_sls_clear.cpp +++ b/src/xrGame/xrServer_sls_clear.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "game_sv_single.h" #include "alife_simulator.h" #include "xrServer_Objects.h" diff --git a/src/xrGame/xrServer_svclient_validation.cpp b/src/xrGame/xrServer_svclient_validation.cpp index 0ff20ab418..8fe022a483 100644 --- a/src/xrGame/xrServer_svclient_validation.cpp +++ b/src/xrGame/xrServer_svclient_validation.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xrServer_svclient_validation.h" #include "GameObject.h" #include "Level.h" diff --git a/src/xrGame/xrServer_updates_compressor.cpp b/src/xrGame/xrServer_updates_compressor.cpp index 8346dba042..2b5be3efbb 100644 --- a/src/xrGame/xrServer_updates_compressor.cpp +++ b/src/xrGame/xrServer_updates_compressor.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "Level.h" #include "xrServer_updates_compressor.h" #include "../xrCore/ppmd_compressor.h" diff --git a/src/xrGame/xr_dsa_signer.cpp b/src/xrGame/xr_dsa_signer.cpp index e228bb5755..4a44a2fe02 100644 --- a/src/xrGame/xr_dsa_signer.cpp +++ b/src/xrGame/xr_dsa_signer.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xr_dsa_signer.h" xr_dsa_signer::xr_dsa_signer(u8 const p_number[crypto::xr_dsa::public_key_length], diff --git a/src/xrGame/xr_dsa_verifyer.cpp b/src/xrGame/xr_dsa_verifyer.cpp index 24f3448923..e5649b63f0 100644 --- a/src/xrGame/xr_dsa_verifyer.cpp +++ b/src/xrGame/xr_dsa_verifyer.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xr_dsa_verifyer.h" xr_dsa_verifyer::xr_dsa_verifyer(u8 const p_number[crypto::xr_dsa::public_key_length], diff --git a/src/xrGame/xr_time.cpp b/src/xrGame/xr_time.cpp index eb8f2ed7bb..c55e89cdf0 100644 --- a/src/xrGame/xr_time.cpp +++ b/src/xrGame/xr_time.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "xr_time.h" #include "ui/UIInventoryUtilities.h" #include "Level.h" diff --git a/src/xrGame/xrgame_dll_detach.cpp b/src/xrGame/xrgame_dll_detach.cpp index ef2464bca7..5920bc33d6 100644 --- a/src/xrGame/xrgame_dll_detach.cpp +++ b/src/xrGame/xrgame_dll_detach.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "pch_script.h" #include "ai_space.h" #include "object_factory.h" diff --git a/src/xrGame/zone_effector.cpp b/src/xrGame/zone_effector.cpp index 3fb9a5e43a..54dae6b2a9 100644 --- a/src/xrGame/zone_effector.cpp +++ b/src/xrGame/zone_effector.cpp @@ -1,11 +1,11 @@ -#include "stdafx.h" +#include "StdAfx.h" #include "zone_effector.h" #include "Level.h" #include "../xrEngine/xr_object.h" -#include "../xrEngine/cameramanager.h" +#include "../xrEngine/CameraManager.h" #include "Actor.h" -#include "actoreffector.h" -#include "postprocessanimator.h" +#include "ActorEffector.h" +#include "PostprocessAnimator.h" #include "CustomOutfit.h" CZoneEffector::CZoneEffector() diff --git a/src/xrGameSpy/GameSpy_Patching.cpp b/src/xrGameSpy/GameSpy_Patching.cpp index fdb583fcac..d822b4a9b0 100644 --- a/src/xrGameSpy/GameSpy_Patching.cpp +++ b/src/xrGameSpy/GameSpy_Patching.cpp @@ -1,4 +1,4 @@ -#include "StdAfx.h" +#include "stdafx.h" #include "GameSpy_Patching.h" #include "GameSpy_Base_Defs.h" diff --git a/src/xrGameSpy/gamespy/GP/gptest/StdAfx.cpp b/src/xrGameSpy/gamespy/GP/gptest/StdAfx.cpp index 46e6de4cee..fb49e219e0 100644 --- a/src/xrGameSpy/gamespy/GP/gptest/StdAfx.cpp +++ b/src/xrGameSpy/gamespy/GP/gptest/StdAfx.cpp @@ -2,7 +2,7 @@ // gptest.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/xrGameSpy/gamespy/GP/gptest/gptest.cpp b/src/xrGameSpy/gamespy/GP/gptest/gptest.cpp index 1d190f8192..5e56db3f70 100644 --- a/src/xrGameSpy/gamespy/GP/gptest/gptest.cpp +++ b/src/xrGameSpy/gamespy/GP/gptest/gptest.cpp @@ -1,7 +1,7 @@ // gptest.cpp : Defines the class behaviors for the application. // -#include "stdafx.h" +#include "StdAfx.h" #include "gptest.h" #include "gptestDlg.h" diff --git a/src/xrGameSpy/gamespy/GP/gptest/gptestDlg.cpp b/src/xrGameSpy/gamespy/GP/gptest/gptestDlg.cpp index 79c72ba1bb..e840a1aefa 100644 --- a/src/xrGameSpy/gamespy/GP/gptest/gptestDlg.cpp +++ b/src/xrGameSpy/gamespy/GP/gptest/gptestDlg.cpp @@ -1,7 +1,7 @@ // gptestDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "gptest.h" #include "gptestDlg.h" diff --git a/src/xrGameSpy/gamespy/Peer/PeerLobby/ConnectPage.cpp b/src/xrGameSpy/gamespy/Peer/PeerLobby/ConnectPage.cpp index fbb738ab7f..d06c3d46e1 100644 --- a/src/xrGameSpy/gamespy/Peer/PeerLobby/ConnectPage.cpp +++ b/src/xrGameSpy/gamespy/Peer/PeerLobby/ConnectPage.cpp @@ -1,7 +1,7 @@ // ConnectPage.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "PeerLobby.h" #include "ConnectPage.h" #include "TitlePage.h" diff --git a/src/xrGameSpy/gamespy/Peer/PeerLobby/CreatePage.cpp b/src/xrGameSpy/gamespy/Peer/PeerLobby/CreatePage.cpp index c70854d261..317cee7967 100644 --- a/src/xrGameSpy/gamespy/Peer/PeerLobby/CreatePage.cpp +++ b/src/xrGameSpy/gamespy/Peer/PeerLobby/CreatePage.cpp @@ -1,7 +1,7 @@ // CreatePage.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "PeerLobby.h" #include "CreatePage.h" #include "LobbyWizard.h" diff --git a/src/xrGameSpy/gamespy/Peer/PeerLobby/GroupPage.cpp b/src/xrGameSpy/gamespy/Peer/PeerLobby/GroupPage.cpp index 8f5c0afbe9..5746500e4a 100644 --- a/src/xrGameSpy/gamespy/Peer/PeerLobby/GroupPage.cpp +++ b/src/xrGameSpy/gamespy/Peer/PeerLobby/GroupPage.cpp @@ -1,7 +1,7 @@ // GroupPage.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "PeerLobby.h" #include "GroupPage.h" #include "LobbyWizard.h" diff --git a/src/xrGameSpy/gamespy/Peer/PeerLobby/LobbyWizard.cpp b/src/xrGameSpy/gamespy/Peer/PeerLobby/LobbyWizard.cpp index b15f6bbf2f..d3c6a5864c 100644 --- a/src/xrGameSpy/gamespy/Peer/PeerLobby/LobbyWizard.cpp +++ b/src/xrGameSpy/gamespy/Peer/PeerLobby/LobbyWizard.cpp @@ -1,7 +1,7 @@ // LobbyWizard.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "PeerLobby.h" #include "LobbyWizard.h" #include "GroupPage.h" diff --git a/src/xrGameSpy/gamespy/Peer/PeerLobby/PeerLobby.cpp b/src/xrGameSpy/gamespy/Peer/PeerLobby/PeerLobby.cpp index 6d7660cf72..5e45ce5747 100644 --- a/src/xrGameSpy/gamespy/Peer/PeerLobby/PeerLobby.cpp +++ b/src/xrGameSpy/gamespy/Peer/PeerLobby/PeerLobby.cpp @@ -1,7 +1,7 @@ // PeerLobby.cpp : Defines the class behaviors for the application. // -#include "stdafx.h" +#include "StdAfx.h" #include "PeerLobby.h" #include "ConnectPage.h" #include "TitlePage.h" diff --git a/src/xrGameSpy/gamespy/Peer/PeerLobby/SideBarCtrl.cpp b/src/xrGameSpy/gamespy/Peer/PeerLobby/SideBarCtrl.cpp index 9703bf1c69..c3bd02543a 100644 --- a/src/xrGameSpy/gamespy/Peer/PeerLobby/SideBarCtrl.cpp +++ b/src/xrGameSpy/gamespy/Peer/PeerLobby/SideBarCtrl.cpp @@ -1,8 +1,8 @@ // SideBarCtrl.cpp : implementation file // -#include "stdafx.h" -#include "peerlobby.h" +#include "StdAfx.h" +#include "PeerLobby.h" #include "SideBarCtrl.h" #ifdef _DEBUG diff --git a/src/xrGameSpy/gamespy/Peer/PeerLobby/StagingPage.cpp b/src/xrGameSpy/gamespy/Peer/PeerLobby/StagingPage.cpp index 4bf060d7a4..55aeb599b9 100644 --- a/src/xrGameSpy/gamespy/Peer/PeerLobby/StagingPage.cpp +++ b/src/xrGameSpy/gamespy/Peer/PeerLobby/StagingPage.cpp @@ -1,7 +1,7 @@ // StagingPage.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "PeerLobby.h" #include "StagingPage.h" #include "LobbyWizard.h" diff --git a/src/xrGameSpy/gamespy/Peer/PeerLobby/StdAfx.cpp b/src/xrGameSpy/gamespy/Peer/PeerLobby/StdAfx.cpp index f9fa84a9a6..2e566b311d 100644 --- a/src/xrGameSpy/gamespy/Peer/PeerLobby/StdAfx.cpp +++ b/src/xrGameSpy/gamespy/Peer/PeerLobby/StdAfx.cpp @@ -2,7 +2,7 @@ // PeerLobby.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/xrGameSpy/gamespy/Peer/PeerLobby/TitlePage.cpp b/src/xrGameSpy/gamespy/Peer/PeerLobby/TitlePage.cpp index 892f2205ab..1000c53c78 100644 --- a/src/xrGameSpy/gamespy/Peer/PeerLobby/TitlePage.cpp +++ b/src/xrGameSpy/gamespy/Peer/PeerLobby/TitlePage.cpp @@ -1,7 +1,7 @@ // TitlePage.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "PeerLobby.h" #include "TitlePage.h" #include "LobbyWizard.h" diff --git a/src/xrGameSpy/gamespy/Peer/PeerTest/PeerTest.cpp b/src/xrGameSpy/gamespy/Peer/PeerTest/PeerTest.cpp index e00812958d..4e49554c78 100644 --- a/src/xrGameSpy/gamespy/Peer/PeerTest/PeerTest.cpp +++ b/src/xrGameSpy/gamespy/Peer/PeerTest/PeerTest.cpp @@ -1,7 +1,7 @@ // PeerTest.cpp : Defines the class behaviors for the application. // -#include "stdafx.h" +#include "StdAfx.h" #include "PeerTest.h" #include "PeerTestDlg.h" diff --git a/src/xrGameSpy/gamespy/Peer/PeerTest/PeerTestDlg.cpp b/src/xrGameSpy/gamespy/Peer/PeerTest/PeerTestDlg.cpp index 06a8894b27..fcd9d5da0d 100644 --- a/src/xrGameSpy/gamespy/Peer/PeerTest/PeerTestDlg.cpp +++ b/src/xrGameSpy/gamespy/Peer/PeerTest/PeerTestDlg.cpp @@ -1,7 +1,7 @@ // PeerTestDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "PeerTest.h" #include "PeerTestDlg.h" diff --git a/src/xrGameSpy/gamespy/Peer/PeerTest/StdAfx.cpp b/src/xrGameSpy/gamespy/Peer/PeerTest/StdAfx.cpp index 5c1a3a4d35..287e196e45 100644 --- a/src/xrGameSpy/gamespy/Peer/PeerTest/StdAfx.cpp +++ b/src/xrGameSpy/gamespy/Peer/PeerTest/StdAfx.cpp @@ -2,7 +2,7 @@ // PeerTest.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/xrGameSpy/gamespy/common/ps3/SpeexSpursTaskManager/SpursSpeexTaskManager.cpp b/src/xrGameSpy/gamespy/common/ps3/SpeexSpursTaskManager/SpursSpeexTaskManager.cpp index 9860138ad1..618e3b1daa 100644 --- a/src/xrGameSpy/gamespy/common/ps3/SpeexSpursTaskManager/SpursSpeexTaskManager.cpp +++ b/src/xrGameSpy/gamespy/common/ps3/SpeexSpursTaskManager/SpursSpeexTaskManager.cpp @@ -19,7 +19,7 @@ subject to the following restrictions: #ifdef USE_SAMPLE_PROCESS -#include "spursThreadSupportInterface.h" +#include "spursthreadsupportinterface.h" //#include "SPUAssert.h" #include diff --git a/src/xrGameSpy/gamespy/common/ps3/SpeexSpursTaskManager/spursSupportInterface.h b/src/xrGameSpy/gamespy/common/ps3/SpeexSpursTaskManager/spursSupportInterface.h index 74250e8e26..d3584cd2bb 100644 --- a/src/xrGameSpy/gamespy/common/ps3/SpeexSpursTaskManager/spursSupportInterface.h +++ b/src/xrGameSpy/gamespy/common/ps3/SpeexSpursTaskManager/spursSupportInterface.h @@ -10,7 +10,7 @@ #include #include "spursUtilityMacros.h" -#include "spursThreadSupportInterface.h" +#include "spursthreadsupportinterface.h" #ifdef __SPU__ #include diff --git a/src/xrGameSpy/gamespy/common/ps3/SpeexSpursTaskManager/spursThreadSupportInterface.cpp b/src/xrGameSpy/gamespy/common/ps3/SpeexSpursTaskManager/spursThreadSupportInterface.cpp index 011b322f38..f20778294f 100644 --- a/src/xrGameSpy/gamespy/common/ps3/SpeexSpursTaskManager/spursThreadSupportInterface.cpp +++ b/src/xrGameSpy/gamespy/common/ps3/SpeexSpursTaskManager/spursThreadSupportInterface.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#include "spursThreadSupportInterface.h" +#include "spursthreadsupportinterface.h" spursThreadSupportInterface::~spursThreadSupportInterface() { diff --git a/src/xrGameSpy/gamespy/ghttp/ghttpmfc/StdAfx.cpp b/src/xrGameSpy/gamespy/ghttp/ghttpmfc/StdAfx.cpp index e371c47607..8e19c94248 100644 --- a/src/xrGameSpy/gamespy/ghttp/ghttpmfc/StdAfx.cpp +++ b/src/xrGameSpy/gamespy/ghttp/ghttpmfc/StdAfx.cpp @@ -2,7 +2,7 @@ // ghttpmfc.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/xrGameSpy/gamespy/ghttp/ghttpmfc/ghttpmfc.cpp b/src/xrGameSpy/gamespy/ghttp/ghttpmfc/ghttpmfc.cpp index b6f0f9f0c4..fdfec6037d 100644 --- a/src/xrGameSpy/gamespy/ghttp/ghttpmfc/ghttpmfc.cpp +++ b/src/xrGameSpy/gamespy/ghttp/ghttpmfc/ghttpmfc.cpp @@ -1,7 +1,7 @@ // ghttpmfc.cpp : Defines the class behaviors for the application. // -#include "stdafx.h" +#include "StdAfx.h" #include "ghttpmfc.h" #include "ghttpmfcDlg.h" diff --git a/src/xrGameSpy/gamespy/ghttp/ghttpmfc/ghttpmfcDlg.cpp b/src/xrGameSpy/gamespy/ghttp/ghttpmfc/ghttpmfcDlg.cpp index 9363bcee81..2e5c6e2ab4 100644 --- a/src/xrGameSpy/gamespy/ghttp/ghttpmfc/ghttpmfcDlg.cpp +++ b/src/xrGameSpy/gamespy/ghttp/ghttpmfc/ghttpmfcDlg.cpp @@ -1,7 +1,7 @@ // ghttpmfcDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "ghttpmfc.h" #include "ghttpmfcDlg.h" diff --git a/src/xrGameSpy/gamespy/gstats/gp_stats/StdAfx.cpp b/src/xrGameSpy/gamespy/gstats/gp_stats/StdAfx.cpp index b815a51768..b83f682b40 100644 --- a/src/xrGameSpy/gamespy/gstats/gp_stats/StdAfx.cpp +++ b/src/xrGameSpy/gamespy/gstats/gp_stats/StdAfx.cpp @@ -2,7 +2,7 @@ // gp_stats.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/xrGameSpy/gamespy/gstats/gp_stats/gp_stats.cpp b/src/xrGameSpy/gamespy/gstats/gp_stats/gp_stats.cpp index d606ccbf14..254bc54a47 100644 --- a/src/xrGameSpy/gamespy/gstats/gp_stats/gp_stats.cpp +++ b/src/xrGameSpy/gamespy/gstats/gp_stats/gp_stats.cpp @@ -1,7 +1,7 @@ // gp_stats.cpp : Defines the class behaviors for the application. // -#include "stdafx.h" +#include "StdAfx.h" #include "gp_stats.h" #include "gp_statsDlg.h" diff --git a/src/xrGameSpy/gamespy/gstats/gp_stats/gp_statsDlg.cpp b/src/xrGameSpy/gamespy/gstats/gp_stats/gp_statsDlg.cpp index dcd8be7ee6..8681fe878d 100644 --- a/src/xrGameSpy/gamespy/gstats/gp_stats/gp_statsDlg.cpp +++ b/src/xrGameSpy/gamespy/gstats/gp_stats/gp_statsDlg.cpp @@ -1,7 +1,7 @@ // gp_statsDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "gp_stats.h" #include "gp_statsDlg.h" #include "../gpersist.h" diff --git a/src/xrGameSpy/gamespy/gstats/gp_stats/gp_statsDlg.h b/src/xrGameSpy/gamespy/gstats/gp_stats/gp_statsDlg.h index c5e6b63b63..6e783a6793 100644 --- a/src/xrGameSpy/gamespy/gstats/gp_stats/gp_statsDlg.h +++ b/src/xrGameSpy/gamespy/gstats/gp_stats/gp_statsDlg.h @@ -8,7 +8,7 @@ #pragma once #endif // _MSC_VER > 1000 -#include "../../gp/gp.h" +#include "../../GP/gp.h" ///////////////////////////////////////////////////////////////////////////// // CGp_statsDlg dialog diff --git a/src/xrGameSpy/gamespy/gstats/ladderTrack/HostOrJoinDlg.cpp b/src/xrGameSpy/gamespy/gstats/ladderTrack/HostOrJoinDlg.cpp index 35c626e6b5..2ac1879537 100644 --- a/src/xrGameSpy/gamespy/gstats/ladderTrack/HostOrJoinDlg.cpp +++ b/src/xrGameSpy/gamespy/gstats/ladderTrack/HostOrJoinDlg.cpp @@ -1,7 +1,7 @@ // HostOrJoinDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "ladderTrack.h" #include "HostOrJoinDlg.h" diff --git a/src/xrGameSpy/gamespy/gstats/ladderTrack/LoginDlg.cpp b/src/xrGameSpy/gamespy/gstats/ladderTrack/LoginDlg.cpp index 9bcc3df77a..4c375cfcba 100644 --- a/src/xrGameSpy/gamespy/gstats/ladderTrack/LoginDlg.cpp +++ b/src/xrGameSpy/gamespy/gstats/ladderTrack/LoginDlg.cpp @@ -1,7 +1,7 @@ // LoginDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "ladderTrack.h" #include "LoginDlg.h" #include "../../common/gsAvailable.h" diff --git a/src/xrGameSpy/gamespy/gstats/ladderTrack/StdAfx.cpp b/src/xrGameSpy/gamespy/gstats/ladderTrack/StdAfx.cpp index 0550bc3ad4..8ab8fb8872 100644 --- a/src/xrGameSpy/gamespy/gstats/ladderTrack/StdAfx.cpp +++ b/src/xrGameSpy/gamespy/gstats/ladderTrack/StdAfx.cpp @@ -2,7 +2,7 @@ // ladderTrack.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/xrGameSpy/gamespy/gstats/ladderTrack/StdAfx.h b/src/xrGameSpy/gamespy/gstats/ladderTrack/StdAfx.h index ea062f5eb5..13aa91ba89 100644 --- a/src/xrGameSpy/gamespy/gstats/ladderTrack/StdAfx.h +++ b/src/xrGameSpy/gamespy/gstats/ladderTrack/StdAfx.h @@ -21,7 +21,7 @@ #endif // _AFX_NO_AFXCMN_SUPPORT #include "../gstats.h" -#include "../../gp/gp.h" +#include "../../GP/gp.h" #include "../../ghttp/ghttp.h" //#include "../../gt/gt.h" //#include "../../gt/gtEncode.h" diff --git a/src/xrGameSpy/gamespy/gstats/ladderTrack/WaitingDlg.cpp b/src/xrGameSpy/gamespy/gstats/ladderTrack/WaitingDlg.cpp index 5d8bf4822a..347d669919 100644 --- a/src/xrGameSpy/gamespy/gstats/ladderTrack/WaitingDlg.cpp +++ b/src/xrGameSpy/gamespy/gstats/ladderTrack/WaitingDlg.cpp @@ -1,7 +1,7 @@ // WaitingDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "ladderTrack.h" #include "WaitingDlg.h" diff --git a/src/xrGameSpy/gamespy/gstats/ladderTrack/ladderTrack.cpp b/src/xrGameSpy/gamespy/gstats/ladderTrack/ladderTrack.cpp index d050006fb8..274dc6ed6c 100644 --- a/src/xrGameSpy/gamespy/gstats/ladderTrack/ladderTrack.cpp +++ b/src/xrGameSpy/gamespy/gstats/ladderTrack/ladderTrack.cpp @@ -1,7 +1,7 @@ // ladderTrack.cpp : Defines the class behaviors for the application. // -#include "stdafx.h" +#include "StdAfx.h" #include "ladderTrack.h" #include "ladderTrackDlg.h" diff --git a/src/xrGameSpy/gamespy/gstats/ladderTrack/ladderTrackDlg.cpp b/src/xrGameSpy/gamespy/gstats/ladderTrack/ladderTrackDlg.cpp index 1d083be97e..319a492842 100644 --- a/src/xrGameSpy/gamespy/gstats/ladderTrack/ladderTrackDlg.cpp +++ b/src/xrGameSpy/gamespy/gstats/ladderTrack/ladderTrackDlg.cpp @@ -1,10 +1,10 @@ // ladderTrackDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "ladderTrack.h" #include "ladderTrackDlg.h" -#include "waitingDlg.h" +#include "WaitingDlg.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/src/xrGameSpy/gamespy/gstats/ladderTrack/ladderTrackDlg.h b/src/xrGameSpy/gamespy/gstats/ladderTrack/ladderTrackDlg.h index 0a8a35599d..eda6cc6de9 100644 --- a/src/xrGameSpy/gamespy/gstats/ladderTrack/ladderTrackDlg.h +++ b/src/xrGameSpy/gamespy/gstats/ladderTrack/ladderTrackDlg.h @@ -6,8 +6,8 @@ #include "LoginDlg.h" #include "HostOrJoinDlg.h" -#include "..\..\GT2\gt2.h" // Added by ClassView -#include "..\..\GT2\gt2Encode.h" +#include "../../gt2/gt2.h" +#include "../../gt2/gt2Encode.h" #include "WaitingDlg.h" // Added by ClassView #if _MSC_VER > 1000 diff --git a/src/xrGameSpy/gamespy/gstats/multiTrack/HostOrJoinDlg.cpp b/src/xrGameSpy/gamespy/gstats/multiTrack/HostOrJoinDlg.cpp index 098caf53ad..f4177e8112 100644 --- a/src/xrGameSpy/gamespy/gstats/multiTrack/HostOrJoinDlg.cpp +++ b/src/xrGameSpy/gamespy/gstats/multiTrack/HostOrJoinDlg.cpp @@ -1,7 +1,7 @@ // HostOrJoinDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "multiTrack.h" #include "HostOrJoinDlg.h" diff --git a/src/xrGameSpy/gamespy/gstats/multiTrack/LoginDlg.cpp b/src/xrGameSpy/gamespy/gstats/multiTrack/LoginDlg.cpp index 551855ab3d..0d924c0269 100644 --- a/src/xrGameSpy/gamespy/gstats/multiTrack/LoginDlg.cpp +++ b/src/xrGameSpy/gamespy/gstats/multiTrack/LoginDlg.cpp @@ -1,7 +1,7 @@ // LoginDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "multiTrack.h" #include "LoginDlg.h" #include "../../common/gsAvailable.h" diff --git a/src/xrGameSpy/gamespy/gstats/multiTrack/StdAfx.cpp b/src/xrGameSpy/gamespy/gstats/multiTrack/StdAfx.cpp index b3f2678fac..04d5f8071c 100644 --- a/src/xrGameSpy/gamespy/gstats/multiTrack/StdAfx.cpp +++ b/src/xrGameSpy/gamespy/gstats/multiTrack/StdAfx.cpp @@ -2,7 +2,7 @@ // multiTrack.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/xrGameSpy/gamespy/gstats/multiTrack/StdAfx.h b/src/xrGameSpy/gamespy/gstats/multiTrack/StdAfx.h index bb112d1dcc..f6a4b54848 100644 --- a/src/xrGameSpy/gamespy/gstats/multiTrack/StdAfx.h +++ b/src/xrGameSpy/gamespy/gstats/multiTrack/StdAfx.h @@ -20,7 +20,7 @@ #endif // _AFX_NO_AFXCMN_SUPPORT #include "../gstats.h" -#include "../../gp/gp.h" +#include "../../GP/gp.h" #include "../../ghttp/ghttp.h" #include "../../gt2/gt2.h" #include "../../gt2/gt2Encode.h" diff --git a/src/xrGameSpy/gamespy/gstats/multiTrack/WaitingDlg.cpp b/src/xrGameSpy/gamespy/gstats/multiTrack/WaitingDlg.cpp index ece81363c4..963799fe93 100644 --- a/src/xrGameSpy/gamespy/gstats/multiTrack/WaitingDlg.cpp +++ b/src/xrGameSpy/gamespy/gstats/multiTrack/WaitingDlg.cpp @@ -1,7 +1,7 @@ // WaitingDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "multiTrack.h" #include "WaitingDlg.h" diff --git a/src/xrGameSpy/gamespy/gstats/multiTrack/multiTrack.cpp b/src/xrGameSpy/gamespy/gstats/multiTrack/multiTrack.cpp index 35d0f3e65c..859b0c5409 100644 --- a/src/xrGameSpy/gamespy/gstats/multiTrack/multiTrack.cpp +++ b/src/xrGameSpy/gamespy/gstats/multiTrack/multiTrack.cpp @@ -1,7 +1,7 @@ // multiTrack.cpp : Defines the class behaviors for the application. // -#include "stdafx.h" +#include "StdAfx.h" #include "multiTrack.h" #include "multiTrackDlg.h" diff --git a/src/xrGameSpy/gamespy/gstats/multiTrack/multiTrackDlg.cpp b/src/xrGameSpy/gamespy/gstats/multiTrack/multiTrackDlg.cpp index eaebd526aa..88f34354ff 100644 --- a/src/xrGameSpy/gamespy/gstats/multiTrack/multiTrackDlg.cpp +++ b/src/xrGameSpy/gamespy/gstats/multiTrack/multiTrackDlg.cpp @@ -1,10 +1,10 @@ // multiTrackDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "multiTrack.h" #include "multiTrackDlg.h" -#include "waitingDlg.h" +#include "WaitingDlg.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/src/xrGameSpy/gamespy/gstats/multiTrack/multiTrackDlg.h b/src/xrGameSpy/gamespy/gstats/multiTrack/multiTrackDlg.h index 72e2ccce27..3b024b1473 100644 --- a/src/xrGameSpy/gamespy/gstats/multiTrack/multiTrackDlg.h +++ b/src/xrGameSpy/gamespy/gstats/multiTrack/multiTrackDlg.h @@ -6,7 +6,7 @@ #include "LoginDlg.h" #include "HostOrJoinDlg.h" -#include "..\..\GT2\gt2.h" // Added by ClassView +#include "../../gt2/gt2.h" #include "WaitingDlg.h" // Added by ClassView #if _MSC_VER > 1000 diff --git a/src/xrGameSpy/gamespy/gstats/track/LoginDlg.cpp b/src/xrGameSpy/gamespy/gstats/track/LoginDlg.cpp index b516d467e2..a57419348c 100644 --- a/src/xrGameSpy/gamespy/gstats/track/LoginDlg.cpp +++ b/src/xrGameSpy/gamespy/gstats/track/LoginDlg.cpp @@ -1,11 +1,11 @@ // LoginDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "track.h" #include "LoginDlg.h" -#include "../../gp/gp.h" +#include "../../GP/gp.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/src/xrGameSpy/gamespy/gstats/track/StdAfx.cpp b/src/xrGameSpy/gamespy/gstats/track/StdAfx.cpp index e8ee176511..7803dff325 100644 --- a/src/xrGameSpy/gamespy/gstats/track/StdAfx.cpp +++ b/src/xrGameSpy/gamespy/gstats/track/StdAfx.cpp @@ -2,7 +2,7 @@ // track.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/xrGameSpy/gamespy/gstats/track/track.cpp b/src/xrGameSpy/gamespy/gstats/track/track.cpp index b4a1e2102f..aef0812a64 100644 --- a/src/xrGameSpy/gamespy/gstats/track/track.cpp +++ b/src/xrGameSpy/gamespy/gstats/track/track.cpp @@ -1,7 +1,7 @@ // track.cpp : Defines the class behaviors for the application. // -#include "stdafx.h" +#include "StdAfx.h" #include "track.h" #include "trackDlg.h" diff --git a/src/xrGameSpy/gamespy/gstats/track/trackDlg.cpp b/src/xrGameSpy/gamespy/gstats/track/trackDlg.cpp index 85842526b2..b1dabf87df 100644 --- a/src/xrGameSpy/gamespy/gstats/track/trackDlg.cpp +++ b/src/xrGameSpy/gamespy/gstats/track/trackDlg.cpp @@ -1,7 +1,7 @@ // trackDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "track.h" #include "trackDlg.h" diff --git a/src/xrGameSpy/gamespy/gt2/gt2test/StdAfx.cpp b/src/xrGameSpy/gamespy/gt2/gt2test/StdAfx.cpp index 239320447d..5f39b895ea 100644 --- a/src/xrGameSpy/gamespy/gt2/gt2test/StdAfx.cpp +++ b/src/xrGameSpy/gamespy/gt2/gt2test/StdAfx.cpp @@ -2,7 +2,7 @@ // gt2test.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/xrGameSpy/gamespy/gt2/gt2test/gt2test.cpp b/src/xrGameSpy/gamespy/gt2/gt2test/gt2test.cpp index c17cc17a95..48f2770db6 100644 --- a/src/xrGameSpy/gamespy/gt2/gt2test/gt2test.cpp +++ b/src/xrGameSpy/gamespy/gt2/gt2test/gt2test.cpp @@ -1,7 +1,7 @@ // gt2test.cpp : Defines the class behaviors for the application. // -#include "stdafx.h" +#include "StdAfx.h" #include "gt2test.h" #include "gt2testDlg.h" diff --git a/src/xrGameSpy/gamespy/gt2/gt2test/gt2testDlg.cpp b/src/xrGameSpy/gamespy/gt2/gt2test/gt2testDlg.cpp index 6f63123fe5..037d999c9d 100644 --- a/src/xrGameSpy/gamespy/gt2/gt2test/gt2testDlg.cpp +++ b/src/xrGameSpy/gamespy/gt2/gt2test/gt2testDlg.cpp @@ -1,7 +1,7 @@ // gt2testDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "gt2test.h" #include "gt2testDlg.h" diff --git a/src/xrGameSpy/gamespy/sc/scRaceSample/HostOrJoinDlg.cpp b/src/xrGameSpy/gamespy/sc/scRaceSample/HostOrJoinDlg.cpp index d273b233b3..7edc4d8db1 100644 --- a/src/xrGameSpy/gamespy/sc/scRaceSample/HostOrJoinDlg.cpp +++ b/src/xrGameSpy/gamespy/sc/scRaceSample/HostOrJoinDlg.cpp @@ -1,7 +1,7 @@ // HostOrJoinDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "ScRaceSample.h" #include "HostOrJoinDlg.h" diff --git a/src/xrGameSpy/gamespy/sc/scRaceSample/LoginDlg.cpp b/src/xrGameSpy/gamespy/sc/scRaceSample/LoginDlg.cpp index 63edf0a9f9..8e8f6b9fac 100644 --- a/src/xrGameSpy/gamespy/sc/scRaceSample/LoginDlg.cpp +++ b/src/xrGameSpy/gamespy/sc/scRaceSample/LoginDlg.cpp @@ -1,7 +1,7 @@ // LoginDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "ScRaceSample.h" #include "LoginDlg.h" #include "../../common/gsAvailable.h" diff --git a/src/xrGameSpy/gamespy/sc/scRaceSample/ScRaceSample.cpp b/src/xrGameSpy/gamespy/sc/scRaceSample/ScRaceSample.cpp index a2ef40a4c2..63ec441a8a 100644 --- a/src/xrGameSpy/gamespy/sc/scRaceSample/ScRaceSample.cpp +++ b/src/xrGameSpy/gamespy/sc/scRaceSample/ScRaceSample.cpp @@ -1,7 +1,7 @@ // ScRaceSample.cpp : Defines the class behaviors for the application. // -#include "stdafx.h" +#include "StdAfx.h" #include "ScRaceSample.h" #include "ScRaceSampleDlg.h" diff --git a/src/xrGameSpy/gamespy/sc/scRaceSample/ScRaceSampleDlg.cpp b/src/xrGameSpy/gamespy/sc/scRaceSample/ScRaceSampleDlg.cpp index 327257d2ca..39c3f4ba6e 100644 --- a/src/xrGameSpy/gamespy/sc/scRaceSample/ScRaceSampleDlg.cpp +++ b/src/xrGameSpy/gamespy/sc/scRaceSample/ScRaceSampleDlg.cpp @@ -1,10 +1,10 @@ // ScRaceSampleDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "ScRaceSample.h" #include "ScRaceSampleDlg.h" -#include "waitingDlg.h" +#include "WaitingDlg.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/src/xrGameSpy/gamespy/sc/scRaceSample/ScRaceSampleDlg.h b/src/xrGameSpy/gamespy/sc/scRaceSample/ScRaceSampleDlg.h index 9476a5408e..0b28b81dd2 100644 --- a/src/xrGameSpy/gamespy/sc/scRaceSample/ScRaceSampleDlg.h +++ b/src/xrGameSpy/gamespy/sc/scRaceSample/ScRaceSampleDlg.h @@ -6,8 +6,8 @@ #include "LoginDlg.h" #include "HostOrJoinDlg.h" -#include "..\..\GT2\gt2.h" // Added by ClassView -#include "..\..\GT2\gt2Encode.h" +#include "../../gt2/gt2.h" +#include "../../gt2/gt2Encode.h" #include "WaitingDlg.h" // Added by ClassView #if _MSC_VER > 1000 diff --git a/src/xrGameSpy/gamespy/sc/scRaceSample/StdAfx.cpp b/src/xrGameSpy/gamespy/sc/scRaceSample/StdAfx.cpp index d6947a3ed5..555a52be6e 100644 --- a/src/xrGameSpy/gamespy/sc/scRaceSample/StdAfx.cpp +++ b/src/xrGameSpy/gamespy/sc/scRaceSample/StdAfx.cpp @@ -2,7 +2,7 @@ // ScRaceSample.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/xrGameSpy/gamespy/sc/scRaceSample/StdAfx.h b/src/xrGameSpy/gamespy/sc/scRaceSample/StdAfx.h index 7a5d96ce4d..91a203d137 100644 --- a/src/xrGameSpy/gamespy/sc/scRaceSample/StdAfx.h +++ b/src/xrGameSpy/gamespy/sc/scRaceSample/StdAfx.h @@ -23,7 +23,7 @@ #include "../sc.h" //#include "atlas_Competition_Race_Sample_App_v1.h" // Admin Site generated Header file #include "atlas_sc_race_v1.h" // Admin Site generated Header file -#include "../../gp/gp.h" +#include "../../GP/gp.h" //{{AFX_INSERT_LOCATION}} diff --git a/src/xrGameSpy/gamespy/sc/scRaceSample/WaitingDlg.cpp b/src/xrGameSpy/gamespy/sc/scRaceSample/WaitingDlg.cpp index 0ec9655e2a..386b0c945d 100644 --- a/src/xrGameSpy/gamespy/sc/scRaceSample/WaitingDlg.cpp +++ b/src/xrGameSpy/gamespy/sc/scRaceSample/WaitingDlg.cpp @@ -1,7 +1,7 @@ // WaitingDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "ScRaceSample.h" #include "WaitingDlg.h" diff --git a/src/xrGameSpy/gamespy/serverbrowsing/sbmfcsample/StdAfx.cpp b/src/xrGameSpy/gamespy/serverbrowsing/sbmfcsample/StdAfx.cpp index 40993f55d0..31b0996b7c 100644 --- a/src/xrGameSpy/gamespy/serverbrowsing/sbmfcsample/StdAfx.cpp +++ b/src/xrGameSpy/gamespy/serverbrowsing/sbmfcsample/StdAfx.cpp @@ -2,7 +2,7 @@ // sbmfcsample.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information -#include "stdafx.h" +#include "StdAfx.h" diff --git a/src/xrGameSpy/gamespy/serverbrowsing/sbmfcsample/sbmfcsample.cpp b/src/xrGameSpy/gamespy/serverbrowsing/sbmfcsample/sbmfcsample.cpp index ec3e7e2133..50bc955f13 100644 --- a/src/xrGameSpy/gamespy/serverbrowsing/sbmfcsample/sbmfcsample.cpp +++ b/src/xrGameSpy/gamespy/serverbrowsing/sbmfcsample/sbmfcsample.cpp @@ -1,7 +1,7 @@ // sbmfcsample.cpp : Defines the class behaviors for the application. // -#include "stdafx.h" +#include "StdAfx.h" #include "sbmfcsample.h" #include "sbmfcsampleDlg.h" diff --git a/src/xrGameSpy/gamespy/serverbrowsing/sbmfcsample/sbmfcsampleDlg.cpp b/src/xrGameSpy/gamespy/serverbrowsing/sbmfcsample/sbmfcsampleDlg.cpp index 1c4dcd92c9..78ccb49c72 100644 --- a/src/xrGameSpy/gamespy/serverbrowsing/sbmfcsample/sbmfcsampleDlg.cpp +++ b/src/xrGameSpy/gamespy/serverbrowsing/sbmfcsample/sbmfcsampleDlg.cpp @@ -1,7 +1,7 @@ // sbmfcsampleDlg.cpp : implementation file // -#include "stdafx.h" +#include "StdAfx.h" #include "sbmfcsample.h" #include "sbmfcsampleDlg.h" diff --git a/src/xrGameSpy/gamespy/serverbrowsing/sbmfcsample/sbmfcsampleDlg.h b/src/xrGameSpy/gamespy/serverbrowsing/sbmfcsample/sbmfcsampleDlg.h index 5d322a3401..e3783d21af 100644 --- a/src/xrGameSpy/gamespy/serverbrowsing/sbmfcsample/sbmfcsampleDlg.h +++ b/src/xrGameSpy/gamespy/serverbrowsing/sbmfcsample/sbmfcsampleDlg.h @@ -12,9 +12,9 @@ // CSbmfcsampleDlg dialog //SB - header -#include "..\sb_serverbrowsing.h" -#include "..\..\qr2\qr2regkeys.h" -#include "..\..\common\gsAvailable.h" +#include "../sb_serverbrowsing.h" +#include "../../qr2/qr2regkeys.h" +#include "../../common/gsAvailable.h" class CSbmfcsampleDlg : public CDialog { diff --git a/src/xrGameSpy/xrGameSpy_ATLAS.cpp b/src/xrGameSpy/xrGameSpy_ATLAS.cpp index 6e24a650d5..f2485efd28 100644 --- a/src/xrGameSpy/xrGameSpy_ATLAS.cpp +++ b/src/xrGameSpy/xrGameSpy_ATLAS.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "xrGameSpy_MainDefs.h" #include "xrGameSpy_ATLAS.h" -#include "GameSpy/GP/gp.h" +#include "gamespy/GP/gp.h" XRGAMESPY_API gsi_u32 xrGS_wsLoginProfile(const gsi_char * profileNick, const gsi_char * email, diff --git a/src/xrGameSpy/xrGameSpy_ATLAS.h b/src/xrGameSpy/xrGameSpy_ATLAS.h index 9105a6d7ac..4dfc0b9864 100644 --- a/src/xrGameSpy/xrGameSpy_ATLAS.h +++ b/src/xrGameSpy/xrGameSpy_ATLAS.h @@ -3,7 +3,7 @@ #include "xrGameSpy_MainDefs.h" -#include "GameSpy/sc/sc.h" +#include "gamespy/sc/sc.h" extern "C" { diff --git a/src/xrGameSpy/xrGameSpy_Available.h b/src/xrGameSpy/xrGameSpy_Available.h index 67ae25ed7e..2ac3ed806a 100644 --- a/src/xrGameSpy/xrGameSpy_Available.h +++ b/src/xrGameSpy/xrGameSpy_Available.h @@ -1,8 +1,8 @@ #pragma once #include "xrGameSpy_MainDefs.h" -#include "GameSpy\nonport.h" -#include "GameSpy\common\gsAvailable.h" +#include "gamespy/nonport.h" +#include "gamespy/common/gsAvailable.h" extern "C" { diff --git a/src/xrGameSpy/xrGameSpy_CDKey.cpp b/src/xrGameSpy/xrGameSpy_CDKey.cpp index 647bbcbbd4..c591020078 100644 --- a/src/xrGameSpy/xrGameSpy_CDKey.cpp +++ b/src/xrGameSpy/xrGameSpy_CDKey.cpp @@ -4,8 +4,8 @@ #include "xrGameSpy_CDKey.h" -#include "GameSpy/gcdkey/gcdkeyc.h" -#include "GameSpy/gcdkey/gcdkeys.h" +#include "gamespy/gcdkey/gcdkeyc.h" +#include "gamespy/gcdkey/gcdkeys.h" diff --git a/src/xrGameSpy/xrGameSpy_CDKey.h b/src/xrGameSpy/xrGameSpy_CDKey.h index 68c1230506..d871e02fd6 100644 --- a/src/xrGameSpy/xrGameSpy_CDKey.h +++ b/src/xrGameSpy/xrGameSpy_CDKey.h @@ -1,7 +1,7 @@ #pragma once #include "xrGameSpy_MainDefs.h" -#include "GameSpy/qr2/qr2.h" -#include "GameSpy/gcdkey/gcdkeys.h" +#include "gamespy/qr2/qr2.h" +#include "gamespy/gcdkey/gcdkeys.h" extern "C" { diff --git a/src/xrGameSpy/xrGameSpy_Core.h b/src/xrGameSpy/xrGameSpy_Core.h index 78b9a8f5fc..11a6435480 100644 --- a/src/xrGameSpy/xrGameSpy_Core.h +++ b/src/xrGameSpy/xrGameSpy_Core.h @@ -2,7 +2,7 @@ #define XRGAMESPY_CORE #include "xrGameSpy_MainDefs.h" -#include "GameSpy/common/gsCore.h" +#include "gamespy/common/gsCore.h" extern "C" { diff --git a/src/xrGameSpy/xrGameSpy_GP.h b/src/xrGameSpy/xrGameSpy_GP.h index c6eb14b00d..adb19c0bd6 100644 --- a/src/xrGameSpy/xrGameSpy_GP.h +++ b/src/xrGameSpy/xrGameSpy_GP.h @@ -2,7 +2,7 @@ #define XRGAMESPY_GP #include "xrGameSpy_MainDefs.h" -#include "GameSpy/GP/gp.h" +#include "gamespy/GP/gp.h" extern "C" { diff --git a/src/xrGameSpy/xrGameSpy_QR2.h b/src/xrGameSpy/xrGameSpy_QR2.h index af2c2d9ae2..e41ae7c62b 100644 --- a/src/xrGameSpy/xrGameSpy_QR2.h +++ b/src/xrGameSpy/xrGameSpy_QR2.h @@ -1,8 +1,8 @@ #pragma once #include "xrGameSpy_MainDefs.h" -#include "GameSpy\QR2\qr2regkeys.h" -#include "GameSpy\QR2\qr2.h" +#include "gamespy/qr2/qr2regkeys.h" +#include "gamespy/qr2/qr2.h" extern "C" diff --git a/src/xrGameSpy/xrGameSpy_SAKE.h b/src/xrGameSpy/xrGameSpy_SAKE.h index f4bc810db5..dca48c1a7f 100644 --- a/src/xrGameSpy/xrGameSpy_SAKE.h +++ b/src/xrGameSpy/xrGameSpy_SAKE.h @@ -2,7 +2,7 @@ #define XRGAMESPY_SAKE #include "xrGameSpy_MainDefs.h" -#include "GameSpy/sake/sake.h" +#include "gamespy/sake/sake.h" extern "C" { diff --git a/src/xrGameSpy/xrGameSpy_ServerBrowser.h b/src/xrGameSpy/xrGameSpy_ServerBrowser.h index ac4241acc7..bc10cefc7d 100644 --- a/src/xrGameSpy/xrGameSpy_ServerBrowser.h +++ b/src/xrGameSpy/xrGameSpy_ServerBrowser.h @@ -1,7 +1,7 @@ #pragma once #include "xrGameSpy_MainDefs.h" -#include "GameSpy\ServerBrowsing\sb_serverbrowsing.h" +#include "gamespy/serverbrowsing/sb_serverbrowsing.h" extern "C" { diff --git a/src/xrNetServer/BaseClient.h b/src/xrNetServer/BaseClient.h index 8ea1e8a9c3..546833ab0a 100644 --- a/src/xrNetServer/BaseClient.h +++ b/src/xrNetServer/BaseClient.h @@ -1,5 +1,5 @@ #pragma once -#include "net_shared.h" +#include "NET_Shared.h" #include "NET_Common.h" #include "ClientConnectionOptions.h" #include "IClientStatistic.h" diff --git a/src/xrNetServer/NET_AuthCheck.h b/src/xrNetServer/NET_AuthCheck.h index eef4f4cd5c..45eb4d428c 100644 --- a/src/xrNetServer/NET_AuthCheck.h +++ b/src/xrNetServer/NET_AuthCheck.h @@ -1,7 +1,7 @@ #ifndef NET_AUTH_CHECK_INCLUDED #define NET_AUTH_CHECK_INCLUDED -#include "net_shared.h" +#include "NET_Shared.h" typedef xr_vector xr_auth_strings_t; void XRNETSERVER_API fill_auth_check_params (xr_auth_strings_t & ignore, diff --git a/src/xrNetServer/NET_Compressor.h b/src/xrNetServer/NET_Compressor.h index cd0e0c7e8e..7c91808206 100644 --- a/src/xrNetServer/NET_Compressor.h +++ b/src/xrNetServer/NET_Compressor.h @@ -2,7 +2,7 @@ #define AFX_NET_COMPRESSOR_H__21E1ED1C_BF92_4BF0_94A8_18A27486EBFD__INCLUDED_ #pragma once -#include "../xrcore/xrSyncronize.h" +#include "../xrCore/xrSyncronize.h" class XRNETSERVER_API NET_Compressor { diff --git a/src/xrNetServer/NET_Log.cpp b/src/xrNetServer/NET_Log.cpp index d094bc0276..fd246faecb 100644 --- a/src/xrNetServer/NET_Log.cpp +++ b/src/xrNetServer/NET_Log.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "net_log.h" +#include "NET_Log.h" //--------------------------------------------------------- string64 PacketName[] = { "M_UPDATE", // DUAL: Update state diff --git a/src/xrNetServer/NET_Log.h b/src/xrNetServer/NET_Log.h index a6e0be6a9a..18ae4455f0 100644 --- a/src/xrNetServer/NET_Log.h +++ b/src/xrNetServer/NET_Log.h @@ -1,6 +1,6 @@ #pragma once -#include "net_shared.h" +#include "NET_Shared.h" struct SLogPacket { u32 m_u32Time; diff --git a/src/xrNetServer/NET_Shared.h b/src/xrNetServer/NET_Shared.h index 0a1d8d7546..0fb46422a2 100644 --- a/src/xrNetServer/NET_Shared.h +++ b/src/xrNetServer/NET_Shared.h @@ -7,7 +7,7 @@ #include "../xrCore/net_utils.h" #include "NET_Messages.h" -#include "net_compressor.h" +#include "NET_Compressor.h" XRNETSERVER_API extern ClientID BroadcastCID; diff --git a/src/xrNetServer/PlayersMonitor.h b/src/xrNetServer/PlayersMonitor.h index d3999f523e..4b97d0159f 100644 --- a/src/xrNetServer/PlayersMonitor.h +++ b/src/xrNetServer/PlayersMonitor.h @@ -1,5 +1,5 @@ #pragma once -#include "net_shared.h" +#include "NET_Shared.h" #include "NET_Common.h" class IClient; diff --git a/src/xrNetServer/dp_ids.h b/src/xrNetServer/dp_ids.h index affc41bdcb..fc8a0de4cf 100644 --- a/src/xrNetServer/dp_ids.h +++ b/src/xrNetServer/dp_ids.h @@ -1,2 +1,2 @@ #pragma once -#include "net_shared.h" \ No newline at end of file +#include "NET_Shared.h" diff --git a/src/xrParticles/ParticlesObject.cpp b/src/xrParticles/ParticlesObject.cpp index 089a5a1b66..8db96b1748 100644 --- a/src/xrParticles/ParticlesObject.cpp +++ b/src/xrParticles/ParticlesObject.cpp @@ -8,9 +8,9 @@ #include "../xrEngine/defines.h" #include "../Include/xrRender/RenderVisual.h" #include "../Include/xrRender/ParticleCustom.h" -#include "../xrEngine/render.h" +#include "../xrEngine/Render.h" #include "../xrEngine/IGame_Persistent.h" -#include "../xrEngine/environment.h" +#include "../xrEngine/Environment.h" PARTICLES_API const Fvector zero_vel = {0.f,0.f,0.f}; diff --git a/src/xrPhysics/ActorCameraCollision.cpp b/src/xrPhysics/ActorCameraCollision.cpp index 1bbcb2770f..a0fabdfb8f 100644 --- a/src/xrPhysics/ActorCameraCollision.cpp +++ b/src/xrPhysics/ActorCameraCollision.cpp @@ -1,16 +1,16 @@ #include "stdafx.h" //#include "Actor.h" -#include "actorcameracollision.h" +#include "ActorCameraCollision.h" #include "../xrEngine/CameraBase.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" -#include "phworld.h" -#include "phcollidevalidator.h" +#include "PHWorld.h" +#include "PHCollideValidator.h" #include "PHShell.h" #include "matrix_utils.h" -#include "iphysicsshellholder.h" +#include "IPhysicsShellHolder.h" //#include "ai/stalker/ai_stalker.h" #include "GeometryBits.h" diff --git a/src/xrPhysics/CalculateTriangle.h b/src/xrPhysics/CalculateTriangle.h index 6c1c360406..9d28e46178 100644 --- a/src/xrPhysics/CalculateTriangle.h +++ b/src/xrPhysics/CalculateTriangle.h @@ -2,10 +2,10 @@ #include "MathUtils.h" //#include "Level.h" #include "Geometry.h" -#include "tri-colliderknoopc/dtricollidermath.h" +#include "tri-colliderknoopc/dTriColliderMath.h" //#include "../xrengine/IGame_Level.h" #include "ode_redefine.h" -#include "../xrcdb/xr_area.h" +#include "../xrCDB/xr_area.h" //#include "phworld.h" #pragma warning(disable:4995) #pragma warning(disable:4267) diff --git a/src/xrPhysics/ElevatorState.cpp b/src/xrPhysics/ElevatorState.cpp index ba0950a5dd..224aef96cf 100644 --- a/src/xrPhysics/ElevatorState.cpp +++ b/src/xrPhysics/ElevatorState.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include "ElevatorState.h" -#include "IClimableObject.h" +#include "iclimableobject.h" #include "PHCharacter.h" #include "MathUtils.h" #include "PHWorld.h" -#include "../xrengine/device.h" +#include "../xrEngine/device.h" #ifdef DEBUG -#include "../xrEngine/Statgraph.h" +#include "../xrEngine/StatGraph.h" #include "debug_output.h" #endif static const float getting_on_dist =0.3f; diff --git a/src/xrPhysics/ElevatorState.h b/src/xrPhysics/ElevatorState.h index d99c7c02fe..b493af9a71 100644 --- a/src/xrPhysics/ElevatorState.h +++ b/src/xrPhysics/ElevatorState.h @@ -1,7 +1,7 @@ #ifndef ELEVATOR_STAETE #define ELEVATOR_STAETE -#include "ielevatorstate.h" +#include "IElevatorState.h" class CPHCharacter; struct dContact; struct SGameMtl; diff --git a/src/xrPhysics/ExtendedGeom.cpp b/src/xrPhysics/ExtendedGeom.cpp index 6762ddef5e..9db223a547 100644 --- a/src/xrPhysics/ExtendedGeom.cpp +++ b/src/xrPhysics/ExtendedGeom.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "extendedgeom.h" -#include "dcylinder/dcylinder.h" +#include "ExtendedGeom.h" +#include "dcylinder/dCylinder.h" bool IsCyliderContact(const dContact& c) { int geomClass = -1; diff --git a/src/xrPhysics/ExtendedGeom.h b/src/xrPhysics/ExtendedGeom.h index 3ef623694a..c2d9e8fae8 100644 --- a/src/xrPhysics/ExtendedGeom.h +++ b/src/xrPhysics/ExtendedGeom.h @@ -8,7 +8,7 @@ //#include "ode_include.h" #include "../3rd party/ode/include/ode/common.h" #include "../3rd party/ode/include/ode/collision.h" -#include "physicscommon.h" +#include "PhysicsCommon.h" #include "MathUtils.h" #ifdef DEBUG #include "debug_output.h" diff --git a/src/xrPhysics/Geometry.cpp b/src/xrPhysics/Geometry.cpp index 5ca92fe321..31310be291 100644 --- a/src/xrPhysics/Geometry.cpp +++ b/src/xrPhysics/Geometry.cpp @@ -2,7 +2,7 @@ #include "Geometry.h" #include "PHDynamicData.h" #include "ExtendedGeom.h" -#include "dcylinder//dCylinder.h" +#include "dcylinder/dCylinder.h" #include "../xrEngine/bone.h" diff --git a/src/xrPhysics/Geometry.h b/src/xrPhysics/Geometry.h index 8fb6e9286f..3a8678581e 100644 --- a/src/xrPhysics/Geometry.h +++ b/src/xrPhysics/Geometry.h @@ -2,8 +2,8 @@ #define GEOMETRY_H #include "PhysicsCommon.h" #include "ExtendedGeom.h" -#include "mathutilsode.h" -#include "../xrEngine/iphysicsgeometry.h" +#include "MathUtilsOde.h" +#include "../xrEngine/IPhysicsGeometry.h" //this is equivalent dMULTIPLYOP0_333 whith consequent transposion of A #define dMULTIPLYOP3_333(A,op,B,C) \ diff --git a/src/xrPhysics/GeometryBits.cpp b/src/xrPhysics/GeometryBits.cpp index afdc58911d..c11319f883 100644 --- a/src/xrPhysics/GeometryBits.cpp +++ b/src/xrPhysics/GeometryBits.cpp @@ -2,8 +2,8 @@ #include "GeometryBits.h" -#include "phworld.h" -#include "geometry.h" +#include "PHWorld.h" +#include "Geometry.h" enum geom_category { gct_static = 1<< 0, diff --git a/src/xrPhysics/IActivationShape.cpp b/src/xrPhysics/IActivationShape.cpp index 564e98731a..c0e4e13a7e 100644 --- a/src/xrPhysics/IActivationShape.cpp +++ b/src/xrPhysics/IActivationShape.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "iactivationshape.h" -#include "phactivationshape.h" -#include "physics.h" -#include "iphysicsshellholder.h" -#include "phcollidevalidator.h" +#include "IActivationShape.h" +#include "PHActivationShape.h" +#include "Physics.h" +#include "IPhysicsShellHolder.h" +#include "PHCollideValidator.h" void ActivateShapeExplosive( IPhysicsShellHolder* self_obj, const Fvector &size, Fvector &out_size, Fvector &in_out_pos) { PROF_EVENT("ActivateShapeExplosive") diff --git a/src/xrPhysics/IPHStaticGeomShell.h b/src/xrPhysics/IPHStaticGeomShell.h index 2573c7e4ed..ee05e0b59c 100644 --- a/src/xrPhysics/IPHStaticGeomShell.h +++ b/src/xrPhysics/IPHStaticGeomShell.h @@ -1,5 +1,5 @@ #pragma once -#include "physicsexternalcommon.h" +#include "PhysicsExternalCommon.h" class IPHStaticGeomShell { protected: diff --git a/src/xrPhysics/IPHWorld.h b/src/xrPhysics/IPHWorld.h index 522301be99..f646c8dccf 100644 --- a/src/xrPhysics/IPHWorld.h +++ b/src/xrPhysics/IPHWorld.h @@ -1,5 +1,5 @@ #pragma once -#include "physicsexternalcommon.h" +#include "PhysicsExternalCommon.h" #include "iphysics_scripted.h" class CPhysicsShell; class IPHWorldUpdateCallbck diff --git a/src/xrPhysics/MathUtils.cpp b/src/xrPhysics/MathUtils.cpp index 20cb716fe5..2e191889f1 100644 --- a/src/xrPhysics/MathUtils.cpp +++ b/src/xrPhysics/MathUtils.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "mathutils.h" +#include "MathUtils.h" #include "../3rd party/ode/include/ode/common.h" XRPHYSICS_API const float phInfinity = dInfinity; /* diff --git a/src/xrPhysics/MathUtilsOde.h b/src/xrPhysics/MathUtilsOde.h index 369df5b0d8..edfa4f7a0d 100644 --- a/src/xrPhysics/MathUtilsOde.h +++ b/src/xrPhysics/MathUtilsOde.h @@ -10,7 +10,7 @@ #include "../3rd party/ode/include/ode/collision.h" #include "../3rd party/ode/include/ode/matrix.h" -#include "mathutils.h" +#include "MathUtils.h" #include "ode_redefine.h" static const dReal accurate_normalize_epsilon = 1.192092896e-05F; diff --git a/src/xrPhysics/MovementBoxDynamicActivate.cpp b/src/xrPhysics/MovementBoxDynamicActivate.cpp index 258b06d336..17fdc85c7f 100644 --- a/src/xrPhysics/MovementBoxDynamicActivate.cpp +++ b/src/xrPhysics/MovementBoxDynamicActivate.cpp @@ -1,15 +1,15 @@ #include "stdafx.h" -#include "movementboxdynamicactivate.h" +#include "MovementBoxDynamicActivate.h" #include "ExtendedGeom.h" #include "MathUtils.h" #include "Physics.h" #include "ph_valid_ode.h" #include "MathUtilsOde.h" -#include "iphysicsshellholder.h" -#include "phcharacter.h" -#include "../xrEngine/gamemtllib.h" +#include "IPhysicsShellHolder.h" +#include "PHCharacter.h" +#include "../xrEngine/GameMtlLib.h" ObjectContactCallbackFun* saved_callback = 0 ; static float max_depth = 0.f ; diff --git a/src/xrPhysics/PHAICharacter.cpp b/src/xrPhysics/PHAICharacter.cpp index 2ed3cbe0bc..990aa53e07 100644 --- a/src/xrPhysics/PHAICharacter.cpp +++ b/src/xrPhysics/PHAICharacter.cpp @@ -4,10 +4,10 @@ #include "Physics.h" #include "ExtendedGeom.h" #include "../xrEngine/cl_intersect.h" -#include "tri-colliderKNoOPC\__aabb_tri.h" +#include "tri-colliderknoopc/__aabb_tri.h" -#include "phaicharacter.h" -#include "../xrengine/device.h" +#include "PHAICharacter.h" +#include "../xrEngine/device.h" #ifdef DEBUG # include "debug_output.h" diff --git a/src/xrPhysics/PHActivationShape.cpp b/src/xrPhysics/PHActivationShape.cpp index 9c0ccae130..ad46a4f1fb 100644 --- a/src/xrPhysics/PHActivationShape.cpp +++ b/src/xrPhysics/PHActivationShape.cpp @@ -3,12 +3,12 @@ #include "Physics.h" #include "MathUtils.h" -#include "phvalidevalues.h" +#include "PHValideValues.h" -#include "Extendedgeom.h" +#include "ExtendedGeom.h" #include "SpaceUtils.h" #include "MathUtils.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" //#include "Level.h" #include "PHWorld.h" #include "../3rd party/ode/ode/src/util.h" @@ -18,8 +18,8 @@ #endif // DEBUG #include "PHDynamicData.h" -#include "../xrserverentities/PHSynchronize.h" -#include "../xrserverentities/phnetstate.h" +#include "../xrServerEntities/PHSynchronize.h" +#include "../xrServerEntities/PHNetState.h" static float max_depth =0.f; static float friction_factor =0.f; static const float cfm =1.e-10f; diff --git a/src/xrPhysics/PHActivationShape.h b/src/xrPhysics/PHActivationShape.h index fb5f22faa2..07836914be 100644 --- a/src/xrPhysics/PHActivationShape.h +++ b/src/xrPhysics/PHActivationShape.h @@ -2,7 +2,7 @@ #define PH_ACTIVATION_SHAPE #endif -#include "phvalidevalues.h" +#include "PHValideValues.h" #include "PHObject.h" class IPhysicsShellHolder; class CPHActivationShape : public CPHObject diff --git a/src/xrPhysics/PHActorCharacter.cpp b/src/xrPhysics/PHActorCharacter.cpp index c345f5e47a..b9733eae86 100644 --- a/src/xrPhysics/PHActorCharacter.cpp +++ b/src/xrPhysics/PHActorCharacter.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" -#include "phactorcharacter.h" -#include "Extendedgeom.h" +#include "PHActorCharacter.h" +#include "ExtendedGeom.h" #include "PhysicsCommon.h" //#include "GameObject.h" #include "IPhysicsShellHolder.h" //#include "ai/stalker/ai_stalker.h" //#include "Actor.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" //#include "Level.h" //const float JUMP_HIGHT=0.5; diff --git a/src/xrPhysics/PHActorCharacter.h b/src/xrPhysics/PHActorCharacter.h index f4865fe7e2..de99472fca 100644 --- a/src/xrPhysics/PHActorCharacter.h +++ b/src/xrPhysics/PHActorCharacter.h @@ -1,7 +1,7 @@ #pragma once #include "ExtendedGeom.h" -#include "phsimplecharacter.h" +#include "PHSimpleCharacter.h" #include "PHActorCharacterInline.h" class CPhysicShellHolder; diff --git a/src/xrPhysics/PHCapture.cpp b/src/xrPhysics/PHCapture.cpp index 963d173f3c..24e3b6bf51 100644 --- a/src/xrPhysics/PHCapture.cpp +++ b/src/xrPhysics/PHCapture.cpp @@ -1,19 +1,19 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// -#include "StdAfx.h" +#include "stdafx.h" #include "PHCapture.h" -#include "phcharacter.h" +#include "PHCharacter.h" #include "Physics.h" #include "ExtendedGeom.h" //#include "entity_alive.h" //#include "phmovementcontrol.h" #include "../Include/xrRender/Kinematics.h" -#include "iphysicsshellholder.h" -#include "../xrengine/bone.h" -#include "../xrengine/device.h" -#include "mathutilsode.h" -#include "phelement.h" +#include "IPhysicsShellHolder.h" +#include "../xrEngine/bone.h" +#include "../xrEngine/device.h" +#include "MathUtilsOde.h" +#include "PHElement.h" //#include "characterphysicssupport.h" /////////////////////////////////////////////////////////////////////////////////// diff --git a/src/xrPhysics/PHCapture.h b/src/xrPhysics/PHCapture.h index 2a1e0dae25..61f2028712 100644 --- a/src/xrPhysics/PHCapture.h +++ b/src/xrPhysics/PHCapture.h @@ -3,12 +3,12 @@ #define PH_CAPTURE_H //#include "phobject.h" -#include "phupdateobject.h" +#include "PHUpdateObject.h" //#include "gameobject.h" //#include "physicsshellholder.h" -#include "phisland.h" +#include "PHIsland.h" #include "../3rd party/ode/include/ode/common.h" -#include "iphcapture.h" +#include "IPHCapture.h" class IPhysicsShellHolder; class CPHCharacter; class CPhysicsElement; diff --git a/src/xrPhysics/PHCaptureInit.cpp b/src/xrPhysics/PHCaptureInit.cpp index 0204ca8ab2..2786475f5c 100644 --- a/src/xrPhysics/PHCaptureInit.cpp +++ b/src/xrPhysics/PHCaptureInit.cpp @@ -1,13 +1,13 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// -#include "StdAfx.h" -#include "phcharacter.h" +#include "stdafx.h" +#include "PHCharacter.h" #include "Physics.h" #include "ExtendedGeom.h" #include "PHCapture.h" #include "../Include/xrRender/Kinematics.h" -#include "iphysicsshellholder.h" -#include "../xrengine/bone.h" -#include "../xrengine/device.h" +#include "IPhysicsShellHolder.h" +#include "../xrEngine/bone.h" +#include "../xrEngine/device.h" extern class CPHWorld *ph_world; @@ -242,7 +242,7 @@ void CPHCapture::Release() e_state = cstReleased; } -#include "phelement.h" +#include "PHElement.h" void CPHCapture::Deactivate() { Release(); diff --git a/src/xrPhysics/PHCharacter.cpp b/src/xrPhysics/PHCharacter.cpp index 890f417bd5..e66b41564e 100644 --- a/src/xrPhysics/PHCharacter.cpp +++ b/src/xrPhysics/PHCharacter.cpp @@ -1,19 +1,19 @@ #include "stdafx.h" -#include "phcharacter.h" +#include "PHCharacter.h" #include "PHDynamicData.h" #include "Physics.h" #include "ExtendedGeom.h" -#include "iphysicsshellholder.h" +#include "IPhysicsShellHolder.h" #include "../xrEngine/cl_intersect.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" -#include "tri-colliderKNoOPC\__aabb_tri.h" +#include "tri-colliderknoopc/__aabb_tri.h" #include "../3rd party/ode/ode/src/util.h" #include "ph_valid_ode.h" -#include "Phaicharacter.h" -#include "phactorcharacter.h" +#include "PHAICharacter.h" +#include "PHActorCharacter.h" CPHCharacter::CPHCharacter(void): CPHDisablingTranslational() diff --git a/src/xrPhysics/PHCharacter.h b/src/xrPhysics/PHCharacter.h index ff891be1c7..746104cac7 100644 --- a/src/xrPhysics/PHCharacter.h +++ b/src/xrPhysics/PHCharacter.h @@ -4,10 +4,10 @@ #endif #include "PHObject.h" #include "PHInterpolation.h" -#include "../xrserverentities/PHSynchronize.h" +#include "../xrServerEntities/PHSynchronize.h" #include "PHDisabling.h" -#include "../xrEngine/iphysicsshell.h" +#include "../xrEngine/IPhysicsShell.h" class IPhysicsShellHolder; diff --git a/src/xrPhysics/PHCollideValidator.cpp b/src/xrPhysics/PHCollideValidator.cpp index a165b6b8f8..e496f13f2c 100644 --- a/src/xrPhysics/PHCollideValidator.cpp +++ b/src/xrPhysics/PHCollideValidator.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "PHObject.h" -#include "phcollidevalidator.h" +#include "PHCollideValidator.h" CGID CPHCollideValidator::freeGroupID=0; _flags CPHCollideValidator::ClassFlags={CLClassBits(0)}; diff --git a/src/xrPhysics/PHCollideValidator.h b/src/xrPhysics/PHCollideValidator.h index 8b136e45b6..36828ff2ce 100644 --- a/src/xrPhysics/PHCollideValidator.h +++ b/src/xrPhysics/PHCollideValidator.h @@ -3,7 +3,7 @@ -#include "icollidevalidator.h" +#include "ICollideValidator.h" typedef u32 CLClassBits; typedef u32 CLBits; class CPHObject; diff --git a/src/xrPhysics/PHContactBodyEffector.cpp b/src/xrPhysics/PHContactBodyEffector.cpp index c3001bdfd0..dadf3f63e5 100644 --- a/src/xrPhysics/PHContactBodyEffector.cpp +++ b/src/xrPhysics/PHContactBodyEffector.cpp @@ -3,8 +3,8 @@ #include "ExtendedGeom.h" #include "tri-colliderknoopc/dTriList.h" #include "PhysicsCommon.h" -#include "../xrEngine/gamemtllib.h" -#include "mathutilsode.h" +#include "../xrEngine/GameMtlLib.h" +#include "MathUtilsOde.h" void CPHContactBodyEffector::Init(dBodyID body,const dContact& contact,SGameMtl* material) { CPHBaseBodyEffector::Init(body); diff --git a/src/xrPhysics/PHDisabling.cpp b/src/xrPhysics/PHDisabling.cpp index 3e09ff3d72..ffb5aeec14 100644 --- a/src/xrPhysics/PHDisabling.cpp +++ b/src/xrPhysics/PHDisabling.cpp @@ -2,7 +2,7 @@ #include "PHDisabling.h" #include "PhysicsCommon.h" #include "Physics.h" -#include "mathutilsode.h" +#include "MathUtilsOde.h" #ifdef DEBUG #include "debug_output.h" #endif diff --git a/src/xrPhysics/PHElement.cpp b/src/xrPhysics/PHElement.cpp index 5c3241d939..e12c371263 100644 --- a/src/xrPhysics/PHElement.cpp +++ b/src/xrPhysics/PHElement.cpp @@ -1,4 +1,4 @@ -#include "StdAfx.h" +#include "stdafx.h" #include "PHDynamicData.h" #include "Physics.h" #include "tri-colliderknoopc/dTriList.h" diff --git a/src/xrPhysics/PHElement.h b/src/xrPhysics/PHElement.h index ed45d581ee..1709992df0 100644 --- a/src/xrPhysics/PHElement.h +++ b/src/xrPhysics/PHElement.h @@ -3,9 +3,9 @@ ///////////////////////////Implemetation//for//CPhysicsElement////////////////// //////////////////////////////////////////////////////////////////////////////// #include "Geometry.h" -#include "phdefs.h" +#include "PHDefs.h" #include "PhysicsCommon.h" -#include "../xrserverentities/PHSynchronize.h" +#include "../xrServerEntities/PHSynchronize.h" #include "PHDisabling.h" #include "PHGeometryOwner.h" #include "PHInterpolation.h" diff --git a/src/xrPhysics/PHElementNetState.cpp b/src/xrPhysics/PHElementNetState.cpp index a84583c88d..25c03d2f70 100644 --- a/src/xrPhysics/PHElementNetState.cpp +++ b/src/xrPhysics/PHElementNetState.cpp @@ -1,10 +1,10 @@ -#include "StdAfx.h" -#include "physicsshell.h" -#include "phinterpolation.h" -#include "phelement.h" -#include "phobject.h" -#include "phworld.h" -#include "phshell.h" +#include "stdafx.h" +#include "PhysicsShell.h" +#include "PHInterpolation.h" +#include "PHElement.h" +#include "PHObject.h" +#include "PHWorld.h" +#include "PHShell.h" void CPHElement::get_State(SPHNetState& state) { diff --git a/src/xrPhysics/PHGeometryOwner.cpp b/src/xrPhysics/PHGeometryOwner.cpp index 105db6c59e..c160087dc8 100644 --- a/src/xrPhysics/PHGeometryOwner.cpp +++ b/src/xrPhysics/PHGeometryOwner.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "PHGeometryOwner.h" -#include "phworld.h" +#include "PHWorld.h" #include "../Include/xrRender/Kinematics.h" #include "../xrEngine/bone.h" diff --git a/src/xrPhysics/PHGeometryOwner.h b/src/xrPhysics/PHGeometryOwner.h index 2ba9946e51..98f3875f23 100644 --- a/src/xrPhysics/PHGeometryOwner.h +++ b/src/xrPhysics/PHGeometryOwner.h @@ -1,7 +1,7 @@ #ifndef PH_GEOMETRY_OWNER_H #define PH_GEOMETRY_OWNER_H #include "Geometry.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" using GEOM_STORAGE = xr_vector; using GEOM_I = GEOM_STORAGE::iterator; diff --git a/src/xrPhysics/PHIsland.cpp b/src/xrPhysics/PHIsland.cpp index bb7c07646b..06c767d0b6 100644 --- a/src/xrPhysics/PHIsland.cpp +++ b/src/xrPhysics/PHIsland.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "PHIsland.h" -#include "physics.h" +#include "Physics.h" #include "ph_valid_ode.h" void CPHIsland:: Step(dReal step) { diff --git a/src/xrPhysics/PHJoint.cpp b/src/xrPhysics/PHJoint.cpp index 5af6fc5eb8..972c34563a 100644 --- a/src/xrPhysics/PHJoint.cpp +++ b/src/xrPhysics/PHJoint.cpp @@ -1,4 +1,4 @@ -#include "StdAfx.h" +#include "stdafx.h" #include "PHDynamicData.h" #include "Physics.h" #include "tri-colliderknoopc/dTriList.h" diff --git a/src/xrPhysics/PHJointDestroyInfo.cpp b/src/xrPhysics/PHJointDestroyInfo.cpp index 41c84fd667..3e3db6e6ac 100644 --- a/src/xrPhysics/PHJointDestroyInfo.cpp +++ b/src/xrPhysics/PHJointDestroyInfo.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "PHJointDestroyInfo.h" #include "PhysicsCommon.h" -#include "mathutilsode.h" +#include "MathUtilsOde.h" #include "console_vars.h" CPHJointDestroyInfo::CPHJointDestroyInfo(float break_force,float break_torque) { diff --git a/src/xrPhysics/PHMoveStorage.cpp b/src/xrPhysics/PHMoveStorage.cpp index 52c28c2480..dcc1e330fe 100644 --- a/src/xrPhysics/PHMoveStorage.cpp +++ b/src/xrPhysics/PHMoveStorage.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "phmovestorage.h" +#include "PHMoveStorage.h" #pragma warning(disable:4995) #pragma warning(disable:4267) #include "../3rd party/ode/ode/src/collision_kernel.h" diff --git a/src/xrPhysics/PHMoveStorage.h b/src/xrPhysics/PHMoveStorage.h index 5a66a59af8..7d8ad2b8cf 100644 --- a/src/xrPhysics/PHMoveStorage.h +++ b/src/xrPhysics/PHMoveStorage.h @@ -1,6 +1,6 @@ #ifndef PHMOVESTORAGE_H #define PHMOVESTORAGE_H -#include "phgeometryowner.h" +#include "PHGeometryOwner.h" //using POSITIONS_STORAGE = xr_vector; //using POSITIONS_I = POSITIONS_STORAGE::iterator; diff --git a/src/xrPhysics/PHObject.h b/src/xrPhysics/PHObject.h index eec85758da..95e9528325 100644 --- a/src/xrPhysics/PHObject.h +++ b/src/xrPhysics/PHObject.h @@ -1,7 +1,7 @@ #pragma once #ifndef CPHOBJECT #define CPHOBJECT -#include "../xrcdb/ispatial.h" +#include "../xrCDB/ISpatial.h" #include "PHItemList.h" #include "PHIsland.h" typedef u32 CLClassBits; diff --git a/src/xrPhysics/PHShell.cpp b/src/xrPhysics/PHShell.cpp index e8893e3755..7acfe4c705 100644 --- a/src/xrPhysics/PHShell.cpp +++ b/src/xrPhysics/PHShell.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// -#include "StdAfx.h" +#include "stdafx.h" #include "PHDynamicData.h" #include "Physics.h" #include "tri-colliderknoopc/dTriList.h" @@ -9,10 +9,10 @@ #include "PHJointDestroyInfo.h" #include "SpaceUtils.h" #include "MathUtils.h" -#include "iPhysicsShellHolder.h" +#include "IPhysicsShellHolder.h" #include "../Include/xrRender/Kinematics.h" #include "PHCollideValidator.h" -#include "../xrengine/bone.h" +#include "../xrEngine/bone.h" //#include "game_object_space.h" //#pragma warning(disable:4995) //#pragma warning(disable:4267) @@ -34,7 +34,7 @@ #include "PHCollideValidator.h" #include "PHElementInline.h" #include "PhysicsShellAnimator.h" -#include "phshellbuildjoint.h" +#include "PHShellBuildJoint.h" #ifdef DEBUG #include "debug_output.h" #endif diff --git a/src/xrPhysics/PHShell.h b/src/xrPhysics/PHShell.h index 7f79a82c82..b37adabf61 100644 --- a/src/xrPhysics/PHShell.h +++ b/src/xrPhysics/PHShell.h @@ -9,7 +9,7 @@ class CPHShellSplitterHolder; #include "PHElement.h" #include "PHDefs.h" #include "PHShellSplitter.h" -#include "phmovestorage.h" +#include "PHMoveStorage.h" #include "physics_scripted.h" diff --git a/src/xrPhysics/PHShellActivate.cpp b/src/xrPhysics/PHShellActivate.cpp index 2a82f5a7c2..508ca4bea4 100644 --- a/src/xrPhysics/PHShellActivate.cpp +++ b/src/xrPhysics/PHShellActivate.cpp @@ -1,4 +1,4 @@ -#include "StdAfx.h" +#include "stdafx.h" #include "PHDynamicData.h" #include "Physics.h" #include "tri-colliderknoopc/dTriList.h" @@ -7,7 +7,7 @@ #include "PHJointDestroyInfo.h" #include "PHCollideValidator.h" //#include "Level.h" -#include "iphysicsshellholder.h" +#include "IPhysicsShellHolder.h" #include "PhysicsShellAnimator.h" #include "../Include/xrRender/Kinematics.h" diff --git a/src/xrPhysics/PHShellBuildJoint.h b/src/xrPhysics/PHShellBuildJoint.h index 38f3d9ef43..4b361d7808 100644 --- a/src/xrPhysics/PHShellBuildJoint.h +++ b/src/xrPhysics/PHShellBuildJoint.h @@ -1,6 +1,6 @@ #pragma once -#include "../xrengine/bone.h" +#include "../xrEngine/bone.h" #include "PHJoint.h" //#include "PHElement.h" diff --git a/src/xrPhysics/PHShellNetState.cpp b/src/xrPhysics/PHShellNetState.cpp index 4ebacd86e8..d487f97a45 100644 --- a/src/xrPhysics/PHShellNetState.cpp +++ b/src/xrPhysics/PHShellNetState.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "physicsshell.h" -#include "phinterpolation.h" -#include "phobject.h" -#include "phworld.h" -#include "phshell.h" +#include "PhysicsShell.h" +#include "PHInterpolation.h" +#include "PHObject.h" +#include "PHWorld.h" +#include "PHShell.h" void CPHShell::net_Import(NET_Packet& P) { diff --git a/src/xrPhysics/PHShellSplitter.h b/src/xrPhysics/PHShellSplitter.h index 9e936a82c6..c4e2f078be 100644 --- a/src/xrPhysics/PHShellSplitter.h +++ b/src/xrPhysics/PHShellSplitter.h @@ -3,7 +3,7 @@ #include "PHDefs.h" //#include "PHObject.h" #include "PHFracture.h" -#include "phupdateobject.h" +#include "PHUpdateObject.h" class CPHShellSplitter; class CPHShell; diff --git a/src/xrPhysics/PHSimpleCharacter.cpp b/src/xrPhysics/PHSimpleCharacter.cpp index 19c46a62dc..f041720b7d 100644 --- a/src/xrPhysics/PHSimpleCharacter.cpp +++ b/src/xrPhysics/PHSimpleCharacter.cpp @@ -4,23 +4,23 @@ #include "ExtendedGeom.h" #include "../xrEngine/cl_intersect.h" #include "../xrEngine/xr_object_list.h" -#include "tri-colliderKNoOPC\__aabb_tri.h" +#include "tri-colliderknoopc/__aabb_tri.h" #include "PHSimpleCharacter.h" #include "PHContactBodyEffector.h" #include "SpaceUtils.h" #include "params.h" #include "MathUtils.h" -#include "../xrEngine/gamemtllib.h" -#include "iphysicsshellholder.h" +#include "../xrEngine/GameMtlLib.h" +#include "IPhysicsShellHolder.h" #include "../Include/xrRender/Kinematics.h" #include "PHSimpleCharacterInline.h" #include "DamageSource.h" #include "PHCollideValidator.h" #include "CalculateTriangle.h" -#include "geometry.h" +#include "Geometry.h" -#include "../xrengine/bone.h" -#include "../xrengine/xr_object.h" +#include "../xrEngine/bone.h" +#include "../xrEngine/xr_object.h" #include "ph_valid_ode.h" IC bool PhOutOfBoundaries(const Fvector& v) diff --git a/src/xrPhysics/PHSimpleCharacter.h b/src/xrPhysics/PHSimpleCharacter.h index 9c0fd69a21..59f992eab6 100644 --- a/src/xrPhysics/PHSimpleCharacter.h +++ b/src/xrPhysics/PHSimpleCharacter.h @@ -4,7 +4,7 @@ #include "MathUtils.h" #include "ElevatorState.h" #include "IColisiondamageInfo.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" namespace ALife { enum EHitType; }; diff --git a/src/xrPhysics/PHStaticGeomShell.cpp b/src/xrPhysics/PHStaticGeomShell.cpp index beaea699dd..04f9844d9a 100644 --- a/src/xrPhysics/PHStaticGeomShell.cpp +++ b/src/xrPhysics/PHStaticGeomShell.cpp @@ -3,13 +3,13 @@ #include "SpaceUtils.h" //#include "GameObject.h" #include "IPhysicsShellHolder.h" -#include "phcharacter.h" +#include "PHCharacter.h" #include "iclimableobject.h" #include "../Include/xrRender/Kinematics.h" #include "PHCollideValidator.h" -#include "../xrengine/xr_object.h" -#include "../xrengine/bone.h" +#include "../xrEngine/xr_object.h" +#include "../xrEngine/bone.h" //#include "game_object_space.h" diff --git a/src/xrPhysics/PHStaticGeomShell.h b/src/xrPhysics/PHStaticGeomShell.h index 687cecce84..9d33908487 100644 --- a/src/xrPhysics/PHStaticGeomShell.h +++ b/src/xrPhysics/PHStaticGeomShell.h @@ -2,8 +2,8 @@ #define PH_STATIC_GEOM_SHELL_H #include "PHGeometryOwner.h" #include "PHObject.h" -#include "phupdateobject.h" -#include "iphstaticgeomshell.h" +#include "PHUpdateObject.h" +#include "IPHStaticGeomShell.h" class CPHStaticGeomShell: public CPHGeometryOwner, public CPHObject, diff --git a/src/xrPhysics/PHValideValues.h b/src/xrPhysics/PHValideValues.h index c61455f4d4..299a185e8c 100644 --- a/src/xrPhysics/PHValideValues.h +++ b/src/xrPhysics/PHValideValues.h @@ -1,7 +1,7 @@ #ifndef PH_VALIDE_VALUES #define PH_VALIDE_VALUES -#include "mathutilsode.h" +#include "MathUtilsOde.h" #include "ph_valid_ode.h" class CSafeValue { diff --git a/src/xrPhysics/PHWorld.cpp b/src/xrPhysics/PHWorld.cpp index bfe8efc940..893a5017ce 100644 --- a/src/xrPhysics/PHWorld.cpp +++ b/src/xrPhysics/PHWorld.cpp @@ -4,19 +4,19 @@ #include "tri-colliderknoopc/dTriList.h" #include "PhysicsCommon.h" #include "ExtendedGeom.h" -#include "draymotions.h" +#include "dRayMotions.h" #include "PHCollideValidator.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" #include "params.h" -#include "../xrserverentities/PHSynchronize.h" -#include "../xrserverentities/phnetstate.h" -#include "geometrybits.h" +#include "../xrServerEntities/PHSynchronize.h" +#include "../xrServerEntities/PHNetState.h" +#include "GeometryBits.h" #include "console_vars.h" -#include "../xrengine/device.h" -#include "../xrengine/defines.h" -#include "../xrcdb/xr_area.h" -#include "../xrcore/fs_internal.h" +#include "../xrEngine/device.h" +#include "../xrEngine/defines.h" +#include "../xrCDB/xr_area.h" +#include "../xrCore/FS_internal.h" #ifdef DEBUG_DRAW # include "debug_output.h" diff --git a/src/xrPhysics/PHWorld.h b/src/xrPhysics/PHWorld.h index 34c16adb96..0b0149de91 100644 --- a/src/xrPhysics/PHWorld.h +++ b/src/xrPhysics/PHWorld.h @@ -1,6 +1,6 @@ #pragma once #include "Physics.h" -#include "phupdateobject.h" +#include "PHUpdateObject.h" #include "IPHWorld.h" #include "physics_scripted.h" #include "../xrEngine/pure.h" diff --git a/src/xrPhysics/Physics.cpp b/src/xrPhysics/Physics.cpp index a6982cb512..0706ea5c8e 100644 --- a/src/xrPhysics/Physics.cpp +++ b/src/xrPhysics/Physics.cpp @@ -1,9 +1,9 @@ -#include "StdAfx.h" +#include "stdafx.h" #include "PHDynamicData.h" #include "Physics.h" #include "tri-colliderknoopc/dTriList.h" #include "PHContactBodyEffector.h" -#include "../xrEngine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" #include "PHCollideValidator.h" #ifdef DEBUG #include "debug_output.h" diff --git a/src/xrPhysics/Physics.h b/src/xrPhysics/Physics.h index fcd5c67c60..8bc39209b9 100644 --- a/src/xrPhysics/Physics.h +++ b/src/xrPhysics/Physics.h @@ -1,10 +1,10 @@ #pragma once -#include "dCylinder/dCylinder.h" +#include "dcylinder/dCylinder.h" #include "PhysicsShell.h" #include "PHObject.h" #include "PHInterpolation.h" -#include "../xrcore/_cylinder.h" +#include "../xrCore/_cylinder.h" #include "BlockAllocator.h" #include "PhysicsCommon.h" #include "PHWorld.h" diff --git a/src/xrPhysics/PhysicsCommon.h b/src/xrPhysics/PhysicsCommon.h index 00beef8d42..886699f1b2 100644 --- a/src/xrPhysics/PhysicsCommon.h +++ b/src/xrPhysics/PhysicsCommon.h @@ -1,7 +1,7 @@ #pragma once #include "DisablingParams.h" -#include "physicsexternalcommon.h" +#include "PhysicsExternalCommon.h" extern XRPHYSICS_API const float default_l_limit ; extern XRPHYSICS_API const float default_w_limit ; diff --git a/src/xrPhysics/PhysicsExternalCommon.cpp b/src/xrPhysics/PhysicsExternalCommon.cpp index 7a147ec053..a58dc09e70 100644 --- a/src/xrPhysics/PhysicsExternalCommon.cpp +++ b/src/xrPhysics/PhysicsExternalCommon.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "physicsexternalcommon.h" -#include "extendedgeom.h" -#include "mathutilsode.h" +#include "PhysicsExternalCommon.h" +#include "ExtendedGeom.h" +#include "MathUtilsOde.h" bool ContactShotMarkGetEffectPars(dContactGeom* c, dxGeomUserData* &data, float &vel_cret, bool &b_invert_normal ) { dBodyID b=dGeomGetBody(c->g1); diff --git a/src/xrPhysics/PhysicsShell.cpp b/src/xrPhysics/PhysicsShell.cpp index f491b8c2f2..def73e58de 100644 --- a/src/xrPhysics/PhysicsShell.cpp +++ b/src/xrPhysics/PhysicsShell.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #pragma hdrstop -#include "physicsshell.h" +#include "PhysicsShell.h" #include "PHDynamicData.h" #include "Physics.h" #include "PHJoint.h" @@ -10,14 +10,14 @@ #include "PHSplitedShell.h" //#include "gameobject.h" -#include "iphysicsshellholder.h" +#include "IPhysicsShellHolder.h" //#include "objectdump.h" #include "phvalide.h" #include "../Include/xrRender/Kinematics.h" -#include "../xrengine/xr_object.h" -#include "../xrengine/bone.h" +#include "../xrEngine/xr_object.h" +#include "../xrEngine/bone.h" extern CPHWorld *ph_world; CPhysicsShell::~CPhysicsShell() diff --git a/src/xrPhysics/PhysicsShell.h b/src/xrPhysics/PhysicsShell.h index 6335afb2dd..e0e27f1107 100644 --- a/src/xrPhysics/PhysicsShell.h +++ b/src/xrPhysics/PhysicsShell.h @@ -4,10 +4,10 @@ #include "PHDefs.h" #include "PhysicsCommon.h" -#include "icollidevalidator.h" +#include "ICollideValidator.h" #include "../xrEngine/AI/alife_space.h" //#include "script_export_space.h" -#include "../xrEngine/iphysicsshell.h" +#include "../xrEngine/IPhysicsShell.h" #include "../xrEngine/VisMask.h" #include "iphysics_scripted.h" diff --git a/src/xrPhysics/PhysicsShellAnimator.cpp b/src/xrPhysics/PhysicsShellAnimator.cpp index 009d008167..61a353309e 100644 --- a/src/xrPhysics/PhysicsShellAnimator.cpp +++ b/src/xrPhysics/PhysicsShellAnimator.cpp @@ -1,4 +1,4 @@ -#include "StdAfx.h" +#include "stdafx.h" #include "PhysicsShellAnimator.h" #include "PhysicsShellAnimatorBoneData.h" #include "../Include/xrRender/KinematicsAnimated.h" diff --git a/src/xrPhysics/ShellHit.cpp b/src/xrPhysics/ShellHit.cpp index 2918d61ea9..c207aa1d02 100644 --- a/src/xrPhysics/ShellHit.cpp +++ b/src/xrPhysics/ShellHit.cpp @@ -1,4 +1,4 @@ -#include "StdAfx.h" +#include "stdafx.h" #include "PHDynamicData.h" #include "Physics.h" #include "tri-colliderknoopc/dTriList.h" diff --git a/src/xrPhysics/collisiondamagereceiver.cpp b/src/xrPhysics/collisiondamagereceiver.cpp index 94d42d9df5..19618a22aa 100644 --- a/src/xrPhysics/collisiondamagereceiver.cpp +++ b/src/xrPhysics/collisiondamagereceiver.cpp @@ -1,12 +1,12 @@ #include "stdafx.h" #include "icollisiondamagereceiver.h" -#include "iphysicsshellholder.h" +#include "IPhysicsShellHolder.h" -#include "extendedgeom.h" -#include "mathutilsode.h" +#include "ExtendedGeom.h" +#include "MathUtilsOde.h" -#include "../xrengine/gamemtllib.h" +#include "../xrEngine/GameMtlLib.h" diff --git a/src/xrPhysics/console_vars.cpp b/src/xrPhysics/console_vars.cpp index 0192aac3cd..42bdc053e9 100644 --- a/src/xrPhysics/console_vars.cpp +++ b/src/xrPhysics/console_vars.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "console_vars.h" -#include "physicscommon.h" +#include "PhysicsCommon.h" BOOL ph_console::g_bDebugDumpPhysicsStep = 0; float ph_console::ph_tri_query_ex_aabb_rate = 1.3f; diff --git a/src/xrPhysics/dRayMotions.cpp b/src/xrPhysics/dRayMotions.cpp index c2f8e8fbda..3a02bd3071 100644 --- a/src/xrPhysics/dRayMotions.cpp +++ b/src/xrPhysics/dRayMotions.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "dCylinder/dCylinder.h" +#include "dcylinder/dCylinder.h" struct dContactGeom; int dCollideCylRay(dxGeom *o1, dxGeom *o2, int flags,dContactGeom *contact, int skip); //#pragma warning(disable:4995) diff --git a/src/xrPhysics/net_physics_state.cpp b/src/xrPhysics/net_physics_state.cpp index 66621d67b5..13365f9b3c 100644 --- a/src/xrPhysics/net_physics_state.cpp +++ b/src/xrPhysics/net_physics_state.cpp @@ -1,4 +1,4 @@ -#include "StdAfx.h" +#include "stdafx.h" #include "net_physics_state.h" void net_physics_state::fill(SPHNetState &state, u32 time) diff --git a/src/xrPhysics/net_physics_state.h b/src/xrPhysics/net_physics_state.h index 988d87c4a3..3752863f8f 100644 --- a/src/xrPhysics/net_physics_state.h +++ b/src/xrPhysics/net_physics_state.h @@ -1,6 +1,6 @@ #pragma once #include "stdafx.h" -#include "..\xrServerEntities\PHNetState.h" +#include "../xrServerEntities/PHNetState.h" #define MIN_LINEAR_VELOCITY_COMPONENT -32.f #define MAX_LINEAR_VELOCITY_COMPONENT 32.f diff --git a/src/xrPhysics/phvalide.cpp b/src/xrPhysics/phvalide.cpp index fcd81283d0..2dbf66eb8a 100644 --- a/src/xrPhysics/phvalide.cpp +++ b/src/xrPhysics/phvalide.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "phvalide.h" -#include "mathutils.h" -#include "iphysicsshellholder.h" +#include "MathUtils.h" +#include "IPhysicsShellHolder.h" extern Fbox phBoundaries; diff --git a/src/xrPhysics/stdafx.h b/src/xrPhysics/stdafx.h index 8404a1cc60..a258c42f35 100644 --- a/src/xrPhysics/stdafx.h +++ b/src/xrPhysics/stdafx.h @@ -9,11 +9,11 @@ #define ECORE_API #include "../xrCore/xrCore.h" -#include "../xrCore/API/xrapi.h" +#include "../xrCore/API/xrAPI.h" #include "../xrServerEntities/smart_cast.h" #include "../xrCDB/xrCDB.h" -#include "../xrSound/sound.h" +#include "../xrSound/Sound.h" #include "xrPhysics.h" diff --git a/src/xrPhysics/tri-colliderknoopc/dSortTriPrimitive.h b/src/xrPhysics/tri-colliderknoopc/dSortTriPrimitive.h index 581e06d3c2..d7d54cdf23 100644 --- a/src/xrPhysics/tri-colliderknoopc/dSortTriPrimitive.h +++ b/src/xrPhysics/tri-colliderknoopc/dSortTriPrimitive.h @@ -6,9 +6,9 @@ #include "__aabb_tri.h" #include "../MathUtils.h" #include "../console_vars.h" -#include "../phworld.h" -#include "../../xrcdb/xr_area.h" -#include "../../xrEngine/gamemtllib.h" +#include "../PHWorld.h" +#include "../../xrCDB/xr_area.h" +#include "../../xrEngine/GameMtlLib.h" #ifdef DEBUG #include "../debug_output.h" #endif diff --git a/src/xrPhysics/tri-colliderknoopc/dTriColliderMath.h b/src/xrPhysics/tri-colliderknoopc/dTriColliderMath.h index 8a23dd7147..f0d1fb118c 100644 --- a/src/xrPhysics/tri-colliderknoopc/dTriColliderMath.h +++ b/src/xrPhysics/tri-colliderknoopc/dTriColliderMath.h @@ -3,7 +3,7 @@ #include "__aabb_tri.h" //#include "../ode_include.h" #include "../../3rd party/ode/include/ode/common.h" -#include "../mathutilsode.h" +#include "../MathUtilsOde.h" #include "dcTriangle.h" inline bool TriContainPoint(const dReal* v0,const dReal* v1,const dReal* v2, diff --git a/src/xrPhysics/tri-colliderknoopc/dTriCylinder.cpp b/src/xrPhysics/tri-colliderknoopc/dTriCylinder.cpp index 079a9c10c8..071574eeb1 100644 --- a/src/xrPhysics/tri-colliderknoopc/dTriCylinder.cpp +++ b/src/xrPhysics/tri-colliderknoopc/dTriCylinder.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "dTriColliderCommon.h" -#include "../dCylinder/dCylinder.h" +#include "../dcylinder/dCylinder.h" #include "dTriCylinder.h" #include "../MathUtils.h" -#include "dcTrilistCollider.h" -#include "../phworld.h" -#include "../../xrcdb/xr_area.h" +#include "dcTriListCollider.h" +#include "../PHWorld.h" +#include "../../xrCDB/xr_area.h" ////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////// diff --git a/src/xrPhysics/tri-colliderknoopc/dTriCylinder.h b/src/xrPhysics/tri-colliderknoopc/dTriCylinder.h index 1d1f8b518d..68a08ad9d2 100644 --- a/src/xrPhysics/tri-colliderknoopc/dTriCylinder.h +++ b/src/xrPhysics/tri-colliderknoopc/dTriCylinder.h @@ -1,6 +1,6 @@ #ifndef D_TRI_CYLINDER_H #define D_TRI_CYLINDER_H -#include "../dCylinder/dCylinder.h" +#include "../dcylinder/dCylinder.h" #include "TriPrimitiveCollideClassDef.h" #include "dcTriListCollider.h" struct dxCylinder { // cylinder diff --git a/src/xrPhysics/tri-colliderknoopc/dTriSphere.cpp b/src/xrPhysics/tri-colliderknoopc/dTriSphere.cpp index ed5096f001..fbf264cf48 100644 --- a/src/xrPhysics/tri-colliderknoopc/dTriSphere.cpp +++ b/src/xrPhysics/tri-colliderknoopc/dTriSphere.cpp @@ -2,9 +2,9 @@ #include "dTriColliderCommon.h" #include "dTriColliderMath.h" #include "dTriSphere.h" -#include "dctrilistcollider.h" -#include "../phworld.h" -#include "../../xrcdb/xr_area.h" +#include "dcTriListCollider.h" +#include "../PHWorld.h" +#include "../../xrCDB/xr_area.h" //////////////////////////////////////////////////////////////////////////// IC dReal dcTriListCollider::PointSphereTest(const dReal* center, const dReal radius, const dReal* pt,dReal* norm) diff --git a/src/xrPhysics/tri-colliderknoopc/dcTriListCollider.cpp b/src/xrPhysics/tri-colliderknoopc/dcTriListCollider.cpp index 5aff859d8a..1600970bca 100644 --- a/src/xrPhysics/tri-colliderknoopc/dcTriListCollider.cpp +++ b/src/xrPhysics/tri-colliderknoopc/dcTriListCollider.cpp @@ -4,7 +4,7 @@ #include "../../xrEngine/cl_intersect.h" #include "dTriCollideK.h" #include "dSortTriPrimitive.h" -#include "../dCylinder/dCylinder.h" +#include "../dcylinder/dCylinder.h" #include "../MathUtils.h" //#include "../level.h" #ifdef DEBUG diff --git a/src/xrScripts/script_callback_ex.h b/src/xrScripts/script_callback_ex.h index 8b78b3e3fa..211bc19839 100644 --- a/src/xrScripts/script_callback_ex.h +++ b/src/xrScripts/script_callback_ex.h @@ -8,7 +8,7 @@ #pragma once #include "script_engine.h" -#include "../xrScripts/script_export_space.h" +#include "script_export_space.h" IC bool compare_safe(const luabind::object& o1, const luabind::object& o2) { diff --git a/src/xrServerEntities/PHNetState.h b/src/xrServerEntities/PHNetState.h index 29533d5e53..a245971d3a 100644 --- a/src/xrServerEntities/PHNetState.h +++ b/src/xrServerEntities/PHNetState.h @@ -1,7 +1,7 @@ #ifndef PHNETSTATE_H #define PHNETSTATE_H -#include "..\xrEngine\VisMask.h" +#include "../xrEngine/VisMask.h" class NET_Packet; diff --git a/src/xrServerEntities/PHSynchronize.h b/src/xrServerEntities/PHSynchronize.h index 478dcb5733..0105c30ec6 100644 --- a/src/xrServerEntities/PHSynchronize.h +++ b/src/xrServerEntities/PHSynchronize.h @@ -1,7 +1,7 @@ #ifndef PH_SYNCHRONIZE_H #define PH_SYNCHRONIZE_H -#include "../xrserverentities/PHNetState.h" +#include "PHNetState.h" class NET_Packet; diff --git a/src/xrServerEntities/alife_monster_brain.h b/src/xrServerEntities/alife_monster_brain.h index af513b7ab1..3c80e98b01 100644 --- a/src/xrServerEntities/alife_monster_brain.h +++ b/src/xrServerEntities/alife_monster_brain.h @@ -9,7 +9,7 @@ #pragma once #include "game_graph_space.h" -#include "xrserver_space.h" +#include "xrServer_Space.h" #include "alife_space.h" #include "../xrScripts/script_export_space.h" diff --git a/src/xrServerEntities/object_factory_register.cpp b/src/xrServerEntities/object_factory_register.cpp index 98abab2af1..c3ccc9b390 100644 --- a/src/xrServerEntities/object_factory_register.cpp +++ b/src/xrServerEntities/object_factory_register.cpp @@ -14,7 +14,7 @@ // server entities includes #include "xrServer_Objects_ALife_All.h" -#include "xrServer_Objects_ALife_Smartcovers.h" +#include "xrServer_Objects_Alife_Smartcovers.h" #include "clsid_game.h" // client entities includes diff --git a/src/xrServerEntities/script_engine_export.h b/src/xrServerEntities/script_engine_export.h index 75b599c99e..e8d23c60f2 100644 --- a/src/xrServerEntities/script_engine_export.h +++ b/src/xrServerEntities/script_engine_export.h @@ -21,7 +21,7 @@ #include "object_factory.h" #include "../xrScripts/exports/script_sound_type.h" #include "xrServer_Objects_ALife_All.h" -#include "xrServer_Objects_ALife_Smartcovers.h" +#include "xrServer_Objects_Alife_Smartcovers.h" #ifndef XRGAME_EXPORTS diff --git a/src/xrServerEntities/xrServer_Objects.h b/src/xrServerEntities/xrServer_Objects.h index 6c1f1752e6..f1d3e1795f 100644 --- a/src/xrServerEntities/xrServer_Objects.h +++ b/src/xrServerEntities/xrServer_Objects.h @@ -10,7 +10,7 @@ #include "xrMessages.h" #include "xrServer_Object_Base.h" -#include "phnetstate.h" +#include "PHNetState.h" #pragma warning(push) #pragma warning(disable:4005) diff --git a/src/xrServerEntities/xrServer_Objects_ALife_Items.h b/src/xrServerEntities/xrServer_Objects_ALife_Items.h index 66f657b83b..d1be4091a4 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife_Items.h +++ b/src/xrServerEntities/xrServer_Objects_ALife_Items.h @@ -14,7 +14,7 @@ #include "inventory_space.h" #include "character_info_defs.h" -#include "infoportiondefs.h" +#include "InfoPortionDefs.h" #pragma warning(push) #pragma warning(disable:4005) diff --git a/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp b/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp index f7e635e963..7a2644f55a 100644 --- a/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp +++ b/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp @@ -8,7 +8,7 @@ #include "stdafx.h" #include "pch_script.h" -#include "xrServer_Objects_ALife_Smartcovers.h" +#include "xrServer_Objects_Alife_Smartcovers.h" #ifndef AI_COMPILER # include "character_info.h" diff --git a/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers_script.cpp b/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers_script.cpp index abc0ccab90..badbc18407 100644 --- a/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers_script.cpp +++ b/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers_script.cpp @@ -8,7 +8,7 @@ #include "stdafx.h" #include "pch_script.h" -#include "xrServer_Objects_ALife_Smartcovers.h" +#include "xrServer_Objects_Alife_Smartcovers.h" #include "xrServer_script_macroses.h" using namespace luabind; diff --git a/src/xrServerEntities/xrServer_Objects_script.cpp b/src/xrServerEntities/xrServer_Objects_script.cpp index b072c0d543..0ba7c96b37 100644 --- a/src/xrServerEntities/xrServer_Objects_script.cpp +++ b/src/xrServerEntities/xrServer_Objects_script.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "pch_script.h" #include "xrServer_Objects.h" -#include "phnetstate.h" +#include "PHNetState.h" #include "xrServer_script_macroses.h" #include "../xrScripts/exports/script_ini_file.h" diff --git a/src/xrSound/SoundRender.h b/src/xrSound/SoundRender.h index 1709542f57..38d61b62c5 100644 --- a/src/xrSound/SoundRender.h +++ b/src/xrSound/SoundRender.h @@ -2,7 +2,7 @@ #define SoundRenderH #pragma once -#include "sound.h" +#include "Sound.h" class CSoundRender_Core; class CSoundRender_Source; diff --git a/src/xrSound/SoundRender_Cache.cpp b/src/xrSound/SoundRender_Cache.cpp index 4f29134d2e..450f541960 100644 --- a/src/xrSound/SoundRender_Cache.cpp +++ b/src/xrSound/SoundRender_Cache.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #pragma hdrstop -#include ".\soundrender_cache.h" +#include "SoundRender_Cache.h" CSoundRender_Cache::CSoundRender_Cache () { diff --git a/src/xrSound/SoundRender_Emitter.h b/src/xrSound/SoundRender_Emitter.h index 6ea5f97923..01e90eba72 100644 --- a/src/xrSound/SoundRender_Emitter.h +++ b/src/xrSound/SoundRender_Emitter.h @@ -2,8 +2,8 @@ #define SoundRender_EmitterH #pragma once -#include "soundrender.h" -#include "soundrender_environment.h" +#include "SoundRender.h" +#include "SoundRender_Environment.h" class CSoundRender_Emitter : public CSound_emitter { diff --git a/src/xrSound/SoundRender_Emitter_FSM.cpp b/src/xrSound/SoundRender_Emitter_FSM.cpp index 6ff7b0b881..70b4a72d97 100644 --- a/src/xrSound/SoundRender_Emitter_FSM.cpp +++ b/src/xrSound/SoundRender_Emitter_FSM.cpp @@ -4,7 +4,7 @@ #include "SoundRender_Emitter.h" #include "SoundRender_Core.h" #include "SoundRender_Source.h" -#include "../xrSound/ai_sounds.h" +#include "ai_sounds.h" XRSOUND_API extern float psSoundCull; diff --git a/src/xrSound/SoundRender_Source.cpp b/src/xrSound/SoundRender_Source.cpp index ec3f2bd9e0..9c7959bd03 100644 --- a/src/xrSound/SoundRender_Source.cpp +++ b/src/xrSound/SoundRender_Source.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #pragma hdrstop -#include "soundrender_core.h" -#include "soundrender_source.h" +#include "SoundRender_Core.h" +#include "SoundRender_Source.h" CSoundRender_Source::CSoundRender_Source () { diff --git a/src/xrSound/SoundRender_TargetA.cpp b/src/xrSound/SoundRender_TargetA.cpp index 2eadecc055..a99d9ce55c 100644 --- a/src/xrSound/SoundRender_TargetA.cpp +++ b/src/xrSound/SoundRender_TargetA.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #pragma hdrstop -#include "soundrender_TargetA.h" -#include "soundrender_emitter.h" -#include "soundrender_source.h" +#include "SoundRender_TargetA.h" +#include "SoundRender_Emitter.h" +#include "SoundRender_Source.h" xr_vector g_target_temp_data; xr_vector g_target_temp_data_16; diff --git a/src/xrSound/SoundRender_TargetA.h b/src/xrSound/SoundRender_TargetA.h index 24ff004367..d9e0119581 100644 --- a/src/xrSound/SoundRender_TargetA.h +++ b/src/xrSound/SoundRender_TargetA.h @@ -2,8 +2,8 @@ #define SoundRender_TargetAH #pragma once -#include "soundrender_Target.h" -#include "soundrender_CoreA.h" +#include "SoundRender_Target.h" +#include "SoundRender_CoreA.h" class CSoundRender_TargetA: public CSoundRender_Target { diff --git a/src/xrSound/ogg_utils.cpp b/src/xrSound/ogg_utils.cpp index 1061a7eed8..4f95e6180f 100644 --- a/src/xrSound/ogg_utils.cpp +++ b/src/xrSound/ogg_utils.cpp @@ -1,4 +1,4 @@ -#include "StdAfx.h" +#include "stdafx.h" #include "ogg_utils.h" diff --git a/src/xrUI/UICursor.cpp b/src/xrUI/UICursor.cpp index 778fbd02df..baac475421 100644 --- a/src/xrUI/UICursor.cpp +++ b/src/xrUI/UICursor.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "uicursor.h" +#include "UICursor.h" #include "Widgets/UIStatic.h" #include "Widgets/UIBtnHint.h" diff --git a/src/xrUI/UIHelper.cpp b/src/xrUI/UIHelper.cpp index 35622cbb8e..ff798fdb55 100644 --- a/src/xrUI/UIHelper.cpp +++ b/src/xrUI/UIHelper.cpp @@ -5,7 +5,7 @@ // Description : UI Helper class implementation //////////////////////////////////////////////////////////////////////////// -#include "StdAfx.h" +#include "stdafx.h" #include "UIHelper.h" #include "UIXmlInit.h" diff --git a/src/xrUI/UITextureMaster.cpp b/src/xrUI/UITextureMaster.cpp index 29173e57f5..5b52b7b352 100644 --- a/src/xrUI/UITextureMaster.cpp +++ b/src/xrUI/UITextureMaster.cpp @@ -8,7 +8,7 @@ // copyright 2005 GSC Game World -#include "StdAfx.h" +#include "stdafx.h" #include "UITextureMaster.h" #include "Widgets/UIStaticItem.h" #include "uiabstract.h" diff --git a/src/xrUI/UIXmlInit.cpp b/src/xrUI/UIXmlInit.cpp index ade03b26b2..bdf046176f 100644 --- a/src/xrUI/UIXmlInit.cpp +++ b/src/xrUI/UIXmlInit.cpp @@ -11,7 +11,7 @@ #include "Widgets/UIProgressShape.h" #include "Widgets/UITabControl.h" #include "Widgets/UIAnimatedStatic.h" -#include "uixmlinit.h" +#include "UIXmlInit.h" #include "Widgets/UIListBox.h" #include "Widgets/UIComboBox.h" #include "Widgets/UITrackBar.h" @@ -19,7 +19,7 @@ //#include "game_base_space.h" #include "UITextureMaster.h" -#include "Widgets/UItabButtonMP.h" +#include "Widgets/UITabButtonMP.h" #include "Widgets/UILines.h" ////////////////////////////////////////////////////////////////////////// diff --git a/src/xrUI/Widgets/UICheckButton.cpp b/src/xrUI/Widgets/UICheckButton.cpp index cc6e7b2917..f7b0a914b1 100644 --- a/src/xrUI/Widgets/UICheckButton.cpp +++ b/src/xrUI/Widgets/UICheckButton.cpp @@ -3,7 +3,7 @@ ////////////////////////////////////////////////////////////////////// #include "stdafx.h" -#include ".\uicheckbutton.h" +#include "UICheckButton.h" #include "UIXmlInit.h" #include "UIHint.h" #include "../../xrEngine/xr_input.h" diff --git a/src/xrUI/Widgets/UICheckButton.h b/src/xrUI/Widgets/UICheckButton.h index 0f021e97e4..03ef515f9d 100644 --- a/src/xrUI/Widgets/UICheckButton.h +++ b/src/xrUI/Widgets/UICheckButton.h @@ -1,6 +1,6 @@ #pragma once -#include "ui3tbutton.h" +#include "UI3tButton.h" #include "UIOptionsItem.h" class UIHint; diff --git a/src/xrUI/Widgets/UIComboBox.cpp b/src/xrUI/Widgets/UIComboBox.cpp index d62b7f6bff..0d0428fbd5 100644 --- a/src/xrUI/Widgets/UIComboBox.cpp +++ b/src/xrUI/Widgets/UIComboBox.cpp @@ -2,7 +2,7 @@ #include "UIComboBox.h" #include "../UITextureMaster.h" #include "UIScrollBar.h" -#include "uilistboxitem.h" +#include "UIListBoxItem.h" #include "../../xrEngine/string_table.h" #define CB_HEIGHT 20.0f diff --git a/src/xrUI/Widgets/UIDialogWnd.cpp b/src/xrUI/Widgets/UIDialogWnd.cpp index 46215d6ec1..37acfc0eaf 100644 --- a/src/xrUI/Widgets/UIDialogWnd.cpp +++ b/src/xrUI/Widgets/UIDialogWnd.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "uidialogwnd.h" +#include "UIDialogWnd.h" #include "../../xrEngine/IGame_Persistent.h" #include "../../xrEngine/IGame_UICustom.h" diff --git a/src/xrUI/Widgets/UIDialogWnd.h b/src/xrUI/Widgets/UIDialogWnd.h index fc5167a82a..814a051c60 100644 --- a/src/xrUI/Widgets/UIDialogWnd.h +++ b/src/xrUI/Widgets/UIDialogWnd.h @@ -1,6 +1,6 @@ #pragma once -#include "uiwindow.h" +#include "UIWindow.h" #include "UIDialogHolder.h" class UI_API CUIDialogWnd : public CUIWindow diff --git a/src/xrUI/Widgets/UIEditBox.cpp b/src/xrUI/Widgets/UIEditBox.cpp index f572249d91..eef07e497f 100644 --- a/src/xrUI/Widgets/UIEditBox.cpp +++ b/src/xrUI/Widgets/UIEditBox.cpp @@ -3,7 +3,7 @@ ////////////////////////////////////////////////////////////////////// #include "stdafx.h" -#include "uieditbox.h" +#include "UIEditBox.h" #include "UIFrameLineWnd.h" diff --git a/src/xrUI/Widgets/UIEditKeyBind.cpp b/src/xrUI/Widgets/UIEditKeyBind.cpp index 9b14c99629..fdf4008eef 100644 --- a/src/xrUI/Widgets/UIEditKeyBind.cpp +++ b/src/xrUI/Widgets/UIEditKeyBind.cpp @@ -2,7 +2,7 @@ #include "UIEditKeyBind.h" #include "../../xrServerEntities/object_broker.h" -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" #include "../UIFontDefines.h" CUIEditKeyBind::CUIEditKeyBind(bool bPrim) diff --git a/src/xrUI/Widgets/UIFixedScrollBar.cpp b/src/xrUI/Widgets/UIFixedScrollBar.cpp index 860844358e..fb023fd547 100644 --- a/src/xrUI/Widgets/UIFixedScrollBar.cpp +++ b/src/xrUI/Widgets/UIFixedScrollBar.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "UIFixedScrollbar.h" +#include "UIFixedScrollBar.h" #include "UI3tButton.h" #include "UIFrameLineWnd.h" #include "UIScrollBox.h" @@ -132,7 +132,7 @@ void CUIFixedScrollBar::ClampByViewRect() m_IncButton->GetWndPos().y - m_ScrollBox->GetHeight()-m_ScrollBoxOffset.y)); } } -#include "../uicursor.h" +#include "../UICursor.h" u32 last_hold_tm =0; bool CUIFixedScrollBar::OnKeyboardHold(int dik) { diff --git a/src/xrUI/Widgets/UIFrameWindow.h b/src/xrUI/Widgets/UIFrameWindow.h index ebfb93f64c..df63105827 100644 --- a/src/xrUI/Widgets/UIFrameWindow.h +++ b/src/xrUI/Widgets/UIFrameWindow.h @@ -1,5 +1,5 @@ #pragma once -#include "uiwindow.h" +#include "UIWindow.h" class UI_API CUIFrameWindow: public CUIWindow, diff --git a/src/xrUI/Widgets/UILanimController.h b/src/xrUI/Widgets/UILanimController.h index 8df2a7f041..eddf213578 100644 --- a/src/xrUI/Widgets/UILanimController.h +++ b/src/xrUI/Widgets/UILanimController.h @@ -1,6 +1,6 @@ #pragma once -#include "uiwindow.h" +#include "UIWindow.h" #include "../../xrEngine/LightAnimLibrary.h" class CLAItem; diff --git a/src/xrUI/Widgets/UILines.h b/src/xrUI/Widgets/UILines.h index ab192a60c7..08ac4b53aa 100644 --- a/src/xrUI/Widgets/UILines.h +++ b/src/xrUI/Widgets/UILines.h @@ -1,7 +1,7 @@ #pragma once #include "UILine.h" -#include "../../xrUI/uiabstract.h" +#include "../uiabstract.h" class UI_API CUILines : public CDeviceResetNotifier diff --git a/src/xrUI/Widgets/UIOptionsItem.cpp b/src/xrUI/Widgets/UIOptionsItem.cpp index 41612b0672..d22f547df4 100644 --- a/src/xrUI/Widgets/UIOptionsItem.cpp +++ b/src/xrUI/Widgets/UIOptionsItem.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h" #include "UIOptionsItem.h" #include "UIOptionsManager.h" -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" CUIOptionsManager CUIOptionsItem::m_optionsManager; diff --git a/src/xrUI/Widgets/UIOptionsManager.cpp b/src/xrUI/Widgets/UIOptionsManager.cpp index ea34b4a725..9219cf7585 100644 --- a/src/xrUI/Widgets/UIOptionsManager.cpp +++ b/src/xrUI/Widgets/UIOptionsManager.cpp @@ -1,7 +1,7 @@ #include "StdAfx.h" #include "UIOptionsManager.h" #include "UIOptionsItem.h" -#include "../../xrEngine/xr_ioconsole.h" +#include "../../xrEngine/XR_IOConsole.h" CUIOptionsManager::CUIOptionsManager() :m_restart_flags(0) diff --git a/src/xrUI/Widgets/UIProgressBar.cpp b/src/xrUI/Widgets/UIProgressBar.cpp index 5908b76c6e..dcb6f29c9c 100644 --- a/src/xrUI/Widgets/UIProgressBar.cpp +++ b/src/xrUI/Widgets/UIProgressBar.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "uiprogressbar.h" +#include "UIProgressBar.h" CUIProgressBar::CUIProgressBar(void) { diff --git a/src/xrUI/Widgets/UIProgressBar.h b/src/xrUI/Widgets/UIProgressBar.h index 6a23a28021..129d1c3fad 100644 --- a/src/xrUI/Widgets/UIProgressBar.h +++ b/src/xrUI/Widgets/UIProgressBar.h @@ -1,7 +1,7 @@ #pragma once -#include "uiwindow.h" -#include "uibutton.h" +#include "UIWindow.h" +#include "UIButton.h" class UI_API CUIProgressBar : public CUIWindow diff --git a/src/xrUI/Widgets/UIPropertiesBox.h b/src/xrUI/Widgets/UIPropertiesBox.h index 8a8db4dab2..ca7a623e8e 100644 --- a/src/xrUI/Widgets/UIPropertiesBox.h +++ b/src/xrUI/Widgets/UIPropertiesBox.h @@ -1,6 +1,6 @@ #pragma once -#include "../../xrUI/Widgets/uiframewindow.h" -#include "../../xrUI/Widgets/uilistbox.h" +#include "UIFrameWindow.h" +#include "UIListBox.h" class UI_API CUIPropertiesBox: public CUIFrameWindow, diff --git a/src/xrUI/Widgets/UIScrollBar.cpp b/src/xrUI/Widgets/UIScrollBar.cpp index 033be73720..03ca4d9b0d 100644 --- a/src/xrUI/Widgets/UIScrollBar.cpp +++ b/src/xrUI/Widgets/UIScrollBar.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "uiscrollbar.h" +#include "UIScrollBar.h" #include "UI3tButton.h" #include "UIScrollBox.h" #include "UIXmlInit.h" @@ -181,7 +181,7 @@ void CUIScrollBar::UpdateScrollBar() ClampByViewRect(); } -#include "../uicursor.h" +#include "../UICursor.h" u32 last_hold_time =0; bool CUIScrollBar::OnKeyboardHold(int dik) diff --git a/src/xrUI/Widgets/UIScrollBar.h b/src/xrUI/Widgets/UIScrollBar.h index 3e2734553e..30d44fa9bd 100644 --- a/src/xrUI/Widgets/UIScrollBar.h +++ b/src/xrUI/Widgets/UIScrollBar.h @@ -1,5 +1,5 @@ #pragma once -#include "uiwindow.h" +#include "UIWindow.h" class CUI3tButton; class CUIScrollBox; diff --git a/src/xrUI/Widgets/UIScrollBox.cpp b/src/xrUI/Widgets/UIScrollBox.cpp index 35fff98f3a..7c9e241ee5 100644 --- a/src/xrUI/Widgets/UIScrollBox.cpp +++ b/src/xrUI/Widgets/UIScrollBox.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "uiscrollbox.h" -#include "../uicursor.h" +#include "UIScrollBox.h" +#include "../UICursor.h" CUIScrollBox::CUIScrollBox() { diff --git a/src/xrUI/Widgets/UIScrollBox.h b/src/xrUI/Widgets/UIScrollBox.h index d1ab6b3284..ef9059f9fa 100644 --- a/src/xrUI/Widgets/UIScrollBox.h +++ b/src/xrUI/Widgets/UIScrollBox.h @@ -1,5 +1,5 @@ #pragma once -#include "uiFrameLineWnd.h" +#include "UIFrameLineWnd.h" class UI_API CUIScrollBox : public CUIFrameLineWnd diff --git a/src/xrUI/Widgets/UIStatic.cpp b/src/xrUI/Widgets/UIStatic.cpp index 2eb3009551..632c3d89d3 100644 --- a/src/xrUI/Widgets/UIStatic.cpp +++ b/src/xrUI/Widgets/UIStatic.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" -#include "uistatic.h" +#include "UIStatic.h" #include "UIXmlInit.h" #include "UITextureMaster.h" #include "../../xrEngine/LightAnimLibrary.h" -#include "uilines.h" +#include "UILines.h" #include "../ui_base.h" #include "../Include/xrRender/UIRender.h" diff --git a/src/xrUI/Widgets/UIStatic.h b/src/xrUI/Widgets/UIStatic.h index 07978b6b2b..bceed6613d 100644 --- a/src/xrUI/Widgets/UIStatic.h +++ b/src/xrUI/Widgets/UIStatic.h @@ -3,7 +3,7 @@ #include "UILanimController.h" #include "UIStaticItem.h" #include "../../xrScripts/script_export_space.h" -#include "uilines.h" +#include "UILines.h" class CUIFrameWindow; class CLAItem; diff --git a/src/xrUI/Widgets/UIStaticItem.h b/src/xrUI/Widgets/UIStaticItem.h index ff393d8f6d..04997e9cc0 100644 --- a/src/xrUI/Widgets/UIStaticItem.h +++ b/src/xrUI/Widgets/UIStaticItem.h @@ -1,5 +1,5 @@ #pragma once -#include "../../xrUI/ui_defs.h" +#include "../ui_defs.h" class UI_API CUIStaticItem diff --git a/src/xrUI/Widgets/UIStatix.h b/src/xrUI/Widgets/UIStatix.h index 022d0c7348..de778889da 100644 --- a/src/xrUI/Widgets/UIStatix.h +++ b/src/xrUI/Widgets/UIStatix.h @@ -1,6 +1,6 @@ #pragma once -#include "../../xrUI/Widgets/UIStatic.h" +#include "UIStatic.h" class UI_API CUIStatix : public CUIStatic diff --git a/src/xrUI/Widgets/UITabControl.h b/src/xrUI/Widgets/UITabControl.h index 554cd77fcb..ce28d95577 100644 --- a/src/xrUI/Widgets/UITabControl.h +++ b/src/xrUI/Widgets/UITabControl.h @@ -1,6 +1,6 @@ #pragma once -#include "uiwindow.h" +#include "UIWindow.h" #include "UIOptionsItem.h" class CUITabButton; diff --git a/src/xrUI/Widgets/UITabControl_script.cpp b/src/xrUI/Widgets/UITabControl_script.cpp index 3be053e1f3..aaed4cd0ce 100644 --- a/src/xrUI/Widgets/UITabControl_script.cpp +++ b/src/xrUI/Widgets/UITabControl_script.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include "../../xrUI/Widgets/UITabControl.h" -#include "../../xrUI/Widgets/UITabButton.h" +#include "UITabControl.h" +#include "UITabButton.h" #include #include diff --git a/src/xrUI/Widgets/ui_arrow.cpp b/src/xrUI/Widgets/ui_arrow.cpp index 12ef5d9322..7b906a4cfc 100644 --- a/src/xrUI/Widgets/ui_arrow.cpp +++ b/src/xrUI/Widgets/ui_arrow.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ui_arrow.h" -#include "../../xrUI/UIXmlInit.h" +#include "../UIXmlInit.h" UI_Arrow::UI_Arrow() { diff --git a/src/xrUI/Widgets/ui_arrow.h b/src/xrUI/Widgets/ui_arrow.h index 2e88ec7dbb..11440f93e8 100644 --- a/src/xrUI/Widgets/ui_arrow.h +++ b/src/xrUI/Widgets/ui_arrow.h @@ -1,6 +1,6 @@ #pragma once -#include "../../xrUI/Widgets/UIStatic.h" +#include "UIStatic.h" class UI_API UI_Arrow: public CUIStatic