Skip to content

Commit

Permalink
xrEngine: Fixed includes.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kaffeine committed Nov 11, 2015
1 parent 8214988 commit a30082a
Show file tree
Hide file tree
Showing 37 changed files with 63 additions and 63 deletions.
2 changes: 1 addition & 1 deletion src/xrEngine/CameraDebug.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

/*
#include "CameraBase.h"
#include "iinputreceiver.h"
#include "IInputReceiver.h"
class ENGINE_API CCameraDebug :
public CCameraBase,
Expand Down
4 changes: 2 additions & 2 deletions src/xrEngine/CameraManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/xrEngine/Environment.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/Environment_misc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 "Common/object_broker.h"
Expand Down
4 changes: 2 additions & 2 deletions src/xrEngine/Environment_render.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/xrEngine/EventAPI.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "eventapi.h"
#include "xr_ioconsole.h"
#include "EventAPI.h"
#include "XR_IOConsole.h"

extern void msRead();
extern void msCreate(LPCSTR name);
Expand Down
6 changes: 3 additions & 3 deletions src/xrEngine/FDemoPlay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

#include "stdafx.h"
#include "IGame_Level.h"
#include "fdemoplay.h"
#include "xr_ioconsole.h"
#include "FDemoPlay.h"
#include "XR_IOConsole.h"
#include "xrCore/Animation/Motion.hpp"
#include "Render.h"
#include "CameraManager.h"

#include "xrSash.h"
#include "xrSASH.h"

//////////////////////////////////////////////////////////////////////
// Construction/Destruction
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/FDemoPlay.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/xrEngine/FDemoRecord.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
#include "IGame_Level.h"
#include "x_ray.h"

#include "gamefont.h"
#include "GameFont.h"
#include "fDemoRecord.h"
#include "xr_ioconsole.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"

Expand Down
4 changes: 2 additions & 2 deletions src/xrEngine/FDemoRecord.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#pragma once

#include "iinputreceiver.h"
#include "effector.h"
#include "IInputReceiver.h"
#include "Effector.h"

class ENGINE_API CDemoRecord :
public CEffectorCam,
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/Feel_Touch.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "IGame_Level.h"
#include "feel_touch.h"
#include "Feel_Touch.h"
#include "xr_object.h"
using namespace Feel;

Expand Down
4 changes: 2 additions & 2 deletions src/xrEngine/Feel_Vision.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "stdafx.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"
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/Feel_Vision.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "xrCDB/xr_collide_defs.h"
#include "render.h"
#include "Render.h"
#include "pure_relcase.h"

class IRender_Sector;
Expand Down
4 changes: 2 additions & 2 deletions src/xrEngine/ICollidable.cpp
Original file line number Diff line number Diff line change
@@ -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"
// XXX: rename this file to CollidableBase.cpp
CollidableBase::CollidableBase()
Expand Down
8 changes: 4 additions & 4 deletions src/xrEngine/IGame_Level.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

#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 "Common/LevelStructure.hpp"
#include "CameraManager.h"
#include "xr_object.h"
#include "feel_sound.h"
#include "Feel_Sound.h"

#include "securom_api.h"

Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/IGame_Level.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#pragma once

#include "iinputreceiver.h"
#include "IInputReceiver.h"
#include "xr_object_list.h"
#include "xrCDB/xr_area.h"

Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/IGame_ObjectPool.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "stdafx.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)
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/IGame_Persistent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# include "IGame_Level.h"
# include "XR_IOConsole.h"
# include "Render.h"
# include "ps_instance.h"
# include "PS_instance.h"
# include "CustomHUD.h"
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/IInputReceiver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#pragma hdrstop

#include "xr_input.h"
#include "iinputreceiver.h"
#include "IInputReceiver.h"

void IInputReceiver::IR_Capture(void)
{
Expand Down
4 changes: 2 additions & 2 deletions src/xrEngine/IRenderable.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "xrCDB/ispatial.h"
#include "irenderable.h"
#include "xrCDB/ISpatial.h"
#include "IRenderable.h"

IRenderable::IRenderable()
{
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/IRenderable.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef IRENDERABLE_H_INCLUDED
#define IRENDERABLE_H_INCLUDED

#include "render.h"
#include "Render.h"

//////////////////////////////////////////////////////////////////////////
// definition ("Renderable")
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/PS_instance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) :
Expand Down
6 changes: 3 additions & 3 deletions src/xrEngine/PS_instance.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#ifndef _CPS_Instance_H_
#define _CPS_Instance_H_

#include "xrCDB/ispatial.h"
#include "isheduled.h"
#include "irenderable.h"
#include "xrCDB/ISpatial.h"
#include "ISheduled.h"
#include "IRenderable.h"

class ENGINE_API CPS_Instance :
public SpatialBase,
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/Rain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#ifdef _EDITOR
#include "ui_toolscustom.h"
#else
#include "render.h"
#include "Render.h"
#include "IGame_Level.h"
#include "xrCDB/xr_area.h"
#include "xr_object.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/Render.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "render.h"
#include "Render.h"

// resources
IRender_Light::~IRender_Light()
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/Render.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "xrEngine/Engine.h"
#include "xrCDB/frustum.h"
#include "xrCDB/Frustum.h"
#include "vis_common.h"
#include "Include/xrAPI/xrAPI.h"
#include "Include/xrRender/FactoryPtr.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/Stats.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "xrCDB/ISpatial.h"
#include "IGame_Persistent.h"
#include "IGame_Level.h"
#include "render.h"
#include "Render.h"
#include "xr_object.h"

#include "Include/xrRender/DrawUtils.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/cf_dynamic_mesh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions src/xrEngine/device.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "xrCDB/frustum.h"
#include "xrCDB/Frustum.h"

#pragma warning(disable:4995)
// mmsystem.h
Expand All @@ -12,7 +12,7 @@
#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
Expand All @@ -23,7 +23,7 @@
# include "engine_impl.hpp"
#endif // #ifdef INGAME_EDITOR

#include "xrSash.h"
#include "xrSASH.h"
#include "IGame_Persistent.h"
#include "xrScriptEngine/ScriptExporter.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/engine_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#ifdef INGAME_EDITOR
#include "engine_impl.hpp"
#include "xr_ioconsole.h"
#include "XR_IOConsole.h"
#include "xr_input.h"
#include "IGame_Persistent.h"
#include "IGame_Level.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/phdebug.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "stdafx.h"

#include "iphdebug.h"
#include "IPHdebug.h"

IPhDebugRender* ph_debug_render = 0;
4 changes: 2 additions & 2 deletions src/xrEngine/thunderbolt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#pragma once

#ifndef _EDITOR
#include "render.h"
#include "Render.h"
#endif
#include "Thunderbolt.h"
#include "thunderbolt.h"
#include "IGame_Persistent.h"
#include "LightAnimLibrary.h"

Expand Down
6 changes: 3 additions & 3 deletions src/xrEngine/x_ray.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
#include "xrNetServer/NET_AuthCheck.h"

#include "xr_input.h"
#include "xr_ioconsole.h"
#include "XR_IOConsole.h"
#include "x_ray.h"
#include "std_classes.h"
#include "GameFont.h"
#include "resource.h"
#include "LightAnimLibrary.h"
#include "xrCDB/ispatial.h"
#include "xrCDB/ISpatial.h"
#include "CopyProtection.h"
#include "Text_Console.h"
#include <process.h>
#include <locale.h>

#include "xrSash.h"
#include "xrSASH.h"

#include "securom_api.h"
#include "xrScriptEngine/script_engine.hpp"
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/xrSASH.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "xrSASH.h"

#include "xr_ioconsole.h"
#include "XR_IOConsole.h"
#include "xr_ioc_cmd.h"

xrSASH ENGINE_API g_SASH;
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/xr_ioc_cmd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@


#include "x_ray.h"
#include "xr_ioconsole.h"
#include "XR_IOConsole.h"
#include "xr_ioc_cmd.h"

#include "cameramanager.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/xr_object.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "xr_object.h"
#include "xrCDB/xr_area.h"
#include "render.h"
#include "Render.h"
#include "Common/LevelStructure.hpp"
#include "Include/xrRender/RenderVisual.h"
#include "Include/xrRender/Kinematics.h"
Expand Down
Loading

0 comments on commit a30082a

Please sign in to comment.