Skip to content

Commit

Permalink
xrGame: Fix case sensitive #includes
Browse files Browse the repository at this point in the history
  • Loading branch information
Zegeri committed Sep 16, 2018
1 parent 4de9a86 commit 918218f
Show file tree
Hide file tree
Showing 100 changed files with 137 additions and 138 deletions.
4 changes: 2 additions & 2 deletions src/xrGame/ActivatingCharCollisionDelay.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include "StdAfx.h"

#include "activatingcharcollisiondelay.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_), activate_time(Device.dwTimeGlobal + delay)
Expand Down
12 changes: 6 additions & 6 deletions src/xrGame/Actor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
#include "xrServer_Objects_ALife_Monsters.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"
Expand Down Expand Up @@ -58,8 +58,8 @@
#include "map_manager.h"
#include "GametaskManager.h"
#include "actor_memory.h"
#include "Script_Game_Object.h"
#include "Game_Object_Space.h"
#include "script_game_object.h"
#include "game_object_space.h"
#include "script_callback_ex.h"
#include "InventoryBox.h"
#include "location_manager.h"
Expand All @@ -69,10 +69,10 @@
#include "Include/xrRender/UIRender.h"

#include "xrAICore/Navigation/ai_object_location.h"
#include "ui/uiMotionIcon.h"
#include "ui/UIMotionIcon.h"
#include "ui/UIActorMenu.h"
#include "ActorHelmet.h"
#include "UI/UIDragDropReferenceList.h"
#include "ui/UIDragDropReferenceList.h"
#include "xrCore/xr_token.h"

const u32 patch_frames = 50;
Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/ActorCondition.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include "pch_script.h"
#include "actorcondition.h"
#include "ActorCondition.h"
#include "Actor.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"
Expand Down
8 changes: 4 additions & 4 deletions src/xrGame/ActorInput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
#include "Level.h"
#include "game_cl_base.h"
#include "xr_level_controller.h"
#include "actorcondition.h"
#include "ActorCondition.h"
#include "actor_input_handler.h"
#include "string_table.h"
#include "UI/UIStatic.h"
#include "UI/UIActorMenu.h"
#include "UI/UIDragDropReferenceList.h"
#include "ui/UIStatic.h"
#include "ui/UIActorMenu.h"
#include "ui/UIDragDropReferenceList.h"
#include "CharacterPhysicsSupport.h"
#include "InventoryBox.h"
#include "player_hud.h"
Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/Actor_Events.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#include "StdAfx.h"
#include "Actor.h"
#include "customdetector.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 "xr_level_controller.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/Actor_Feel.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "StdAfx.h"
#include "Actor.h"
#include "Weapon.h"
#include "mercuryball.h"
#include "MercuryBall.h"
#include "Inventory.h"
#include "character_info.h"
#include "xr_level_controller.h"
Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/Actor_Movement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "Level.h"
#include "UIGameCustom.h"
#include "string_table.h"
#include "actorcondition.h"
#include "ActorCondition.h"
#include "game_cl_base.h"
#include "WeaponMagazined.h"
#include "CharacterPhysicsSupport.h"
Expand All @@ -18,7 +18,7 @@
#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 (т.е. включить следующую анимацию)
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/Actor_Network.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "ActorEffector.h"

#include "xrPhysics/IPHWorld.h"
#include "xrPhysics/actorcameracollision.h"
#include "xrPhysics/ActorCameraCollision.h"
#include "Level.h"
#include "xr_level_controller.h"
#include "game_cl_base.h"
Expand Down
6 changes: 3 additions & 3 deletions src/xrGame/Artefact.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "StdAfx.h"
#include "artefact.h"
#include "Artefact.h"
#include "xrPhysics/PhysicsShell.h"
#include "PhysicsShellHolder.h"
#include "game_cl_base.h"
Expand Down Expand Up @@ -332,8 +332,8 @@ void CArtefact::MoveTo(Fvector const& position)
// m_bInInterpolation = false;
}

#include "inventoryOwner.h"
#include "Entity_alive.h"
#include "InventoryOwner.h"
#include "entity_alive.h"
void CArtefact::UpdateXForm()
{
if (Device.dwFrame != dwXF_Frame)
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/BastArtifact.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#pragma once
#include "Artefact.h"
#include "xrEngine/feel_touch.h"
#include "xrEngine/Feel_Touch.h"

#include "entity_alive.h"

Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/Bolt.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "StdAfx.h"
#include "bolt.h"
#include "Bolt.h"
#include "ParticlesObject.h"
#include "xrPhysics/PhysicsShell.h"
#include "xr_level_controller.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/CameraLook.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#pragma hdrstop

#include "CameraLook.h"
#include "xrEngine/Cameramanager.h"
#include "xrEngine/CameraManager.h"
#include "xr_level_controller.h"
#include "Actor.h"

Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/CharacterPhysicsSupport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "stalker_animation_manager.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
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/ClimableObject.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "StdAfx.h"
#include "climableobject.h "
#include "ClimableObject.h"
#include "xrPhysics/IPHStaticGeomShell.h"
#include "xrServer_Objects_ALife.h"
#include "xrPhysics/PHCharacter.h"
Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/ContextMenu.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "StdAfx.h"
#include "contextmenu.h"
#include "../xrEngine/gamefont.h"
#include "ContextMenu.h"
#include "../xrEngine/GameFont.h"

const float fade_speed = 8.0f;

Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/CustomDetector.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "StdAfx.h"
#include "customdetector.h"
#include "CustomDetector.h"
#include "ui/ArtefactDetectorUI.h"
#include "HUDManager.h"
#include "Inventory.h"
Expand Down
6 changes: 3 additions & 3 deletions src/xrGame/CustomRocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
//////////////////////////////////////////////////////////////////////

#include "StdAfx.h"
#include "customrocket.h"
#include "CustomRocket.h"
#include "ParticlesObject.h"
#include "xrPhysics/PhysicsShell.h"
#include "xrPhysics/ExtendedGeom.h"
#include "xrPhysics/calculatetriangle.h"
#include "xrPhysics/tri-colliderknoopc/dctriangle.h"
#include "xrPhysics/CalculateTriangle.h"
#include "xrPhysics/tri-colliderknoopc/dcTriangle.h"

#include "Level.h"
#include "xrMessages.h"
Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/CustomZone.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "xrAICore/Navigation/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()) //расстояние до актера, когда появляется ветер
Expand Down Expand Up @@ -758,7 +758,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());
Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/ElevatorState.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "StdAfx.h"
#include "ElevatorState.h"
#include "ClimableObject.h"
#include "PHCharacter.h"
#include "xrPhysics/PHCharacter.h"
#include "MathUtils.h"
#include "PHWorld.h"
#include "xrPhysics/PHWorld.h"
#ifdef DEBUG
#include "../xrEngine/Statgraph.h"
#include "PHDebug.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/EntityCondition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#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"
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/ExoOutfit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#pragma once

#include "StdAfx.h"
#include "exooutfit.h"
#include "ExoOutfit.h"

CExoOutfit::CExoOutfit() {}
CExoOutfit::~CExoOutfit() {}
6 changes: 3 additions & 3 deletions src/xrGame/F1.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#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"
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/GameObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,7 @@ void CGameObject::u_EventGen(NET_Packet& P, u32 type, u32 dest)
}

void CGameObject::u_EventSend(NET_Packet& P, u32 dwFlags) { Level().Send(P, dwFlags); }
#include "bolt.h"
#include "Bolt.h"

BOOL CGameObject::UsedAI_Locations() { return (m_server_flags.test(CSE_ALifeObject::flUsedAI_Locations)); }
BOOL CGameObject::TestServerFlag(u32 Flag) const { return (m_server_flags.test(Flag)); }
Expand Down
3 changes: 1 addition & 2 deletions src/xrGame/GamePersistent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "Actor.h"
#include "Spectator.h"

#include "UI/UItextureMaster.h"
#include "ui/UITextureMaster.h"

#include "xrEngine/xrSASH.h"
#include "ai_space.h"
Expand Down Expand Up @@ -943,7 +943,6 @@ 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"
void CGamePersistent::OnSectorChanged(int sector)
{
if (CurrentGameUI())
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/GameTask.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "alife_story_registry.h"
#include "game_object_space.h"
#include "Common/object_broker.h"
#include "ui/uitexturemaster.h"
#include "ui/UITextureMaster.h"

CGameTask::CGameTask()
: m_map_object_id(0), m_TimeToComplete(0), m_priority(0)
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/GametaskManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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"
#include "xrCore/buffer_vector.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/GrenadeLauncher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "StdAfx.h"

#include "grenadelauncher.h"
#include "GrenadeLauncher.h"

CGrenadeLauncher::CGrenadeLauncher() { m_fGrenadeVel = 0.f; }
CGrenadeLauncher::~CGrenadeLauncher() {}
Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/HUDManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "game_cl_base.h"
#include "xrEngine/GameFont.h"
#ifdef DEBUG
#include "phdebug.h"
#include "PHDebug.h"
#endif

extern CUIGameCustom* CurrentGameUI() { return HUD().GetGameUI(); }
Expand Down Expand Up @@ -313,7 +313,7 @@ void CHUDManager::SetHitmarkType(LPCSTR tex_name) { HitMarker.InitShader(tex_nam
void CHUDManager::SetGrenadeMarkType(LPCSTR tex_name) { HitMarker.InitShader_Grenade(tex_name); }
// ------------------------------------------------------------------------------------

#include "ui/UIMainInGameWnd.h"
#include "ui/UIMainIngameWnd.h"
extern CUIXml* pWpnScopeXml;

void CHUDManager::Load()
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/HelicopterMovementManager.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "pch_script.h"
#include "Helicopter.h"
#include "helicopter.h"
#include "Level.h"
#include "xrAICore/Navigation/PatrolPath/patrol_path.h"
#include "xrAICore/Navigation/PatrolPath/patrol_path_storage.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/IKFoot.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "StdAfx.h"

#include "ikfoot.h"
#include "IKFoot.h"

#include "ik_collide_data.h"
#include "GameObject.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/InventoryBox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ void CInventoryBox::OnEvent(NET_Packet& P, u16 type)

void CInventoryBox::UpdateCL() { inherited::UpdateCL(); }
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);
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/Missile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "xrEngine/IGame_Persistent.h"
#include "xrNetServer/NET_Messages.h"
#ifdef DEBUG
#include "phdebug.h"
#include "PHDebug.h"
#endif

#define PLAYING_ANIM_TIME 10000
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/PHMovementControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "PhysicsShellHolder.h"
#include "xrCore/xr_token.h"
#ifdef DEBUG
#include "phdebug.h"
#include "PHDebug.h"
#endif

#include "Include/xrRender/Kinematics.h"
Expand Down
Loading

0 comments on commit 918218f

Please sign in to comment.