diff --git a/cm/CollisionModel.h b/cm/CollisionModel.h index 57561f1..edb0365 100644 --- a/cm/CollisionModel.h +++ b/cm/CollisionModel.h @@ -29,6 +29,14 @@ If you have questions concerning this license or the applicable additional terms #ifndef __COLLISIONMODELMANAGER_H__ #define __COLLISIONMODELMANAGER_H__ +#include "idlib/geometry/TraceModel.h" +#include "idlib/math/Vector.h" +#include "idlib/math/Matrix.h" +#include "idlib/bv/Bounds.h" +#include "idlib/MapFile.h" + +class idMaterial; + /* =============================================================================== diff --git a/d3xp/AF.cpp b/d3xp/AF.cpp index 526c8cf..e527b14 100644 --- a/d3xp/AF.cpp +++ b/d3xp/AF.cpp @@ -26,11 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/geometry/JointTransform.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "AF.h" /* =============================================================================== diff --git a/d3xp/AF.h b/d3xp/AF.h index 6380707..79e3751 100644 --- a/d3xp/AF.h +++ b/d3xp/AF.h @@ -29,6 +29,13 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_AF_H__ #define __GAME_AF_H__ +#include "idlib/Parser.h" +#include "framework/DeclAF.h" +#include "renderer/Model.h" + +#include "physics/Physics_AF.h" +#include "Entity.h" +#include "anim/Anim.h" /* =============================================================================== diff --git a/d3xp/AFEntity.cpp b/d3xp/AFEntity.cpp index f730640..2ebb513 100644 --- a/d3xp/AFEntity.cpp +++ b/d3xp/AFEntity.cpp @@ -26,11 +26,17 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/geometry/JointTransform.h" +#include "renderer/ModelManager.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "Item.h" +#include "Player.h" +#include "Fx.h" +#include "SmokeParticles.h" +#include "AFEntity.h" /* =============================================================================== diff --git a/d3xp/AFEntity.h b/d3xp/AFEntity.h index 3739189..a63dda9 100644 --- a/d3xp/AFEntity.h +++ b/d3xp/AFEntity.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_AFENTITY_H__ #define __GAME_AFENTITY_H__ +#include "physics/Physics_AF.h" +#include "physics/Force_Constant.h" +#include "Entity.h" +#include "AF.h" /* =============================================================================== diff --git a/d3xp/Actor.cpp b/d3xp/Actor.cpp index d4638c6..39cec39 100644 --- a/d3xp/Actor.cpp +++ b/d3xp/Actor.cpp @@ -26,10 +26,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" +#include "Item.h" +#include "Light.h" +#include "Projectile.h" +#include "WorldSpawn.h" -#include "Game_local.h" +#include "Actor.h" /*********************************************************************** diff --git a/d3xp/Actor.h b/d3xp/Actor.h index 4af6006..5ecef15 100644 --- a/d3xp/Actor.h +++ b/d3xp/Actor.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_ACTOR_H__ #define __GAME_ACTOR_H__ +#include "AFEntity.h" +#include "IK.h" +#include "PlayerView.h" + /* =============================================================================== diff --git a/d3xp/BrittleFracture.cpp b/d3xp/BrittleFracture.cpp index 665a623..75e1349 100644 --- a/d3xp/BrittleFracture.cpp +++ b/d3xp/BrittleFracture.cpp @@ -26,11 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/DeclEntityDef.h" +#include "renderer/ModelManager.h" -#include "Game_local.h" +#include "Fx.h" +#include "BrittleFracture.h" CLASS_DECLARATION( idEntity, idBrittleFracture ) EVENT( EV_Activate, idBrittleFracture::Event_Activate ) diff --git a/d3xp/BrittleFracture.h b/d3xp/BrittleFracture.h index 18d704b..0ccc1b0 100644 --- a/d3xp/BrittleFracture.h +++ b/d3xp/BrittleFracture.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_BRITTLEFRACTURE_H__ #define __GAME_BRITTLEFRACTURE_H__ +#include "physics/Physics_RigidBody.h" +#include "physics/Physics_StaticMulti.h" +#include "physics/Clip.h" +#include "Entity.h" /* =============================================================================== diff --git a/d3xp/Camera.cpp b/d3xp/Camera.cpp index 55eaafd..dedba94 100644 --- a/d3xp/Camera.cpp +++ b/d3xp/Camera.cpp @@ -26,10 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" +#include "Player.h" -#include "Game_local.h" +#include "Camera.h" /* =============================================================================== diff --git a/d3xp/Camera.h b/d3xp/Camera.h index 3d6016e..ee5f5f5 100644 --- a/d3xp/Camera.h +++ b/d3xp/Camera.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_CAMERA_H__ #define __GAME_CAMERA_H__ +#include "idlib/math/Quat.h" + +#include "Entity.h" /* =============================================================================== diff --git a/d3xp/EndLevel.cpp b/d3xp/EndLevel.cpp index 21f1ec9..3dd4cd5 100644 --- a/d3xp/EndLevel.cpp +++ b/d3xp/EndLevel.cpp @@ -26,10 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" -#include "Game_local.h" +#include "EndLevel.h" /* diff --git a/d3xp/EndLevel.h b/d3xp/EndLevel.h index b2d6b04..2d83085 100644 --- a/d3xp/EndLevel.h +++ b/d3xp/EndLevel.h @@ -26,6 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ +#ifndef __GAME_ENDLEVEL_H__ +#define __GAME_ENDLEVEL_H__ + +#include "Entity.h" + class idTarget_EndLevel : public idEntity { public: CLASS_PROTOTYPE( idTarget_EndLevel ); @@ -63,3 +68,5 @@ private: void Event_Trigger( idEntity *activator ); }; + +#endif diff --git a/d3xp/Entity.cpp b/d3xp/Entity.cpp index 15b3953..9fb6f24 100644 --- a/d3xp/Entity.cpp +++ b/d3xp/Entity.cpp @@ -26,10 +26,25 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/geometry/JointTransform.h" +#include "idlib/LangDict.h" +#include "framework/async/NetworkSystem.h" +#include "framework/DeclEntityDef.h" +#include "renderer/ModelManager.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "physics/Physics_Parametric.h" +#include "physics/Physics_Actor.h" +#include "script/Script_Thread.h" +#include "Fx.h" +#include "AFEntity.h" +#include "Player.h" +#include "Mover.h" +#include "WorldSpawn.h" +#include "SmokeParticles.h" + +#include "Entity.h" /* =============================================================================== diff --git a/d3xp/Entity.h b/d3xp/Entity.h index 0fe5fb7..4413c30 100644 --- a/d3xp/Entity.h +++ b/d3xp/Entity.h @@ -29,6 +29,16 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_ENTITY_H__ #define __GAME_ENTITY_H__ +#include "idlib/math/Curve.h" +#include "framework/DeclParticle.h" + +#include "physics/Physics_Static.h" +#include "physics/Physics.h" +#include "script/Script_Program.h" +#include "gamesys/Class.h" +#include "gamesys/Event.h" +#include "Game_local.h" + /* =============================================================================== diff --git a/d3xp/Fx.cpp b/d3xp/Fx.cpp index a537b08..d61fdf6 100644 --- a/d3xp/Fx.cpp +++ b/d3xp/Fx.cpp @@ -26,10 +26,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "renderer/ModelManager.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "Player.h" +#include "Projectile.h" +#include "WorldSpawn.h" + +#include "Fx.h" /* =============================================================================== diff --git a/d3xp/Fx.h b/d3xp/Fx.h index f546d41..bb99225 100644 --- a/d3xp/Fx.h +++ b/d3xp/Fx.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_FX_H__ #define __GAME_FX_H__ +#include "renderer/RenderWorld.h" + +#include "Entity.h" + /* =============================================================================== diff --git a/d3xp/GameEdit.cpp b/d3xp/GameEdit.cpp index a5be11e..0c637bd 100644 --- a/d3xp/GameEdit.cpp +++ b/d3xp/GameEdit.cpp @@ -26,11 +26,17 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "Game_local.h" +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "physics/Physics_Monster.h" +#include "ai/AI.h" +#include "Player.h" +#include "Light.h" +#include "WorldSpawn.h" +#include "Sound.h" +#include "Misc.h" +#include "GameEdit.h" /* =============================================================================== diff --git a/d3xp/GameEdit.h b/d3xp/GameEdit.h index 4e63f67..bbc31ce 100644 --- a/d3xp/GameEdit.h +++ b/d3xp/GameEdit.h @@ -29,6 +29,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_EDIT_H__ #define __GAME_EDIT_H__ +#include "framework/DeclPDA.h" + +#include "physics/Force_Drag.h" +#include "Entity.h" + +class Player; /* =============================================================================== diff --git a/d3xp/Game_local.cpp b/d3xp/Game_local.cpp index 97b6b4a..0ad8441 100644 --- a/d3xp/Game_local.cpp +++ b/d3xp/Game_local.cpp @@ -26,8 +26,26 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/LangDict.h" +#include "idlib/Timer.h" +#include "framework/async/NetworkSystem.h" +#include "framework/BuildVersion.h" +#include "framework/DeclEntityDef.h" +#include "framework/FileSystem.h" +#include "renderer/ModelManager.h" + +#include "gamesys/SysCvar.h" +#include "gamesys/SysCmds.h" +#include "script/Script_Thread.h" +#include "ai/AI.h" +#include "anim/Anim_Testmodel.h" +#include "Camera.h" +#include "SmokeParticles.h" +#include "Player.h" +#include "WorldSpawn.h" +#include "Misc.h" +#include "Trigger.h" #include "Game_local.h" diff --git a/d3xp/Game_local.h b/d3xp/Game_local.h index 2ace524..cb229cd 100644 --- a/d3xp/Game_local.h +++ b/d3xp/Game_local.h @@ -31,6 +31,26 @@ If you have questions concerning this license or the applicable additional terms #include "GameBase.h" +#include "idlib/containers/StrList.h" +#include "idlib/containers/LinkList.h" +#include "idlib/BitMsg.h" +#include "framework/Game.h" + +#include "gamesys/SaveGame.h" +#include "physics/Clip.h" +#include "physics/Push.h" +#include "script/Script_Program.h" +#include "ai/AAS.h" +#include "anim/Anim.h" +#include "Pvs.h" +#include "MultiplayerGame.h" + +#ifdef ID_DEBUG_UNINITIALIZED_MEMORY +// This is real evil but allows the code to inspect arbitrary class variables. +#define private public +#define protected public +#endif + /* =============================================================================== @@ -38,12 +58,10 @@ If you have questions concerning this license or the applicable additional terms =============================================================================== */ - -#ifdef ID_DEBUG_UNINITIALIZED_MEMORY -// This is real evil but allows the code to inspect arbitrary class variables. -#define private public -#define protected public -#endif +class idDeclEntityDef; +class idRenderWorld; +class idSoundWorld; +class idUserInterface; extern idRenderWorld * gameRenderWorld; extern idSoundWorld * gameSoundWorld; @@ -55,41 +73,29 @@ class idPlayer; class idCamera; class idWorldspawn; class idTestModel; -class idAAS; -class idAI; class idSmokeParticles; class idEntityFx; class idTypeInfo; -class idProgram; class idThread; class idEditEntities; class idLocationEntity; //============================================================================ - -#include "gamesys/Event.h" -#include "gamesys/Class.h" -#include "gamesys/SysCvar.h" -#include "gamesys/SysCmds.h" -#include "gamesys/SaveGame.h" -#include "gamesys/DebugGraph.h" - -#include "script/Script_Program.h" - -#include "anim/Anim.h" - -#include "ai/AAS.h" - -#include "physics/Clip.h" -#include "physics/Push.h" - -#include "Pvs.h" -#include "MultiplayerGame.h" - -//============================================================================ - extern const int NUM_RENDER_PORTAL_BITS; +void gameError( const char *fmt, ... ); + +extern idRenderWorld * gameRenderWorld; +extern idSoundWorld * gameSoundWorld; + +extern const int NUM_RENDER_PORTAL_BITS; +/* +=============================================================================== + + Local implementation of the public game interface. + +=============================================================================== +*/ typedef struct entityState_s { int entityNumber; idBitMsg state; @@ -709,62 +715,4 @@ extern const float DEFAULT_GRAVITY; extern const idVec3 DEFAULT_GRAVITY_VEC3; extern const int CINEMATIC_SKIP_DELAY; -//============================================================================ - -#include "physics/Force.h" -#include "physics/Force_Constant.h" -#include "physics/Force_Drag.h" -#ifdef _D3XP -#include "physics/Force_Grab.h" -#endif -#include "physics/Force_Field.h" -#include "physics/Force_Spring.h" -#include "physics/Physics.h" -#include "physics/Physics_Static.h" -#include "physics/Physics_StaticMulti.h" -#include "physics/Physics_Base.h" -#include "physics/Physics_Actor.h" -#include "physics/Physics_Monster.h" -#include "physics/Physics_Player.h" -#include "physics/Physics_Parametric.h" -#include "physics/Physics_RigidBody.h" -#include "physics/Physics_AF.h" - -#include "SmokeParticles.h" - -#include "Entity.h" -#include "GameEdit.h" -#ifdef _D3XP -#include "Grabber.h" -#endif -#include "AF.h" -#include "IK.h" -#include "AFEntity.h" -#include "Misc.h" -#include "Actor.h" -#include "Projectile.h" -#include "Weapon.h" -#include "Light.h" -#include "WorldSpawn.h" -#include "Item.h" -#include "PlayerView.h" -#include "PlayerIcon.h" -#include "Player.h" -#include "Mover.h" -#include "Camera.h" -#include "Moveable.h" -#include "Target.h" -#include "Trigger.h" -#include "Sound.h" -#include "Fx.h" -#include "SecurityCamera.h" -#include "BrittleFracture.h" - -#include "ai/AI.h" -#include "anim/Anim_Testmodel.h" - -#include "script/Script_Compiler.h" -#include "script/Script_Interpreter.h" -#include "script/Script_Thread.h" - #endif /* !__GAME_LOCAL_H__ */ diff --git a/d3xp/Game_network.cpp b/d3xp/Game_network.cpp index ca979d8..ae53fad 100644 --- a/d3xp/Game_network.cpp +++ b/d3xp/Game_network.cpp @@ -26,8 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/FileSystem.h" +#include "framework/async/NetworkSystem.h" +#include "renderer/RenderSystem.h" + +#include "gamesys/SysCmds.h" +#include "Entity.h" +#include "Player.h" #include "Game_local.h" diff --git a/d3xp/Grabber.cpp b/d3xp/Grabber.cpp index 34b8067..9aa3a31 100644 --- a/d3xp/Grabber.cpp +++ b/d3xp/Grabber.cpp @@ -25,14 +25,19 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop #ifdef _D3XP -#include "Game_local.h" +#include "sys/platform.h" + +#include "gamesys/SysCvar.h" +#include "ai/AI.h" +#include "Player.h" +#include "Moveable.h" #include "Misc.h" +#include "Grabber.h" + #define MAX_DRAG_TRACE_DISTANCE 384.0f #define TRACE_BOUNDS_SIZE 3.f #define HOLD_DISTANCE 72.f diff --git a/d3xp/Grabber.h b/d3xp/Grabber.h index 1b14fae..e5b2933 100644 --- a/d3xp/Grabber.h +++ b/d3xp/Grabber.h @@ -25,8 +25,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ + +#ifndef __GAME_GRABBER_H__ +#define __GAME_GRABBER_H__ + #ifdef _D3XP +#include "physics/Force_Grab.h" +#include "Entity.h" + /* =============================================================================== @@ -84,3 +91,5 @@ private: }; #endif + +#endif diff --git a/d3xp/IK.cpp b/d3xp/IK.cpp index 740accb..6bd54d6 100644 --- a/d3xp/IK.cpp +++ b/d3xp/IK.cpp @@ -26,10 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/geometry/JointTransform.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "Mover.h" + +#include "IK.h" /* =============================================================================== diff --git a/d3xp/IK.h b/d3xp/IK.h index 2e71b81..a2a9f83 100644 --- a/d3xp/IK.h +++ b/d3xp/IK.h @@ -29,6 +29,11 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_IK_H__ #define __GAME_IK_H__ +#include "Entity.h" + +class idSaveGame; +class idRestoreGame; + /* =============================================================================== diff --git a/d3xp/Item.cpp b/d3xp/Item.cpp index 34713c1..87d0eea 100644 --- a/d3xp/Item.cpp +++ b/d3xp/Item.cpp @@ -26,11 +26,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "renderer/RenderSystem.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "Player.h" +#include "Fx.h" +#include "SmokeParticles.h" +#include "Item.h" /* =============================================================================== diff --git a/d3xp/Item.h b/d3xp/Item.h index 8d6c715..d02b7b2 100644 --- a/d3xp/Item.h +++ b/d3xp/Item.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_ITEM_H__ #define __GAME_ITEM_H__ +#include "physics/Physics_RigidBody.h" +#include "Entity.h" /* =============================================================================== diff --git a/d3xp/Light.cpp b/d3xp/Light.cpp index 05cfb24..7bbb149 100644 --- a/d3xp/Light.cpp +++ b/d3xp/Light.cpp @@ -26,10 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "renderer/ModelManager.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" + +#include "Light.h" /* =============================================================================== diff --git a/d3xp/Light.h b/d3xp/Light.h index 123c8f2..851bf02 100644 --- a/d3xp/Light.h +++ b/d3xp/Light.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_LIGHT_H__ #define __GAME_LIGHT_H__ +#include "gamesys/Event.h" +#include "Entity.h" + /* =============================================================================== diff --git a/d3xp/Misc.cpp b/d3xp/Misc.cpp index cce92cd..55cf679 100644 --- a/d3xp/Misc.cpp +++ b/d3xp/Misc.cpp @@ -31,10 +31,19 @@ Various utility objects and functions. */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "renderer/ModelManager.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" +#include "ai/AI.h" +#include "Player.h" +#include "Camera.h" +#include "WorldSpawn.h" +#include "Moveable.h" +#include "SmokeParticles.h" + +#include "Misc.h" /* =============================================================================== diff --git a/d3xp/Misc.h b/d3xp/Misc.h index 4b51aa8..a325409 100644 --- a/d3xp/Misc.h +++ b/d3xp/Misc.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_MISC_H__ #define __GAME_MISC_H__ +#include "physics/Physics_Parametric.h" +#include "physics/Force_Field.h" +#include "physics/Force_Spring.h" /* =============================================================================== diff --git a/d3xp/Moveable.cpp b/d3xp/Moveable.cpp index e2bdd1f..2ab494e 100644 --- a/d3xp/Moveable.cpp +++ b/d3xp/Moveable.cpp @@ -26,10 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "renderer/ModelManager.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "ai/AI.h" +#include "Fx.h" + +#include "Moveable.h" /* =============================================================================== diff --git a/d3xp/Moveable.h b/d3xp/Moveable.h index b8e0ba2..53f2751 100644 --- a/d3xp/Moveable.h +++ b/d3xp/Moveable.h @@ -29,6 +29,13 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_MOVEABLE_H__ #define __GAME_MOVEABLE_H__ +#include "physics/Physics_RigidBody.h" +#include "script/Script_Thread.h" +#include "gamesys/Event.h" +#include "Entity.h" +#include "Player.h" +#include "Projectile.h" + /* =============================================================================== diff --git a/d3xp/Mover.cpp b/d3xp/Mover.cpp index a2414bb..4e4160f 100644 --- a/d3xp/Mover.cpp +++ b/d3xp/Mover.cpp @@ -26,10 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" +#include "Player.h" -#include "Game_local.h" +#include "Mover.h" // _D3XP : rename all gameLocal.time to gameLocal.slow.time for merge! diff --git a/d3xp/Mover.h b/d3xp/Mover.h index 784c9eb..dc660da 100644 --- a/d3xp/Mover.h +++ b/d3xp/Mover.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_MOVER_H__ #define __GAME_MOVER_H__ +#include "physics/Physics_Parametric.h" +#include "Entity.h" + extern const idEventDef EV_TeamBlocked; extern const idEventDef EV_PartBlocked; extern const idEventDef EV_ReachedPos; diff --git a/d3xp/MultiplayerGame.cpp b/d3xp/MultiplayerGame.cpp index ae43af6..c199ff3 100644 --- a/d3xp/MultiplayerGame.cpp +++ b/d3xp/MultiplayerGame.cpp @@ -26,11 +26,21 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/BitMsg.h" +#include "idlib/Str.h" +#include "idlib/LangDict.h" +#include "framework/async/NetworkSystem.h" +#include "framework/FileSystem.h" +#include "framework/DeclEntityDef.h" +#include "ui/UserInterface.h" +#include "gamesys/SysCvar.h" +#include "Player.h" #include "Game_local.h" +#include "MultiplayerGame.h" + // could be a problem if players manage to go down sudden deaths till this .. oh well #define LASTMAN_NOLIVES -20 diff --git a/d3xp/MultiplayerGame.h b/d3xp/MultiplayerGame.h index 718b1dd..100f987 100644 --- a/d3xp/MultiplayerGame.h +++ b/d3xp/MultiplayerGame.h @@ -29,6 +29,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MULTIPLAYERGAME_H__ #define __MULTIPLAYERGAME_H__ +#include "idlib/BitMsg.h" +#include "idlib/Str.h" +#include "ui/UserInterface.h" + +#include "GameBase.h" + /* =============================================================================== diff --git a/d3xp/Player.cpp b/d3xp/Player.cpp index 411ddaf..f53b09f 100644 --- a/d3xp/Player.cpp +++ b/d3xp/Player.cpp @@ -26,10 +26,20 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/LangDict.h" +#include "framework/async/NetworkSystem.h" +#include "framework/DeclEntityDef.h" +#include "renderer/RenderSystem.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" +#include "ai/AI.h" +#include "WorldSpawn.h" +#include "Player.h" +#include "Camera.h" +#include "Fx.h" +#include "Misc.h" const int ASYNC_PLAYER_INV_AMMO_BITS = idMath::BitsForInteger( 999 ); // 9 bits to cover the range [0, 999] const int ASYNC_PLAYER_INV_CLIP_BITS = -7; // -7 bits to cover the range [-1, 60] diff --git a/d3xp/Player.h b/d3xp/Player.h index d469713..aadf855 100644 --- a/d3xp/Player.h +++ b/d3xp/Player.h @@ -29,6 +29,19 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_PLAYER_H__ #define __GAME_PLAYER_H__ +#include "idlib/math/Interpolate.h" + +#include "physics/Physics_Player.h" +#include "Item.h" +#include "Actor.h" +#include "Weapon.h" +#include "Projectile.h" +#include "PlayerIcon.h" +#include "GameEdit.h" + +class idAI; +class idFuncMountedObject; + /* =============================================================================== diff --git a/d3xp/PlayerIcon.cpp b/d3xp/PlayerIcon.cpp index cb9828d..3fd58ef 100644 --- a/d3xp/PlayerIcon.cpp +++ b/d3xp/PlayerIcon.cpp @@ -26,10 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "renderer/ModelManager.h" + +#include "gamesys/SysCvar.h" +#include "Player.h" -#include "Game_local.h" #include "PlayerIcon.h" static const char * iconKeys[ ICON_NONE ] = { diff --git a/d3xp/PlayerView.cpp b/d3xp/PlayerView.cpp index 4dfd258..00a5d21 100644 --- a/d3xp/PlayerView.cpp +++ b/d3xp/PlayerView.cpp @@ -26,10 +26,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "renderer/RenderWorld.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "gamesys/SaveGame.h" +#include "GameBase.h" +#include "Player.h" + +#include "PlayerView.h" // _D3XP : rename all gameLocal.time to gameLocal.slow.time for merge! diff --git a/d3xp/PlayerView.h b/d3xp/PlayerView.h index 4971d79..502abb8 100644 --- a/d3xp/PlayerView.h +++ b/d3xp/PlayerView.h @@ -29,6 +29,14 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_PLAYERVIEW_H__ #define __GAME_PLAYERVIEW_H__ +#include "idlib/math/Vector.h" +#include "idlib/Dict.h" +#include "renderer/Material.h" +#include "renderer/RenderWorld.h" + +class idSaveGame; +class idRestoreGame; + /* =============================================================================== diff --git a/d3xp/Projectile.cpp b/d3xp/Projectile.cpp index 101706f..4b7bbfe 100644 --- a/d3xp/Projectile.cpp +++ b/d3xp/Projectile.cpp @@ -26,10 +26,18 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "renderer/ModelManager.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" +#include "ai/AI.h" +#include "Player.h" +#include "Mover.h" +#include "SmokeParticles.h" +#include "Misc.h" + +#include "Projectile.h" /* =============================================================================== diff --git a/d3xp/Projectile.h b/d3xp/Projectile.h index 1b0784f..ed2433a 100644 --- a/d3xp/Projectile.h +++ b/d3xp/Projectile.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_PROJECTILE_H__ #define __GAME_PROJECTILE_H__ +#include "physics/Physics_RigidBody.h" +#include "physics/Force_Constant.h" +#include "Entity.h" + /* =============================================================================== diff --git a/d3xp/Pvs.cpp b/d3xp/Pvs.cpp index 9564982..7aabc78 100644 --- a/d3xp/Pvs.cpp +++ b/d3xp/Pvs.cpp @@ -26,13 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/Timer.h" #include "Game_local.h" -#define MAX_BOUNDS_AREAS 16 +#include "Pvs.h" +#define MAX_BOUNDS_AREAS 16 typedef struct pvsPassage_s { byte * canSee; // bit set for all portals that can be seen through this passage diff --git a/d3xp/Pvs.h b/d3xp/Pvs.h index 17a5f4a..64251dd 100644 --- a/d3xp/Pvs.h +++ b/d3xp/Pvs.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_PVS_H__ #define __GAME_PVS_H__ +#include "idlib/geometry/Winding.h" +#include "idlib/math/Vector.h" +#include "idlib/bv/Bounds.h" + /* =================================================================================== diff --git a/d3xp/SecurityCamera.cpp b/d3xp/SecurityCamera.cpp index 44df1aa..c16405a 100644 --- a/d3xp/SecurityCamera.cpp +++ b/d3xp/SecurityCamera.cpp @@ -25,24 +25,23 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -/* - SecurityCamera.cpp - - Security camera that triggers targets when player is in view - -*/ - -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "Game_local.h" +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "physics/Physics_RigidBody.h" +#include "Entity.h" +#include "Light.h" +#include "Player.h" +#include "Fx.h" +#include "SecurityCamera.h" /*********************************************************************** idSecurityCamera + Security camera that triggers targets when player is in view + ***********************************************************************/ const idEventDef EV_SecurityCam_ReverseSweep( "" ); diff --git a/d3xp/SecurityCamera.h b/d3xp/SecurityCamera.h index 02600df..6e54dfd 100644 --- a/d3xp/SecurityCamera.h +++ b/d3xp/SecurityCamera.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_SECURITYCAMERA_H__ #define __GAME_SECURITYCAMERA_H__ +#include "Entity.h" + /* =================================================================================== diff --git a/d3xp/SmokeParticles.cpp b/d3xp/SmokeParticles.cpp index 8eafa85..710baec 100644 --- a/d3xp/SmokeParticles.cpp +++ b/d3xp/SmokeParticles.cpp @@ -26,11 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - +#include "sys/platform.h" +#include "renderer/ModelManager.h" +#include "Entity.h" #include "Game_local.h" +#include "SmokeParticles.h" + static const char *smokeParticle_SnapshotName = "_SmokeParticle_Snapshot_"; /* diff --git a/d3xp/SmokeParticles.h b/d3xp/SmokeParticles.h index f0b4b45..0f2700c 100644 --- a/d3xp/SmokeParticles.h +++ b/d3xp/SmokeParticles.h @@ -29,6 +29,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SMOKEPARTICLES_H__ #define __SMOKEPARTICLES_H__ +#include "idlib/math/Random.h" +#include "idlib/math/Vector.h" +#include "idlib/math/Matrix.h" +#include "framework/DeclParticle.h" +#include "renderer/RenderWorld.h" + /* =============================================================================== diff --git a/d3xp/Sound.cpp b/d3xp/Sound.cpp index 949324d..d5a1f3e 100644 --- a/d3xp/Sound.cpp +++ b/d3xp/Sound.cpp @@ -26,10 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "Entity.h" -#include "Game_local.h" +#include "Sound.h" /* =============================================================================== diff --git a/d3xp/Sound.h b/d3xp/Sound.h index 55d8497..7992f22 100644 --- a/d3xp/Sound.h +++ b/d3xp/Sound.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_SOUND_H__ #define __GAME_SOUND_H__ +#include "Entity.h" + /* =============================================================================== diff --git a/d3xp/Target.cpp b/d3xp/Target.cpp index e07a49f..c33878a 100644 --- a/d3xp/Target.cpp +++ b/d3xp/Target.cpp @@ -25,22 +25,29 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -/* -Invisible entities that affect other entities or the world when activated. +#include "sys/platform.h" +#include "idlib/LangDict.h" +#include "renderer/ModelManager.h" -*/ +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" +#include "Light.h" +#include "Player.h" +#include "Mover.h" +#include "Misc.h" +#include "WorldSpawn.h" +#include "Sound.h" -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "Game_local.h" +#include "Target.h" /* =============================================================================== idTarget +Invisible entities that affect other entities or the world when activated. + =============================================================================== */ diff --git a/d3xp/Target.h b/d3xp/Target.h index 96ef1c8..9c2c0a8 100644 --- a/d3xp/Target.h +++ b/d3xp/Target.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_TARGET_H__ #define __GAME_TARGET_H__ +#include "idlib/math/Interpolate.h" + +#include "Entity.h" /* =============================================================================== diff --git a/d3xp/Trigger.cpp b/d3xp/Trigger.cpp index b7b2881..c394344 100644 --- a/d3xp/Trigger.cpp +++ b/d3xp/Trigger.cpp @@ -26,11 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "Game_local.h" +#include "sys/platform.h" +#include "script/Script_Thread.h" +#include "Player.h" +#include "Trigger.h" /* =============================================================================== diff --git a/d3xp/Trigger.h b/d3xp/Trigger.h index fe6d742..7e4e348 100644 --- a/d3xp/Trigger.h +++ b/d3xp/Trigger.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_TRIGGER_H__ #define __GAME_TRIGGER_H__ +#include "gamesys/Event.h" +#include "Entity.h" + extern const idEventDef EV_Enable; extern const idEventDef EV_Disable; diff --git a/d3xp/Weapon.cpp b/d3xp/Weapon.cpp index 196c373..c820ba1 100644 --- a/d3xp/Weapon.cpp +++ b/d3xp/Weapon.cpp @@ -26,10 +26,19 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/DeclEntityDef.h" +#include "framework/DeclSkin.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "ai/AI.h" +#include "Player.h" +#include "Trigger.h" +#include "SmokeParticles.h" +#include "WorldSpawn.h" +#include "Misc.h" + +#include "Weapon.h" /*********************************************************************** diff --git a/d3xp/Weapon.h b/d3xp/Weapon.h index f3ff821..8e7a1d0 100644 --- a/d3xp/Weapon.h +++ b/d3xp/Weapon.h @@ -29,6 +29,14 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_WEAPON_H__ #define __GAME_WEAPON_H__ +#include "script/Script_Thread.h" +#include "Entity.h" +#include "Light.h" +#include "Grabber.h" +#include "Actor.h" + +class idFuncEmitter; + /* =============================================================================== diff --git a/d3xp/WorldSpawn.cpp b/d3xp/WorldSpawn.cpp index 9e2ce5d..1f97aad 100644 --- a/d3xp/WorldSpawn.cpp +++ b/d3xp/WorldSpawn.cpp @@ -25,22 +25,20 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -/* -game_worldspawn.cpp -Worldspawn class. Each map has one worldspawn which handles global spawnargs. +#include "sys/platform.h" +#include "framework/FileSystem.h" -*/ +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "Game_local.h" +#include "WorldSpawn.h" /* ================ idWorldspawn +Worldspawn class. Each map has one worldspawn which handles global spawnargs. Every map should have exactly one worldspawn. ================ */ diff --git a/d3xp/WorldSpawn.h b/d3xp/WorldSpawn.h index bf88243..b8bb4e0 100644 --- a/d3xp/WorldSpawn.h +++ b/d3xp/WorldSpawn.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_WORLDSPAWN_H__ #define __GAME_WORLDSPAWN_H__ +#include "Entity.h" + /* =============================================================================== diff --git a/d3xp/ai/AAS.cpp b/d3xp/ai/AAS.cpp index 9fd1ac8..10ab9c2 100644 --- a/d3xp/ai/AAS.cpp +++ b/d3xp/ai/AAS.cpp @@ -26,10 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/Common.h" +#include "tools/compilers/aas/AASFileManager.h" -#include "AAS_local.h" +#include "ai/AAS_local.h" /* ============ diff --git a/d3xp/ai/AAS.h b/d3xp/ai/AAS.h index 8f272b4..08ab9c0 100644 --- a/d3xp/ai/AAS.h +++ b/d3xp/ai/AAS.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __AAS_H__ #define __AAS_H__ +#include "tools/compilers/aas/AASFile.h" + /* =============================================================================== diff --git a/d3xp/ai/AAS_debug.cpp b/d3xp/ai/AAS_debug.cpp index b3b4175..ad9d8c6 100644 --- a/d3xp/ai/AAS_debug.cpp +++ b/d3xp/ai/AAS_debug.cpp @@ -26,12 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop - -#include "AAS_local.h" -#include "../Game_local.h" // for cvars and debug drawing +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "ai/AI.h" +#include "Player.h" +#include "Game_local.h" +#include "ai/AAS_local.h" /* ============ diff --git a/d3xp/ai/AAS_local.h b/d3xp/ai/AAS_local.h index 5b9af24..6d32c2e 100644 --- a/d3xp/ai/AAS_local.h +++ b/d3xp/ai/AAS_local.h @@ -29,9 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __AAS_LOCAL_H__ #define __AAS_LOCAL_H__ -#include "AAS.h" -#include "../Pvs.h" - +#include "ai/AAS.h" +#include "Pvs.h" class idRoutingCache { friend class idAASLocal; diff --git a/d3xp/ai/AAS_pathing.cpp b/d3xp/ai/AAS_pathing.cpp index a47929f..916b5b6 100644 --- a/d3xp/ai/AAS_pathing.cpp +++ b/d3xp/ai/AAS_pathing.cpp @@ -26,10 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/Common.h" -#include "AAS_local.h" +#include "ai/AAS_local.h" #define SUBSAMPLE_WALK_PATH 1 #define SUBSAMPLE_FLY_PATH 0 diff --git a/d3xp/ai/AAS_routing.cpp b/d3xp/ai/AAS_routing.cpp index 2dbf254..e82ca4e 100644 --- a/d3xp/ai/AAS_routing.cpp +++ b/d3xp/ai/AAS_routing.cpp @@ -26,11 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "Game_local.h" -#include "AAS_local.h" -#include "../Game_local.h" // for print and error +#include "ai/AAS_local.h" #define CACHETYPE_AREA 1 #define CACHETYPE_PORTAL 2 diff --git a/d3xp/ai/AI.cpp b/d3xp/ai/AI.cpp index 2c6c1a2..1353689 100644 --- a/d3xp/ai/AI.cpp +++ b/d3xp/ai/AI.cpp @@ -26,10 +26,17 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Quat.h" +#include "framework/DeclEntityDef.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "Moveable.h" +#include "Fx.h" +#include "SmokeParticles.h" +#include "Misc.h" + +#include "ai/AI.h" static const char *moveCommandString[ NUM_MOVE_COMMANDS ] = { "MOVE_NONE", diff --git a/d3xp/ai/AI.h b/d3xp/ai/AI.h index 8b337ad..7264869 100644 --- a/d3xp/ai/AI.h +++ b/d3xp/ai/AI.h @@ -29,6 +29,13 @@ If you have questions concerning this license or the applicable additional terms #ifndef __AI_H__ #define __AI_H__ +#include "physics/Physics_Monster.h" +#include "Entity.h" +#include "Actor.h" +#include "Projectile.h" + +class idFuncEmitter; + /* =============================================================================== @@ -232,6 +239,8 @@ private: float maxDistSqr; }; +class idAI; + class idAASFindAttackPosition : public idAASCallback { public: idAASFindAttackPosition( const idAI *self, const idMat3 &gravityAxis, idEntity *target, const idVec3 &targetPos, const idVec3 &fireOffset ); diff --git a/d3xp/ai/AI_Vagary.cpp b/d3xp/ai/AI_Vagary.cpp index 24c7a86..6d8463b 100644 --- a/d3xp/ai/AI_Vagary.cpp +++ b/d3xp/ai/AI_Vagary.cpp @@ -33,10 +33,13 @@ Vagary specific AI code ***********************************************************************/ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "script/Script_Thread.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "Moveable.h" + +#include "ai/AI.h" class idAI_Vagary : public idAI { public: diff --git a/d3xp/ai/AI_events.cpp b/d3xp/ai/AI_events.cpp index f4c4af2..15bbced 100644 --- a/d3xp/ai/AI_events.cpp +++ b/d3xp/ai/AI_events.cpp @@ -26,10 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "Moveable.h" +#include "Misc.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "ai/AI.h" /*********************************************************************** diff --git a/d3xp/ai/AI_pathing.cpp b/d3xp/ai/AI_pathing.cpp index 3dafa62..4b043dc 100644 --- a/d3xp/ai/AI_pathing.cpp +++ b/d3xp/ai/AI_pathing.cpp @@ -26,10 +26,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/containers/Queue.h" +#include "idlib/geometry/Winding2D.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "Moveable.h" +#include "WorldSpawn.h" + +#include "ai/AI.h" /* =============================================================================== diff --git a/d3xp/anim/Anim.cpp b/d3xp/anim/Anim.cpp index 1dc2a94..a9f6252 100644 --- a/d3xp/anim/Anim.cpp +++ b/d3xp/anim/Anim.cpp @@ -26,10 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/geometry/JointTransform.h" +#include "idlib/math/Quat.h" -#include "../Game_local.h" +#include "Game_local.h" + +#include "anim/Anim.h" bool idAnimManager::forceExport = false; diff --git a/d3xp/anim/Anim.h b/d3xp/anim/Anim.h index e3ae912..b37b209 100644 --- a/d3xp/anim/Anim.h +++ b/d3xp/anim/Anim.h @@ -28,6 +28,13 @@ If you have questions concerning this license or the applicable additional terms #ifndef __ANIM_H__ #define __ANIM_H__ +#include "idlib/containers/StrList.h" +#include "idlib/containers/HashTable.h" +#include "idlib/Dict.h" +#include "renderer/Model.h" + +#include "physics/Clip.h" + // // animation channels // these can be changed by modmakers and licensees to be whatever they need. diff --git a/d3xp/anim/Anim_Blend.cpp b/d3xp/anim/Anim_Blend.cpp index 781fe70..842d00f 100644 --- a/d3xp/anim/Anim_Blend.cpp +++ b/d3xp/anim/Anim_Blend.cpp @@ -26,10 +26,19 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/containers/BinSearch.h" +#include "idlib/geometry/JointTransform.h" +#include "idlib/math/Quat.h" +#include "renderer/ModelManager.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "ai/AI.h" +#include "Entity.h" +#include "Fx.h" +#include "Game_local.h" + +#include "anim/Anim.h" static const char *channelNames[ ANIM_NumAnimChannels ] = { "all", "torso", "legs", "head", "eyelids" diff --git a/d3xp/anim/Anim_Import.cpp b/d3xp/anim/Anim_Import.cpp index 49dee84..65fa3be 100644 --- a/d3xp/anim/Anim_Import.cpp +++ b/d3xp/anim/Anim_Import.cpp @@ -26,11 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/Licensee.h" +#include "MayaImport/maya_main.h" -#include "../Game_local.h" -#include "../../MayaImport/maya_main.h" +#include "gamesys/SysCvar.h" +#include "Game_local.h" + +#include "anim/Anim.h" /*********************************************************************** diff --git a/d3xp/anim/Anim_Testmodel.cpp b/d3xp/anim/Anim_Testmodel.cpp index 2fdc723..d4cbc4c 100644 --- a/d3xp/anim/Anim_Testmodel.cpp +++ b/d3xp/anim/Anim_Testmodel.cpp @@ -25,6 +25,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ + +#include "sys/platform.h" +#include "renderer/ModelManager.h" + +#include "gamesys/SysCvar.h" +#include "Player.h" + +#include "anim/Anim_Testmodel.h" + /* ============================================================================= @@ -48,11 +57,6 @@ move around it to view it from different angles. ============================================================================= */ -#include "../../idlib/precompiled.h" -#pragma hdrstop - -#include "../Game_local.h" - CLASS_DECLARATION( idAnimatedEntity, idTestModel ) EVENT( EV_FootstepLeft, idTestModel::Event_Footstep ) EVENT( EV_FootstepRight, idTestModel::Event_Footstep ) diff --git a/d3xp/anim/Anim_Testmodel.h b/d3xp/anim/Anim_Testmodel.h index e63a7c4..398b7b5 100644 --- a/d3xp/anim/Anim_Testmodel.h +++ b/d3xp/anim/Anim_Testmodel.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __ANIM_TESTMODEL_H__ #define __ANIM_TESTMODEL_H__ +#include "physics/Physics_Parametric.h" +#include "Entity.h" +#include "Actor.h" + /* ============================================================================================== diff --git a/d3xp/gamesys/Class.cpp b/d3xp/gamesys/Class.cpp index 5df57ae..c5e8c6e 100644 --- a/d3xp/gamesys/Class.cpp +++ b/d3xp/gamesys/Class.cpp @@ -25,6 +25,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ + +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" + +#include "Class.h" + /* Base class for all C++ objects. Provides fast run-time type checking and run-time @@ -32,14 +39,6 @@ instancing of objects. */ -#include "../../idlib/precompiled.h" -#pragma hdrstop - -#include "../Game_local.h" - -#include "TypeInfo.h" - - /*********************************************************************** idTypeInfo diff --git a/d3xp/gamesys/Class.h b/d3xp/gamesys/Class.h index 853d1f9..99040fe 100644 --- a/d3xp/gamesys/Class.h +++ b/d3xp/gamesys/Class.h @@ -25,6 +25,17 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ + +#ifndef __SYS_CLASS_H__ +#define __SYS_CLASS_H__ + +#include "idlib/containers/Hierarchy.h" + +#include "gamesys/Event.h" + +class idClass; +class idTypeInfo; + /* Base class for all game objects. Provides fast run-time type checking and run-time @@ -32,12 +43,6 @@ instancing of objects. */ -#ifndef __SYS_CLASS_H__ -#define __SYS_CLASS_H__ - -class idClass; -class idTypeInfo; - extern const idEventDef EV_Remove; extern const idEventDef EV_SafeRemove; diff --git a/d3xp/gamesys/DebugGraph.cpp b/d3xp/gamesys/DebugGraph.cpp index f79c627..4f98662 100644 --- a/d3xp/gamesys/DebugGraph.cpp +++ b/d3xp/gamesys/DebugGraph.cpp @@ -25,10 +25,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop -#include "../Game_local.h" +#include "sys/platform.h" +#include "Player.h" +#include "Game_local.h" + +#include "DebugGraph.h" /* ================ diff --git a/d3xp/gamesys/DebugGraph.h b/d3xp/gamesys/DebugGraph.h index 0729d49..1760248 100644 --- a/d3xp/gamesys/DebugGraph.h +++ b/d3xp/gamesys/DebugGraph.h @@ -26,6 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ +#ifndef __DEBUGGRAPH_H__ +#define __DEBUGGRAPH_H__ + +#include "idlib/containers/List.h" +#include "idlib/math/Vector.h" + class idDebugGraph { public: idDebugGraph(); @@ -37,3 +43,5 @@ private: idList samples; int index; }; + +#endif diff --git a/d3xp/gamesys/Event.cpp b/d3xp/gamesys/Event.cpp index b06ff5e..8b5b474 100644 --- a/d3xp/gamesys/Event.cpp +++ b/d3xp/gamesys/Event.cpp @@ -25,6 +25,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ + +#include "sys/platform.h" +#include "script/Script_Program.h" +#include "Entity.h" +#include "Game_local.h" + +#include "Event.h" + /* sys_event.cpp @@ -32,11 +40,6 @@ Event are used for scheduling tasks and for linking script commands. */ -#include "../../idlib/precompiled.h" -#pragma hdrstop - -#include "../Game_local.h" - #define MAX_EVENTSPERFRAME 4096 //#define CREATE_EVENT_CODE diff --git a/d3xp/gamesys/Event.h b/d3xp/gamesys/Event.h index 7106109..178fc27 100644 --- a/d3xp/gamesys/Event.h +++ b/d3xp/gamesys/Event.h @@ -25,14 +25,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -/* -sys_event.h -Event are used for scheduling tasks and for linking script commands. -*/ #ifndef __SYS_EVENT_H__ #define __SYS_EVENT_H__ +#include "idlib/containers/LinkList.h" +#include "cm/CollisionModel.h" + +// Event are used for scheduling tasks and for linking script commands. + #define D_EVENT_MAXARGS 8 // if changed, enable the CREATE_EVENT_CODE define in Event.cpp to generate switch statement for idClass::ProcessEventArgPtr. // running the game will then generate c:\doom\base\events.txt, the contents of which should be copied into the switch statement. diff --git a/d3xp/gamesys/SaveGame.cpp b/d3xp/gamesys/SaveGame.cpp index 2f6a3c3..2dd04a6 100644 --- a/d3xp/gamesys/SaveGame.cpp +++ b/d3xp/gamesys/SaveGame.cpp @@ -26,12 +26,16 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/BuildVersion.h" +#include "framework/DeclSkin.h" +#include "renderer/ModelManager.h" -#include "../Game_local.h" +#include "physics/Clip.h" +#include "Entity.h" +#include "Game_local.h" -#include "TypeInfo.h" +#include "SaveGame.h" /* Save game related helper classes. diff --git a/d3xp/gamesys/SaveGame.h b/d3xp/gamesys/SaveGame.h index 7b3be8e..4b0927f 100644 --- a/d3xp/gamesys/SaveGame.h +++ b/d3xp/gamesys/SaveGame.h @@ -29,6 +29,13 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SAVEGAME_H__ #define __SAVEGAME_H__ +#include "framework/DeclFX.h" +#include "framework/Game.h" +#include "renderer/Model.h" +#include "renderer/RenderSystem.h" + +#include "gamesys/Class.h" + /* Save game related helper classes. diff --git a/d3xp/gamesys/SysCmds.cpp b/d3xp/gamesys/SysCmds.cpp index b31be99..5ee3a7d 100644 --- a/d3xp/gamesys/SysCmds.cpp +++ b/d3xp/gamesys/SysCmds.cpp @@ -26,12 +26,23 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/LangDict.h" +#include "framework/async/NetworkSystem.h" +#include "framework/FileSystem.h" -#include "../Game_local.h" +#include "gamesys/TypeInfo.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" +#include "ai/AI.h" +#include "anim/Anim_Testmodel.h" +#include "Entity.h" +#include "Moveable.h" +#include "WorldSpawn.h" +#include "Fx.h" +#include "Misc.h" -#include "TypeInfo.h" +#include "SysCmds.h" /* ================== diff --git a/d3xp/gamesys/SysCvar.cpp b/d3xp/gamesys/SysCvar.cpp index b3846f9..1032a8c 100644 --- a/d3xp/gamesys/SysCvar.cpp +++ b/d3xp/gamesys/SysCvar.cpp @@ -26,10 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/Licensee.h" +#include "framework/BuildVersion.h" -#include "../Game_local.h" +#include "GameBase.h" +#include "MultiplayerGame.h" + +#include "SysCvar.h" #if defined( _DEBUG ) #define BUILD_DEBUG "-debug" diff --git a/d3xp/gamesys/SysCvar.h b/d3xp/gamesys/SysCvar.h index b4c0716..37ddbb6 100644 --- a/d3xp/gamesys/SysCvar.h +++ b/d3xp/gamesys/SysCvar.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SYS_CVAR_H__ #define __SYS_CVAR_H__ +#include "framework/CVarSystem.h" + extern idCVar developer; extern idCVar g_cinematic; diff --git a/d3xp/gamesys/TypeInfo.cpp b/d3xp/gamesys/TypeInfo.cpp index 9e71192..6ed9b64 100644 --- a/d3xp/gamesys/TypeInfo.cpp +++ b/d3xp/gamesys/TypeInfo.cpp @@ -30,10 +30,17 @@ If you have questions concerning this license or the applicable additional terms #define private public #define protected public -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/containers/LinkList.h" +#include "idlib/containers/StaticList.h" +#include "idlib/math/Quat.h" +#include "idlib/math/Interpolate.h" +#include "idlib/bv/Bounds.h" +#include "idlib/Lexer.h" +#include "framework/Common.h" +#include "framework/FileSystem.h" -#include "../Game_local.h" +#include "Entity.h" #ifdef ID_DEBUG_MEMORY #include "GameTypeInfo.h" // Make sure this is up to date! @@ -41,6 +48,8 @@ If you have questions concerning this license or the applicable additional terms #include "NoGameTypeInfo.h" #endif +#include "TypeInfo.h" + // disabled because it's adds about 64MB to state dumps and takes a really long time //#define DUMP_GAMELOCAL diff --git a/d3xp/gamesys/TypeInfo.h b/d3xp/gamesys/TypeInfo.h index cd47bfd..b9efa2d 100644 --- a/d3xp/gamesys/TypeInfo.h +++ b/d3xp/gamesys/TypeInfo.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SYS_TYPEINFO_H__ #define __SYS_TYPEINFO_H__ +#include "idlib/CmdArgs.h" + +class idFile; + /* =================================================================================== diff --git a/d3xp/physics/Clip.cpp b/d3xp/physics/Clip.cpp index 07d47e0..c82ca84 100644 --- a/d3xp/physics/Clip.cpp +++ b/d3xp/physics/Clip.cpp @@ -26,10 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "gamesys/SaveGame.h" +#include "Entity.h" +#include "Game_local.h" -#include "../Game_local.h" +#include "physics/Clip.h" #define MAX_SECTOR_DEPTH 12 #define MAX_SECTORS ((1<<(MAX_SECTOR_DEPTH+1))-1) diff --git a/d3xp/physics/Clip.h b/d3xp/physics/Clip.h index 1d79c84..e6f0c20 100644 --- a/d3xp/physics/Clip.h +++ b/d3xp/physics/Clip.h @@ -29,6 +29,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __CLIP_H__ #define __CLIP_H__ +#include "idlib/geometry/TraceModel.h" +#include "cm/CollisionModel.h" + +class idSaveGame; +class idRestoreGame; + /* =============================================================================== @@ -41,7 +47,6 @@ If you have questions concerning this license or the applicable additional terms #define JOINT_HANDLE_TO_CLIPMODEL_ID( id ) ( -1 - id ) class idClip; -class idClipModel; class idEntity; diff --git a/d3xp/physics/Force.cpp b/d3xp/physics/Force.cpp index a835a55..874bdd0 100644 --- a/d3xp/physics/Force.cpp +++ b/d3xp/physics/Force.cpp @@ -26,10 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" -#include "../Game_local.h" +#include "physics/Force.h" CLASS_DECLARATION( idClass, idForce ) END_CLASS diff --git a/d3xp/physics/Force.h b/d3xp/physics/Force.h index ff6f448..582225e 100644 --- a/d3xp/physics/Force.h +++ b/d3xp/physics/Force.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __FORCE_H__ #define __FORCE_H__ +#include "gamesys/Class.h" + /* =============================================================================== diff --git a/d3xp/physics/Force_Constant.cpp b/d3xp/physics/Force_Constant.cpp index 2b15096..d62bc34 100644 --- a/d3xp/physics/Force_Constant.cpp +++ b/d3xp/physics/Force_Constant.cpp @@ -26,10 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "physics/Physics.h" +#include "gamesys/SaveGame.h" -#include "../Game_local.h" +#include "physics/Force_Constant.h" CLASS_DECLARATION( idForce, idForce_Constant ) END_CLASS diff --git a/d3xp/physics/Force_Constant.h b/d3xp/physics/Force_Constant.h index 0466b3a..e62df35 100644 --- a/d3xp/physics/Force_Constant.h +++ b/d3xp/physics/Force_Constant.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __FORCE_CONSTANT_H__ #define __FORCE_CONSTANT_H__ +#include "physics/Force.h" + /* =============================================================================== diff --git a/d3xp/physics/Force_Drag.cpp b/d3xp/physics/Force_Drag.cpp index ee41c7f..f8682a1 100644 --- a/d3xp/physics/Force_Drag.cpp +++ b/d3xp/physics/Force_Drag.cpp @@ -26,10 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/UsercmdGen.h" -#include "../Game_local.h" +#include "physics/Physics.h" + +#include "physics/Force_Drag.h" CLASS_DECLARATION( idForce, idForce_Drag ) END_CLASS diff --git a/d3xp/physics/Force_Drag.h b/d3xp/physics/Force_Drag.h index 97465ae..4010845 100644 --- a/d3xp/physics/Force_Drag.h +++ b/d3xp/physics/Force_Drag.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __FORCE_DRAG_H__ #define __FORCE_DRAG_H__ +#include "physics/Force.h" + /* =============================================================================== diff --git a/d3xp/physics/Force_Field.cpp b/d3xp/physics/Force_Field.cpp index 8db7022..8c02b12 100644 --- a/d3xp/physics/Force_Field.cpp +++ b/d3xp/physics/Force_Field.cpp @@ -26,10 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "physics/Physics_Player.h" +#include "physics/Physics_Monster.h" +#include "WorldSpawn.h" -#include "../Game_local.h" +#include "physics/Force_Field.h" CLASS_DECLARATION( idForce, idForce_Field ) END_CLASS diff --git a/d3xp/physics/Force_Field.h b/d3xp/physics/Force_Field.h index e3bfc83..ea963ac 100644 --- a/d3xp/physics/Force_Field.h +++ b/d3xp/physics/Force_Field.h @@ -29,6 +29,11 @@ If you have questions concerning this license or the applicable additional terms #ifndef __FORCE_FIELD_H__ #define __FORCE_FIELD_H__ +#include "physics/Force.h" +#include "physics/Clip.h" +#include "Entity.h" +#include "AFEntity.h" + /* =============================================================================== diff --git a/d3xp/physics/Force_Grab.cpp b/d3xp/physics/Force_Grab.cpp index d538f1a..7e7c4ba 100644 --- a/d3xp/physics/Force_Grab.cpp +++ b/d3xp/physics/Force_Grab.cpp @@ -26,17 +26,19 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop - #ifdef _D3XP -#include "../Game_local.h" +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "gamesys/SaveGame.h" +#include "physics/Physics.h" +#include "Game_local.h" + +#include "physics/Force_Grab.h" CLASS_DECLARATION( idForce, idForce_Grab ) END_CLASS - /* ================ idForce_Grab::Save diff --git a/d3xp/physics/Force_Grab.h b/d3xp/physics/Force_Grab.h index b06ab4d..b3b7df7 100644 --- a/d3xp/physics/Force_Grab.h +++ b/d3xp/physics/Force_Grab.h @@ -31,6 +31,8 @@ If you have questions concerning this license or the applicable additional terms #ifdef _D3XP +#include "physics/Force.h" + /* =============================================================================== diff --git a/d3xp/physics/Force_Spring.cpp b/d3xp/physics/Force_Spring.cpp index 93a6d19..c805b7a 100644 --- a/d3xp/physics/Force_Spring.cpp +++ b/d3xp/physics/Force_Spring.cpp @@ -26,10 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "physics/Physics.h" -#include "../Game_local.h" +#include "physics/Force_Spring.h" CLASS_DECLARATION( idForce, idForce_Spring ) END_CLASS diff --git a/d3xp/physics/Force_Spring.h b/d3xp/physics/Force_Spring.h index 06db706..2a890b2 100644 --- a/d3xp/physics/Force_Spring.h +++ b/d3xp/physics/Force_Spring.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __FORCE_SPRING_H__ #define __FORCE_SPRING_H__ +#include "physics/Force.h" + /* =============================================================================== diff --git a/d3xp/physics/Physics.cpp b/d3xp/physics/Physics.cpp index bb48704..86e35d4 100644 --- a/d3xp/physics/Physics.cpp +++ b/d3xp/physics/Physics.cpp @@ -26,10 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "Game_local.h" -#include "../Game_local.h" +#include "physics/Physics.h" ABSTRACT_DECLARATION( idClass, idPhysics ) END_CLASS diff --git a/d3xp/physics/Physics.h b/d3xp/physics/Physics.h index 3d70adb..545c6ee 100644 --- a/d3xp/physics/Physics.h +++ b/d3xp/physics/Physics.h @@ -29,6 +29,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_H__ #define __PHYSICS_H__ +#include "idlib/BitMsg.h" + +#include "gamesys/Class.h" +#include "physics/Clip.h" +#include "GameBase.h" + /* =============================================================================== diff --git a/d3xp/physics/Physics_AF.cpp b/d3xp/physics/Physics_AF.cpp index d994571..965d95e 100644 --- a/d3xp/physics/Physics_AF.cpp +++ b/d3xp/physics/Physics_AF.cpp @@ -26,10 +26,16 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Quat.h" +#include "idlib/Timer.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "Entity.h" +#include "Player.h" +#include "WorldSpawn.h" + +#include "physics/Physics_AF.h" CLASS_DECLARATION( idPhysics_Base, idPhysics_AF ) END_CLASS diff --git a/d3xp/physics/Physics_AF.h b/d3xp/physics/Physics_AF.h index 4d712b1..90b57c9 100644 --- a/d3xp/physics/Physics_AF.h +++ b/d3xp/physics/Physics_AF.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_AF_H__ #define __PHYSICS_AF_H__ +#include "idlib/math/Lcp.h" + +#include "physics/Physics_Base.h" + /* =================================================================================== diff --git a/d3xp/physics/Physics_Actor.cpp b/d3xp/physics/Physics_Actor.cpp index 5237272..85a45a7 100644 --- a/d3xp/physics/Physics_Actor.cpp +++ b/d3xp/physics/Physics_Actor.cpp @@ -26,10 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "Entity.h" -#include "../Game_local.h" +#include "physics/Physics_Actor.h" CLASS_DECLARATION( idPhysics_Base, idPhysics_Actor ) END_CLASS diff --git a/d3xp/physics/Physics_Actor.h b/d3xp/physics/Physics_Actor.h index 0e4fec1..e50ae17 100644 --- a/d3xp/physics/Physics_Actor.h +++ b/d3xp/physics/Physics_Actor.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_ACTOR_H__ #define __PHYSICS_ACTOR_H__ +#include "physics/Physics_Base.h" + /* =================================================================================== diff --git a/d3xp/physics/Physics_Base.cpp b/d3xp/physics/Physics_Base.cpp index ee421c7..41b455b 100644 --- a/d3xp/physics/Physics_Base.cpp +++ b/d3xp/physics/Physics_Base.cpp @@ -26,10 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "physics/Force.h" +#include "Entity.h" -#include "../Game_local.h" +#include "physics/Physics_Base.h" CLASS_DECLARATION( idPhysics, idPhysics_Base ) END_CLASS diff --git a/d3xp/physics/Physics_Base.h b/d3xp/physics/Physics_Base.h index a0ac05b..0d73934 100644 --- a/d3xp/physics/Physics_Base.h +++ b/d3xp/physics/Physics_Base.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_BASE_H__ #define __PHYSICS_BASE_H__ +#include "physics/Physics.h" +#include "Game_local.h" + /* =============================================================================== diff --git a/d3xp/physics/Physics_Monster.cpp b/d3xp/physics/Physics_Monster.cpp index c5b919c..1e48b7f 100644 --- a/d3xp/physics/Physics_Monster.cpp +++ b/d3xp/physics/Physics_Monster.cpp @@ -26,10 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "Entity.h" +#include "Actor.h" -#include "../Game_local.h" +#include "physics/Physics_Monster.h" CLASS_DECLARATION( idPhysics_Actor, idPhysics_Monster ) END_CLASS diff --git a/d3xp/physics/Physics_Monster.h b/d3xp/physics/Physics_Monster.h index 5492324..0df59dd 100644 --- a/d3xp/physics/Physics_Monster.h +++ b/d3xp/physics/Physics_Monster.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_MONSTER_H__ #define __PHYSICS_MONSTER_H__ +#include "idlib/math/Vector.h" + +#include "physics/Physics_Actor.h" + /* =================================================================================== diff --git a/d3xp/physics/Physics_Parametric.cpp b/d3xp/physics/Physics_Parametric.cpp index 2208b94..c502ba5 100644 --- a/d3xp/physics/Physics_Parametric.cpp +++ b/d3xp/physics/Physics_Parametric.cpp @@ -26,10 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "Entity.h" -#include "../Game_local.h" +#include "physics/Physics_Parametric.h" CLASS_DECLARATION( idPhysics_Base, idPhysics_Parametric ) END_CLASS diff --git a/d3xp/physics/Physics_Parametric.h b/d3xp/physics/Physics_Parametric.h index 3cbd6a5..ad4745b 100644 --- a/d3xp/physics/Physics_Parametric.h +++ b/d3xp/physics/Physics_Parametric.h @@ -29,6 +29,11 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_PARAMETRIC_H__ #define __PHYSICS_PARAMETRIC_H__ +#include "idlib/math/Curve.h" +#include "idlib/math/Interpolate.h" + +#include "physics/Physics_Base.h" + /* =================================================================================== diff --git a/d3xp/physics/Physics_Player.cpp b/d3xp/physics/Physics_Player.cpp index f7a2d1e..6a74c5e 100644 --- a/d3xp/physics/Physics_Player.cpp +++ b/d3xp/physics/Physics_Player.cpp @@ -26,10 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "Entity.h" -#include "../Game_local.h" +#include "physics/Physics_Player.h" CLASS_DECLARATION( idPhysics_Actor, idPhysics_Player ) END_CLASS diff --git a/d3xp/physics/Physics_Player.h b/d3xp/physics/Physics_Player.h index f3aa852..40d52e7 100644 --- a/d3xp/physics/Physics_Player.h +++ b/d3xp/physics/Physics_Player.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_PLAYER_H__ #define __PHYSICS_PLAYER_H__ +#include "physics/Physics_Actor.h" + /* =================================================================================== diff --git a/d3xp/physics/Physics_RigidBody.cpp b/d3xp/physics/Physics_RigidBody.cpp index aaefd04..8d0436f 100644 --- a/d3xp/physics/Physics_RigidBody.cpp +++ b/d3xp/physics/Physics_RigidBody.cpp @@ -26,10 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Quat.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "Entity.h" +#include "Player.h" + +#include "physics/Physics_RigidBody.h" CLASS_DECLARATION( idPhysics_Base, idPhysics_RigidBody ) END_CLASS diff --git a/d3xp/physics/Physics_RigidBody.h b/d3xp/physics/Physics_RigidBody.h index 1e9874d..d211ebe 100644 --- a/d3xp/physics/Physics_RigidBody.h +++ b/d3xp/physics/Physics_RigidBody.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_RIGIDBODY_H__ #define __PHYSICS_RIGIDBODY_H__ +#include "idlib/math/Ode.h" + +#include "physics/Physics_Base.h" + /* =================================================================================== diff --git a/d3xp/physics/Physics_Static.cpp b/d3xp/physics/Physics_Static.cpp index 4ff07e2..cf9f0cf 100644 --- a/d3xp/physics/Physics_Static.cpp +++ b/d3xp/physics/Physics_Static.cpp @@ -26,10 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Quat.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "physics/Force.h" +#include "Entity.h" + +#include "physics/Physics_Static.h" CLASS_DECLARATION( idPhysics, idPhysics_Static ) END_CLASS diff --git a/d3xp/physics/Physics_Static.h b/d3xp/physics/Physics_Static.h index e8002e1..bb58951 100644 --- a/d3xp/physics/Physics_Static.h +++ b/d3xp/physics/Physics_Static.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_STATIC_H__ #define __PHYSICS_STATIC_H__ +#include "physics/Physics.h" + /* =============================================================================== diff --git a/d3xp/physics/Physics_StaticMulti.cpp b/d3xp/physics/Physics_StaticMulti.cpp index df2c293..287d901 100644 --- a/d3xp/physics/Physics_StaticMulti.cpp +++ b/d3xp/physics/Physics_StaticMulti.cpp @@ -26,10 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Quat.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "physics/Force.h" +#include "Entity.h" + +#include "physics/Physics_StaticMulti.h" CLASS_DECLARATION( idPhysics, idPhysics_StaticMulti ) END_CLASS diff --git a/d3xp/physics/Physics_StaticMulti.h b/d3xp/physics/Physics_StaticMulti.h index a6055f9..0cd94ed 100644 --- a/d3xp/physics/Physics_StaticMulti.h +++ b/d3xp/physics/Physics_StaticMulti.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_STATICMULTI_H__ #define __PHYSICS_STATICMULTI_H__ +#include "physics/Physics_Static.h" + /* =============================================================================== diff --git a/d3xp/physics/Push.cpp b/d3xp/physics/Push.cpp index 44c4220..0b98613 100644 --- a/d3xp/physics/Push.cpp +++ b/d3xp/physics/Push.cpp @@ -26,11 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop - -#include "../Game_local.h" +#include "sys/platform.h" +#include "physics/Physics_Actor.h" +#include "Entity.h" +#include "Player.h" +#include "Moveable.h" +#include "Game_local.h" +#include "physics/Push.h" /* ============ diff --git a/d3xp/physics/Push.h b/d3xp/physics/Push.h index b122d01..0cb7406 100644 --- a/d3xp/physics/Push.h +++ b/d3xp/physics/Push.h @@ -29,6 +29,13 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PUSH_H__ #define __PUSH_H__ +#include "cm/CollisionModel.h" + +#include "physics/Clip.h" +#include "GameBase.h" + +class idEntity; + /* =============================================================================== diff --git a/d3xp/script/Script_Compiler.cpp b/d3xp/script/Script_Compiler.cpp index 2e77712..abb35e3 100644 --- a/d3xp/script/Script_Compiler.cpp +++ b/d3xp/script/Script_Compiler.cpp @@ -26,10 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/Timer.h" -#include "../Game_local.h" +#include "script/Script_Thread.h" +#include "Game_local.h" + +#include "script/Script_Compiler.h" #define FUNCTION_PRIORITY 2 #define INT_PRIORITY 2 diff --git a/d3xp/script/Script_Compiler.h b/d3xp/script/Script_Compiler.h index fdcfe42..be9fb68 100644 --- a/d3xp/script/Script_Compiler.h +++ b/d3xp/script/Script_Compiler.h @@ -28,6 +28,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SCRIPT_COMPILER_H__ #define __SCRIPT_COMPILER_H__ +#include "idlib/Parser.h" + +#include "script/Script_Program.h" + const char * const RESULT_STRING = ""; typedef struct opcode_s { diff --git a/d3xp/script/Script_Interpreter.cpp b/d3xp/script/Script_Interpreter.cpp index 3ffa5ab..c8e0cc4 100644 --- a/d3xp/script/Script_Interpreter.cpp +++ b/d3xp/script/Script_Interpreter.cpp @@ -26,10 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Compiler.h" +#include "script/Script_Thread.h" -#include "../Game_local.h" +#include "script/Script_Interpreter.h" /* ================ diff --git a/d3xp/script/Script_Interpreter.h b/d3xp/script/Script_Interpreter.h index b852571..e7ec0f6 100644 --- a/d3xp/script/Script_Interpreter.h +++ b/d3xp/script/Script_Interpreter.h @@ -29,6 +29,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SCRIPT_INTERPRETER_H__ #define __SCRIPT_INTERPRETER_H__ +#include "script/Script_Program.h" +#include "Entity.h" +#include "Game_local.h" + +class idThread; + #define MAX_STACK_DEPTH 64 #define LOCALSTACK_SIZE (6144 * 2) diff --git a/d3xp/script/Script_Program.cpp b/d3xp/script/Script_Program.cpp index 465c58b..bfcd719 100644 --- a/d3xp/script/Script_Program.cpp +++ b/d3xp/script/Script_Program.cpp @@ -26,10 +26,18 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/hashing/MD4.h" +#include "framework/FileSystem.h" -#include "../Game_local.h" +#include "gamesys/Event.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Compiler.h" +#include "script/Script_Thread.h" +#include "Entity.h" +#include "Game_local.h" + +#include "script/Script_Program.h" // simple types. function types are dynamically allocated idTypeDef type_void( ev_void, &def_void, "void", 0, NULL ); diff --git a/d3xp/script/Script_Program.h b/d3xp/script/Script_Program.h index be9094e..ca0d7a8 100644 --- a/d3xp/script/Script_Program.h +++ b/d3xp/script/Script_Program.h @@ -29,12 +29,17 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SCRIPT_PROGRAM_H__ #define __SCRIPT_PROGRAM_H__ -class idScriptObject; +#include "idlib/containers/StrList.h" +#include "idlib/containers/StaticList.h" +#include "idlib/containers/HashIndex.h" +#include "idlib/math/Vector.h" + +#include "GameBase.h" + class idEventDef; class idVarDef; class idTypeDef; class idEntity; -class idThread; class idSaveGame; class idRestoreGame; diff --git a/d3xp/script/Script_Thread.cpp b/d3xp/script/Script_Thread.cpp index fc0c071..cb82633 100644 --- a/d3xp/script/Script_Thread.cpp +++ b/d3xp/script/Script_Thread.cpp @@ -26,10 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "Player.h" +#include "Camera.h" + +#include "script/Script_Thread.h" const idEventDef EV_Thread_Execute( "", NULL ); const idEventDef EV_Thread_SetCallback( "", NULL ); diff --git a/d3xp/script/Script_Thread.h b/d3xp/script/Script_Thread.h index 7f1a743..7d77643 100644 --- a/d3xp/script/Script_Thread.h +++ b/d3xp/script/Script_Thread.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SCRIPT_THREAD_H__ #define __SCRIPT_THREAD_H__ +#include "script/Script_Interpreter.h" +#include "gamesys/Class.h" +#include "gamesys/Event.h" + extern const idEventDef EV_Thread_Execute; extern const idEventDef EV_Thread_SetCallback; extern const idEventDef EV_Thread_TerminateThread; diff --git a/framework/CVarSystem.h b/framework/CVarSystem.h index baa5fd3..1f1bd31 100644 --- a/framework/CVarSystem.h +++ b/framework/CVarSystem.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __CVARSYSTEM_H__ #define __CVARSYSTEM_H__ +#include "idlib/Dict.h" +#include "idlib/CmdArgs.h" +#include "framework/CmdSystem.h" + /* =============================================================================== diff --git a/framework/CmdSystem.h b/framework/CmdSystem.h index ffbc4f0..9563d07 100644 --- a/framework/CmdSystem.h +++ b/framework/CmdSystem.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __CMDSYSTEM_H__ #define __CMDSYSTEM_H__ +#include "idlib/Str.h" + /* =============================================================================== diff --git a/framework/Common.h b/framework/Common.h index ac0e4c3..7088684 100644 --- a/framework/Common.h +++ b/framework/Common.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __COMMON_H__ #define __COMMON_H__ +#include "framework/CVarSystem.h" + /* ============================================================== @@ -109,6 +111,8 @@ struct MemInfo_t { int soundAssetsTotal; }; +class idLangDict; + class idCommon { public: virtual ~idCommon( void ) {} diff --git a/framework/DeclAF.h b/framework/DeclAF.h index 105c05b..63bc019 100644 --- a/framework/DeclAF.h +++ b/framework/DeclAF.h @@ -29,6 +29,13 @@ If you have questions concerning this license or the applicable additional terms #ifndef __DECLAF_H__ #define __DECLAF_H__ +#include "idlib/containers/List.h" +#include "idlib/math/Matrix.h" +#include "idlib/math/Angles.h" +#include "idlib/Str.h" +#include "idlib/Lexer.h" +#include "framework/DeclManager.h" + /* =============================================================================== diff --git a/framework/DeclEntityDef.h b/framework/DeclEntityDef.h index dd82d0e..a2cce44 100644 --- a/framework/DeclEntityDef.h +++ b/framework/DeclEntityDef.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __DECLENTITYDEF_H__ #define __DECLENTITYDEF_H__ +#include "idlib/Dict.h" +#include "framework/DeclManager.h" + /* =============================================================================== diff --git a/framework/DeclFX.h b/framework/DeclFX.h index 0abfd3c..c3411d1 100644 --- a/framework/DeclFX.h +++ b/framework/DeclFX.h @@ -29,6 +29,11 @@ If you have questions concerning this license or the applicable additional terms #ifndef __DECLFX_H__ #define __DECLFX_H__ +#include "idlib/containers/List.h" +#include "idlib/math/Matrix.h" +#include "idlib/Str.h" +#include "framework/DeclManager.h" + /* =============================================================================== diff --git a/framework/DeclManager.h b/framework/DeclManager.h index e4fa8b5..c30c70f 100644 --- a/framework/DeclManager.h +++ b/framework/DeclManager.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __DECLMANAGER_H__ #define __DECLMANAGER_H__ +#include "idlib/Lexer.h" + +class idFile; + /* =============================================================================== diff --git a/framework/DeclPDA.h b/framework/DeclPDA.h index 7721274..8204ec0 100644 --- a/framework/DeclPDA.h +++ b/framework/DeclPDA.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __DECLPDA_H__ #define __DECLPDA_H__ +#include "idlib/containers/StrList.h" +#include "framework/DeclManager.h" + /* =============================================================================== diff --git a/framework/DeclParticle.h b/framework/DeclParticle.h index a32ae34..03f32c7 100644 --- a/framework/DeclParticle.h +++ b/framework/DeclParticle.h @@ -29,6 +29,14 @@ If you have questions concerning this license or the applicable additional terms #ifndef __DECLPARTICLE_H__ #define __DECLPARTICLE_H__ +#include "idlib/containers/List.h" +#include "idlib/math/Vector.h" +#include "idlib/math/Matrix.h" +#include "idlib/math/Random.h" +#include "idlib/bv/Bounds.h" +#include "framework/DeclManager.h" +#include "framework/DeclTable.h" + /* =============================================================================== diff --git a/framework/DeclSkin.h b/framework/DeclSkin.h index 04ab4e0..a49562d 100644 --- a/framework/DeclSkin.h +++ b/framework/DeclSkin.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __DECLSKIN_H__ #define __DECLSKIN_H__ +#include "idlib/containers/StrList.h" +#include "framework/DeclManager.h" +#include "renderer/Material.h" + /* =============================================================================== diff --git a/framework/DeclTable.h b/framework/DeclTable.h index 01bd48e..fbe1871 100644 --- a/framework/DeclTable.h +++ b/framework/DeclTable.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __DECLTABLE_H__ #define __DECLTABLE_H__ +#include "idlib/containers/List.h" +#include "framework/DeclManager.h" + /* =============================================================================== diff --git a/framework/File.h b/framework/File.h index cf08a0e..f181dfe 100644 --- a/framework/File.h +++ b/framework/File.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __FILE_H__ #define __FILE_H__ +#include "idlib/math/Vector.h" +#include "idlib/BitMsg.h" + /* ============================================================== diff --git a/framework/FileSystem.h b/framework/FileSystem.h index d00ed85..18d5cc6 100644 --- a/framework/FileSystem.h +++ b/framework/FileSystem.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __FILESYSTEM_H__ #define __FILESYSTEM_H__ +#include "idlib/containers/StrList.h" +#include "framework/File.h" + /* =============================================================================== diff --git a/framework/Game.h b/framework/Game.h index df145c9..c62ef81 100644 --- a/framework/Game.h +++ b/framework/Game.h @@ -29,6 +29,20 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_H__ #define __GAME_H__ +#include "idlib/BitMsg.h" +#include "idlib/Dict.h" +#include "framework/UsercmdGen.h" +#include "renderer/RenderWorld.h" +#include "sound/sound.h" + +class idAASFileManager; +class idCollisionModelManager; +class idRenderSystem; +class idRenderModelManager; +class idUserInterface; +class idUserInterfaceManager; +class idNetworkSystem; + /* =============================================================================== diff --git a/framework/async/NetworkSystem.h b/framework/async/NetworkSystem.h index 4d5dc26..3a04bcd 100644 --- a/framework/async/NetworkSystem.h +++ b/framework/async/NetworkSystem.h @@ -29,6 +29,7 @@ If you have questions concerning this license or the applicable additional terms #ifndef __NETWORKSYSTEM_H__ #define __NETWORKSYSTEM_H__ +#include "idlib/BitMsg.h" /* =============================================================================== diff --git a/game/AF.cpp b/game/AF.cpp index 526c8cf..e527b14 100644 --- a/game/AF.cpp +++ b/game/AF.cpp @@ -26,11 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/geometry/JointTransform.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "AF.h" /* =============================================================================== diff --git a/game/AF.h b/game/AF.h index 6380707..79e3751 100644 --- a/game/AF.h +++ b/game/AF.h @@ -29,6 +29,13 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_AF_H__ #define __GAME_AF_H__ +#include "idlib/Parser.h" +#include "framework/DeclAF.h" +#include "renderer/Model.h" + +#include "physics/Physics_AF.h" +#include "Entity.h" +#include "anim/Anim.h" /* =============================================================================== diff --git a/game/AFEntity.cpp b/game/AFEntity.cpp index 3115130..686263f 100644 --- a/game/AFEntity.cpp +++ b/game/AFEntity.cpp @@ -26,11 +26,16 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/geometry/JointTransform.h" +#include "renderer/ModelManager.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "Item.h" +#include "Player.h" +#include "SmokeParticles.h" +#include "AFEntity.h" /* =============================================================================== diff --git a/game/AFEntity.h b/game/AFEntity.h index f89a305..bc7dee4 100644 --- a/game/AFEntity.h +++ b/game/AFEntity.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_AFENTITY_H__ #define __GAME_AFENTITY_H__ +#include "physics/Physics_AF.h" +#include "physics/Force_Constant.h" +#include "Entity.h" +#include "AF.h" /* =============================================================================== diff --git a/game/Actor.cpp b/game/Actor.cpp index 0fb02ad..15061a2 100644 --- a/game/Actor.cpp +++ b/game/Actor.cpp @@ -26,10 +26,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" +#include "Item.h" +#include "Light.h" +#include "Projectile.h" +#include "WorldSpawn.h" -#include "Game_local.h" +#include "Actor.h" /*********************************************************************** diff --git a/game/Actor.h b/game/Actor.h index 0c25702..c52fb27 100644 --- a/game/Actor.h +++ b/game/Actor.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_ACTOR_H__ #define __GAME_ACTOR_H__ +#include "AFEntity.h" +#include "IK.h" +#include "PlayerView.h" + /* =============================================================================== diff --git a/game/BrittleFracture.cpp b/game/BrittleFracture.cpp index 5a24871..c6900fd 100644 --- a/game/BrittleFracture.cpp +++ b/game/BrittleFracture.cpp @@ -26,11 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/DeclEntityDef.h" +#include "renderer/ModelManager.h" -#include "Game_local.h" +#include "Fx.h" +#include "BrittleFracture.h" CLASS_DECLARATION( idEntity, idBrittleFracture ) EVENT( EV_Activate, idBrittleFracture::Event_Activate ) diff --git a/game/BrittleFracture.h b/game/BrittleFracture.h index 03622ef..3eeca48 100644 --- a/game/BrittleFracture.h +++ b/game/BrittleFracture.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_BRITTLEFRACTURE_H__ #define __GAME_BRITTLEFRACTURE_H__ +#include "physics/Physics_RigidBody.h" +#include "physics/Physics_StaticMulti.h" +#include "physics/Clip.h" +#include "Entity.h" /* =============================================================================== diff --git a/game/Camera.cpp b/game/Camera.cpp index 7d3665a..eddef37 100644 --- a/game/Camera.cpp +++ b/game/Camera.cpp @@ -26,10 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" +#include "Player.h" -#include "Game_local.h" +#include "Camera.h" /* =============================================================================== diff --git a/game/Camera.h b/game/Camera.h index 3d6016e..ee5f5f5 100644 --- a/game/Camera.h +++ b/game/Camera.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_CAMERA_H__ #define __GAME_CAMERA_H__ +#include "idlib/math/Quat.h" + +#include "Entity.h" /* =============================================================================== diff --git a/game/EndLevel.cpp b/game/EndLevel.cpp index 21f1ec9..3dd4cd5 100644 --- a/game/EndLevel.cpp +++ b/game/EndLevel.cpp @@ -26,10 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" -#include "Game_local.h" +#include "EndLevel.h" /* diff --git a/game/EndLevel.h b/game/EndLevel.h index b2d6b04..2d83085 100644 --- a/game/EndLevel.h +++ b/game/EndLevel.h @@ -26,6 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ +#ifndef __GAME_ENDLEVEL_H__ +#define __GAME_ENDLEVEL_H__ + +#include "Entity.h" + class idTarget_EndLevel : public idEntity { public: CLASS_PROTOTYPE( idTarget_EndLevel ); @@ -63,3 +68,5 @@ private: void Event_Trigger( idEntity *activator ); }; + +#endif diff --git a/game/Entity.cpp b/game/Entity.cpp index 93d39f5..d855219 100644 --- a/game/Entity.cpp +++ b/game/Entity.cpp @@ -26,10 +26,25 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/geometry/JointTransform.h" +#include "idlib/LangDict.h" +#include "framework/async/NetworkSystem.h" +#include "framework/DeclEntityDef.h" +#include "renderer/ModelManager.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "physics/Physics_Parametric.h" +#include "physics/Physics_Actor.h" +#include "script/Script_Thread.h" +#include "Fx.h" +#include "AFEntity.h" +#include "Player.h" +#include "Mover.h" +#include "WorldSpawn.h" +#include "SmokeParticles.h" + +#include "Entity.h" /* =============================================================================== diff --git a/game/Entity.h b/game/Entity.h index 57e437f..709543b 100644 --- a/game/Entity.h +++ b/game/Entity.h @@ -29,6 +29,16 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_ENTITY_H__ #define __GAME_ENTITY_H__ +#include "idlib/math/Curve.h" +#include "framework/DeclParticle.h" + +#include "physics/Physics_Static.h" +#include "physics/Physics.h" +#include "script/Script_Program.h" +#include "gamesys/Class.h" +#include "gamesys/Event.h" +#include "Game_local.h" + /* =============================================================================== diff --git a/game/Fx.cpp b/game/Fx.cpp index 076acd7..8ee3e7c 100644 --- a/game/Fx.cpp +++ b/game/Fx.cpp @@ -26,10 +26,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "renderer/ModelManager.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "Player.h" +#include "Projectile.h" +#include "WorldSpawn.h" + +#include "Fx.h" /* =============================================================================== diff --git a/game/Fx.h b/game/Fx.h index f546d41..bb99225 100644 --- a/game/Fx.h +++ b/game/Fx.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_FX_H__ #define __GAME_FX_H__ +#include "renderer/RenderWorld.h" + +#include "Entity.h" + /* =============================================================================== diff --git a/game/GameEdit.cpp b/game/GameEdit.cpp index a5be11e..0c637bd 100644 --- a/game/GameEdit.cpp +++ b/game/GameEdit.cpp @@ -26,11 +26,17 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "Game_local.h" +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "physics/Physics_Monster.h" +#include "ai/AI.h" +#include "Player.h" +#include "Light.h" +#include "WorldSpawn.h" +#include "Sound.h" +#include "Misc.h" +#include "GameEdit.h" /* =============================================================================== diff --git a/game/GameEdit.h b/game/GameEdit.h index 4e63f67..bbc31ce 100644 --- a/game/GameEdit.h +++ b/game/GameEdit.h @@ -29,6 +29,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_EDIT_H__ #define __GAME_EDIT_H__ +#include "framework/DeclPDA.h" + +#include "physics/Force_Drag.h" +#include "Entity.h" + +class Player; /* =============================================================================== diff --git a/game/Game_local.cpp b/game/Game_local.cpp index 3df910a..011d06c 100644 --- a/game/Game_local.cpp +++ b/game/Game_local.cpp @@ -26,8 +26,26 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/LangDict.h" +#include "idlib/Timer.h" +#include "framework/async/NetworkSystem.h" +#include "framework/BuildVersion.h" +#include "framework/DeclEntityDef.h" +#include "framework/FileSystem.h" +#include "renderer/ModelManager.h" + +#include "gamesys/SysCvar.h" +#include "gamesys/SysCmds.h" +#include "script/Script_Thread.h" +#include "ai/AI.h" +#include "anim/Anim_Testmodel.h" +#include "Camera.h" +#include "SmokeParticles.h" +#include "Player.h" +#include "WorldSpawn.h" +#include "Misc.h" +#include "Trigger.h" #include "Game_local.h" diff --git a/game/Game_local.h b/game/Game_local.h index 72e1056..1f72443 100644 --- a/game/Game_local.h +++ b/game/Game_local.h @@ -31,6 +31,26 @@ If you have questions concerning this license or the applicable additional terms #include "GameBase.h" +#include "idlib/containers/StrList.h" +#include "idlib/containers/LinkList.h" +#include "idlib/BitMsg.h" +#include "framework/Game.h" + +#include "gamesys/SaveGame.h" +#include "physics/Clip.h" +#include "physics/Push.h" +#include "script/Script_Program.h" +#include "ai/AAS.h" +#include "anim/Anim.h" +#include "Pvs.h" +#include "MultiplayerGame.h" + +#ifdef ID_DEBUG_UNINITIALIZED_MEMORY +// This is real evil but allows the code to inspect arbitrary class variables. +#define private public +#define protected public +#endif + /* =============================================================================== @@ -38,12 +58,10 @@ If you have questions concerning this license or the applicable additional terms =============================================================================== */ - -#ifdef ID_DEBUG_UNINITIALIZED_MEMORY -// This is real evil but allows the code to inspect arbitrary class variables. -#define private public -#define protected public -#endif +class idDeclEntityDef; +class idRenderWorld; +class idSoundWorld; +class idUserInterface; extern idRenderWorld * gameRenderWorld; extern idSoundWorld * gameSoundWorld; @@ -55,41 +73,29 @@ class idPlayer; class idCamera; class idWorldspawn; class idTestModel; -class idAAS; -class idAI; class idSmokeParticles; class idEntityFx; class idTypeInfo; -class idProgram; class idThread; class idEditEntities; class idLocationEntity; //============================================================================ - -#include "gamesys/Event.h" -#include "gamesys/Class.h" -#include "gamesys/SysCvar.h" -#include "gamesys/SysCmds.h" -#include "gamesys/SaveGame.h" -#include "gamesys/DebugGraph.h" - -#include "script/Script_Program.h" - -#include "anim/Anim.h" - -#include "ai/AAS.h" - -#include "physics/Clip.h" -#include "physics/Push.h" - -#include "Pvs.h" -#include "MultiplayerGame.h" - -//============================================================================ - extern const int NUM_RENDER_PORTAL_BITS; +void gameError( const char *fmt, ... ); + +extern idRenderWorld * gameRenderWorld; +extern idSoundWorld * gameSoundWorld; + +extern const int NUM_RENDER_PORTAL_BITS; +/* +=============================================================================== + + Local implementation of the public game interface. + +=============================================================================== +*/ typedef struct entityState_s { int entityNumber; idBitMsg state; @@ -555,6 +561,13 @@ extern idAnimManager animationLib; //============================================================================ +class idGameError : public idException { +public: + idGameError( const char *text ) : idException( text ) {} +}; + +//============================================================================ + template< class type > ID_INLINE idEntityPtr::idEntityPtr() { spawnId = 0; @@ -615,14 +628,6 @@ ID_INLINE int idEntityPtr::GetEntityNum( void ) const { //============================================================================ -class idGameError : public idException { -public: - idGameError( const char *text ) : idException( text ) {} -}; - -//============================================================================ - - // // these defines work for all startsounds from all entity types // make sure to change script/doom_defs.script if you add any channels, or change their order @@ -650,56 +655,4 @@ extern const float DEFAULT_GRAVITY; extern const idVec3 DEFAULT_GRAVITY_VEC3; extern const int CINEMATIC_SKIP_DELAY; -//============================================================================ - -#include "physics/Force.h" -#include "physics/Force_Constant.h" -#include "physics/Force_Drag.h" -#include "physics/Force_Field.h" -#include "physics/Force_Spring.h" -#include "physics/Physics.h" -#include "physics/Physics_Static.h" -#include "physics/Physics_StaticMulti.h" -#include "physics/Physics_Base.h" -#include "physics/Physics_Actor.h" -#include "physics/Physics_Monster.h" -#include "physics/Physics_Player.h" -#include "physics/Physics_Parametric.h" -#include "physics/Physics_RigidBody.h" -#include "physics/Physics_AF.h" - -#include "SmokeParticles.h" - -#include "Entity.h" -#include "GameEdit.h" -#include "AF.h" -#include "IK.h" -#include "AFEntity.h" -#include "Misc.h" -#include "Actor.h" -#include "Projectile.h" -#include "Weapon.h" -#include "Light.h" -#include "WorldSpawn.h" -#include "Item.h" -#include "PlayerView.h" -#include "PlayerIcon.h" -#include "Player.h" -#include "Mover.h" -#include "Camera.h" -#include "Moveable.h" -#include "Target.h" -#include "Trigger.h" -#include "Sound.h" -#include "Fx.h" -#include "SecurityCamera.h" -#include "BrittleFracture.h" - -#include "ai/AI.h" -#include "anim/Anim_Testmodel.h" - -#include "script/Script_Compiler.h" -#include "script/Script_Interpreter.h" -#include "script/Script_Thread.h" - #endif /* !__GAME_LOCAL_H__ */ diff --git a/game/Game_network.cpp b/game/Game_network.cpp index 28c448e..aaaa96e 100644 --- a/game/Game_network.cpp +++ b/game/Game_network.cpp @@ -26,8 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/FileSystem.h" +#include "framework/async/NetworkSystem.h" +#include "renderer/RenderSystem.h" + +#include "gamesys/SysCmds.h" +#include "Entity.h" +#include "Player.h" #include "Game_local.h" diff --git a/game/IK.cpp b/game/IK.cpp index 740accb..6bd54d6 100644 --- a/game/IK.cpp +++ b/game/IK.cpp @@ -26,10 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/geometry/JointTransform.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "Mover.h" + +#include "IK.h" /* =============================================================================== diff --git a/game/IK.h b/game/IK.h index 2e71b81..a2a9f83 100644 --- a/game/IK.h +++ b/game/IK.h @@ -29,6 +29,11 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_IK_H__ #define __GAME_IK_H__ +#include "Entity.h" + +class idSaveGame; +class idRestoreGame; + /* =============================================================================== diff --git a/game/Item.cpp b/game/Item.cpp index c5ca917..9ed3682 100644 --- a/game/Item.cpp +++ b/game/Item.cpp @@ -26,11 +26,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "renderer/RenderSystem.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "Player.h" +#include "Fx.h" +#include "SmokeParticles.h" +#include "Item.h" /* =============================================================================== diff --git a/game/Item.h b/game/Item.h index ac9e209..acf7c0c 100644 --- a/game/Item.h +++ b/game/Item.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_ITEM_H__ #define __GAME_ITEM_H__ +#include "physics/Physics_RigidBody.h" +#include "Entity.h" /* =============================================================================== diff --git a/game/Light.cpp b/game/Light.cpp index c5a4cdf..b1b3a79 100644 --- a/game/Light.cpp +++ b/game/Light.cpp @@ -26,10 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "renderer/ModelManager.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" + +#include "Light.h" /* =============================================================================== diff --git a/game/Light.h b/game/Light.h index 123c8f2..851bf02 100644 --- a/game/Light.h +++ b/game/Light.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_LIGHT_H__ #define __GAME_LIGHT_H__ +#include "gamesys/Event.h" +#include "Entity.h" + /* =============================================================================== diff --git a/game/Misc.cpp b/game/Misc.cpp index 0736877..9e6ec73 100644 --- a/game/Misc.cpp +++ b/game/Misc.cpp @@ -31,10 +31,19 @@ Various utility objects and functions. */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "renderer/ModelManager.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" +#include "ai/AI.h" +#include "Player.h" +#include "Camera.h" +#include "WorldSpawn.h" +#include "Moveable.h" +#include "SmokeParticles.h" + +#include "Misc.h" /* =============================================================================== diff --git a/game/Misc.h b/game/Misc.h index 1fda06f..89a4235 100644 --- a/game/Misc.h +++ b/game/Misc.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_MISC_H__ #define __GAME_MISC_H__ +#include "physics/Physics_Parametric.h" +#include "physics/Force_Field.h" +#include "physics/Force_Spring.h" /* =============================================================================== diff --git a/game/Moveable.cpp b/game/Moveable.cpp index a49468e..a0517ff 100644 --- a/game/Moveable.cpp +++ b/game/Moveable.cpp @@ -26,10 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "renderer/ModelManager.h" -#include "Game_local.h" +#include "Fx.h" + +#include "Moveable.h" /* =============================================================================== diff --git a/game/Moveable.h b/game/Moveable.h index 71b9678..21f0092 100644 --- a/game/Moveable.h +++ b/game/Moveable.h @@ -29,6 +29,13 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_MOVEABLE_H__ #define __GAME_MOVEABLE_H__ +#include "physics/Physics_RigidBody.h" +#include "script/Script_Thread.h" +#include "gamesys/Event.h" +#include "Entity.h" +#include "Player.h" +#include "Projectile.h" + /* =============================================================================== diff --git a/game/Mover.cpp b/game/Mover.cpp index 739b86f..9f1a819 100644 --- a/game/Mover.cpp +++ b/game/Mover.cpp @@ -26,10 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" +#include "Player.h" -#include "Game_local.h" +#include "Mover.h" // a mover will update any gui entities in it's target list with // a key/val pair of "mover" "state" from below.. guis can represent diff --git a/game/Mover.h b/game/Mover.h index f72af1c..7b95598 100644 --- a/game/Mover.h +++ b/game/Mover.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_MOVER_H__ #define __GAME_MOVER_H__ +#include "physics/Physics_Parametric.h" +#include "Entity.h" + extern const idEventDef EV_TeamBlocked; extern const idEventDef EV_PartBlocked; extern const idEventDef EV_ReachedPos; diff --git a/game/MultiplayerGame.cpp b/game/MultiplayerGame.cpp index d4468d3..c21df32 100644 --- a/game/MultiplayerGame.cpp +++ b/game/MultiplayerGame.cpp @@ -26,11 +26,20 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/BitMsg.h" +#include "idlib/Str.h" +#include "idlib/LangDict.h" +#include "framework/async/NetworkSystem.h" +#include "framework/FileSystem.h" +#include "ui/UserInterface.h" +#include "gamesys/SysCvar.h" +#include "Player.h" #include "Game_local.h" +#include "MultiplayerGame.h" + // could be a problem if players manage to go down sudden deaths till this .. oh well #define LASTMAN_NOLIVES -20 diff --git a/game/MultiplayerGame.h b/game/MultiplayerGame.h index 5275ab3..15fc2eb 100644 --- a/game/MultiplayerGame.h +++ b/game/MultiplayerGame.h @@ -29,6 +29,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MULTIPLAYERGAME_H__ #define __MULTIPLAYERGAME_H__ +#include "idlib/BitMsg.h" +#include "idlib/Str.h" +#include "ui/UserInterface.h" + +#include "GameBase.h" + /* =============================================================================== diff --git a/game/Player.cpp b/game/Player.cpp index 85ef5bb..0ed61a5 100644 --- a/game/Player.cpp +++ b/game/Player.cpp @@ -26,10 +26,20 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/LangDict.h" +#include "framework/async/NetworkSystem.h" +#include "framework/DeclEntityDef.h" +#include "renderer/RenderSystem.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" +#include "ai/AI.h" +#include "WorldSpawn.h" +#include "Player.h" +#include "Camera.h" +#include "Fx.h" +#include "Misc.h" const int ASYNC_PLAYER_INV_AMMO_BITS = idMath::BitsForInteger( 999 ); // 9 bits to cover the range [0, 999] const int ASYNC_PLAYER_INV_CLIP_BITS = -7; // -7 bits to cover the range [-1, 60] diff --git a/game/Player.h b/game/Player.h index 5e0e19d..b411a0c 100644 --- a/game/Player.h +++ b/game/Player.h @@ -29,6 +29,18 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_PLAYER_H__ #define __GAME_PLAYER_H__ +#include "idlib/math/Interpolate.h" + +#include "physics/Physics_Player.h" +#include "Item.h" +#include "Actor.h" +#include "Weapon.h" +#include "Projectile.h" +#include "PlayerIcon.h" +#include "GameEdit.h" + +class idAI; + /* =============================================================================== diff --git a/game/PlayerIcon.cpp b/game/PlayerIcon.cpp index 33bfa45..9f590a1 100644 --- a/game/PlayerIcon.cpp +++ b/game/PlayerIcon.cpp @@ -26,10 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "renderer/ModelManager.h" + +#include "Player.h" -#include "Game_local.h" #include "PlayerIcon.h" static const char * iconKeys[ ICON_NONE ] = { diff --git a/game/PlayerView.cpp b/game/PlayerView.cpp index 9364339..149b829 100644 --- a/game/PlayerView.cpp +++ b/game/PlayerView.cpp @@ -26,10 +26,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "renderer/RenderWorld.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "gamesys/SaveGame.h" +#include "GameBase.h" +#include "Player.h" + +#include "PlayerView.h" const int IMPULSE_DELAY = 150; /* diff --git a/game/PlayerView.h b/game/PlayerView.h index bb7c9b0..bc90458 100644 --- a/game/PlayerView.h +++ b/game/PlayerView.h @@ -29,6 +29,14 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_PLAYERVIEW_H__ #define __GAME_PLAYERVIEW_H__ +#include "idlib/math/Vector.h" +#include "idlib/Dict.h" +#include "renderer/Material.h" +#include "renderer/RenderWorld.h" + +class idSaveGame; +class idRestoreGame; + /* =============================================================================== diff --git a/game/Projectile.cpp b/game/Projectile.cpp index 21cb65a..1ac8820 100644 --- a/game/Projectile.cpp +++ b/game/Projectile.cpp @@ -26,10 +26,17 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "renderer/ModelManager.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" +#include "ai/AI.h" +#include "Player.h" +#include "Mover.h" +#include "SmokeParticles.h" + +#include "Projectile.h" /* =============================================================================== diff --git a/game/Projectile.h b/game/Projectile.h index ed68c43..3ada8a3 100644 --- a/game/Projectile.h +++ b/game/Projectile.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_PROJECTILE_H__ #define __GAME_PROJECTILE_H__ +#include "physics/Physics_RigidBody.h" +#include "physics/Force_Constant.h" +#include "Entity.h" + /* =============================================================================== diff --git a/game/Pvs.cpp b/game/Pvs.cpp index f8bd5d0..e76c86d 100644 --- a/game/Pvs.cpp +++ b/game/Pvs.cpp @@ -26,13 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/Timer.h" #include "Game_local.h" -#define MAX_BOUNDS_AREAS 16 +#include "Pvs.h" +#define MAX_BOUNDS_AREAS 16 typedef struct pvsPassage_s { byte * canSee; // bit set for all portals that can be seen through this passage diff --git a/game/Pvs.h b/game/Pvs.h index 46f004d..6063c2f 100644 --- a/game/Pvs.h +++ b/game/Pvs.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_PVS_H__ #define __GAME_PVS_H__ +#include "idlib/geometry/Winding.h" +#include "idlib/math/Vector.h" +#include "idlib/bv/Bounds.h" + /* =================================================================================== diff --git a/game/SecurityCamera.cpp b/game/SecurityCamera.cpp index 44df1aa..c16405a 100644 --- a/game/SecurityCamera.cpp +++ b/game/SecurityCamera.cpp @@ -25,24 +25,23 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -/* - SecurityCamera.cpp - - Security camera that triggers targets when player is in view - -*/ - -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "Game_local.h" +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "physics/Physics_RigidBody.h" +#include "Entity.h" +#include "Light.h" +#include "Player.h" +#include "Fx.h" +#include "SecurityCamera.h" /*********************************************************************** idSecurityCamera + Security camera that triggers targets when player is in view + ***********************************************************************/ const idEventDef EV_SecurityCam_ReverseSweep( "" ); diff --git a/game/SecurityCamera.h b/game/SecurityCamera.h index 02600df..6e54dfd 100644 --- a/game/SecurityCamera.h +++ b/game/SecurityCamera.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_SECURITYCAMERA_H__ #define __GAME_SECURITYCAMERA_H__ +#include "Entity.h" + /* =================================================================================== diff --git a/game/SmokeParticles.cpp b/game/SmokeParticles.cpp index 4c26b1a..e63307d 100644 --- a/game/SmokeParticles.cpp +++ b/game/SmokeParticles.cpp @@ -26,11 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - +#include "sys/platform.h" +#include "renderer/ModelManager.h" #include "Game_local.h" +#include "SmokeParticles.h" + static const char *smokeParticle_SnapshotName = "_SmokeParticle_Snapshot_"; /* diff --git a/game/SmokeParticles.h b/game/SmokeParticles.h index 4fcda97..7fafb8a 100644 --- a/game/SmokeParticles.h +++ b/game/SmokeParticles.h @@ -29,6 +29,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SMOKEPARTICLES_H__ #define __SMOKEPARTICLES_H__ +#include "idlib/math/Random.h" +#include "idlib/math/Vector.h" +#include "idlib/math/Matrix.h" +#include "framework/DeclParticle.h" +#include "renderer/RenderWorld.h" + /* =============================================================================== diff --git a/game/Sound.cpp b/game/Sound.cpp index 949324d..d5a1f3e 100644 --- a/game/Sound.cpp +++ b/game/Sound.cpp @@ -26,10 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "Entity.h" -#include "Game_local.h" +#include "Sound.h" /* =============================================================================== diff --git a/game/Sound.h b/game/Sound.h index 55d8497..7992f22 100644 --- a/game/Sound.h +++ b/game/Sound.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_SOUND_H__ #define __GAME_SOUND_H__ +#include "Entity.h" + /* =============================================================================== diff --git a/game/Target.cpp b/game/Target.cpp index eea47d7..8c64bb1 100644 --- a/game/Target.cpp +++ b/game/Target.cpp @@ -25,22 +25,29 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -/* -Invisible entities that affect other entities or the world when activated. +#include "sys/platform.h" +#include "idlib/LangDict.h" +#include "renderer/ModelManager.h" -*/ +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" +#include "Light.h" +#include "Player.h" +#include "Mover.h" +#include "Misc.h" +#include "WorldSpawn.h" +#include "Sound.h" -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "Game_local.h" +#include "Target.h" /* =============================================================================== idTarget +Invisible entities that affect other entities or the world when activated. + =============================================================================== */ diff --git a/game/Target.h b/game/Target.h index 9131c2f..a0d2fc7 100644 --- a/game/Target.h +++ b/game/Target.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_TARGET_H__ #define __GAME_TARGET_H__ +#include "idlib/math/Interpolate.h" + +#include "Entity.h" /* =============================================================================== diff --git a/game/Trigger.cpp b/game/Trigger.cpp index df7cacc..212b2b0 100644 --- a/game/Trigger.cpp +++ b/game/Trigger.cpp @@ -26,11 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "Game_local.h" +#include "sys/platform.h" +#include "script/Script_Thread.h" +#include "Player.h" +#include "Trigger.h" /* =============================================================================== diff --git a/game/Trigger.h b/game/Trigger.h index 9f20952..74d503e 100644 --- a/game/Trigger.h +++ b/game/Trigger.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_TRIGGER_H__ #define __GAME_TRIGGER_H__ +#include "gamesys/Event.h" +#include "Entity.h" + extern const idEventDef EV_Enable; extern const idEventDef EV_Disable; diff --git a/game/Weapon.cpp b/game/Weapon.cpp index 40f6daa..45b6d6a 100644 --- a/game/Weapon.cpp +++ b/game/Weapon.cpp @@ -26,10 +26,18 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/DeclEntityDef.h" +#include "framework/DeclSkin.h" -#include "Game_local.h" +#include "gamesys/SysCvar.h" +#include "ai/AI.h" +#include "Player.h" +#include "Trigger.h" +#include "SmokeParticles.h" +#include "WorldSpawn.h" + +#include "Weapon.h" /*********************************************************************** diff --git a/game/Weapon.h b/game/Weapon.h index c214f14..4f8b374 100644 --- a/game/Weapon.h +++ b/game/Weapon.h @@ -29,6 +29,11 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_WEAPON_H__ #define __GAME_WEAPON_H__ +#include "script/Script_Thread.h" +#include "Entity.h" +#include "Light.h" +#include "Actor.h" + /* =============================================================================== diff --git a/game/WorldSpawn.cpp b/game/WorldSpawn.cpp index 9e2ce5d..1f97aad 100644 --- a/game/WorldSpawn.cpp +++ b/game/WorldSpawn.cpp @@ -25,22 +25,20 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -/* -game_worldspawn.cpp -Worldspawn class. Each map has one worldspawn which handles global spawnargs. +#include "sys/platform.h" +#include "framework/FileSystem.h" -*/ +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "Game_local.h" +#include "WorldSpawn.h" /* ================ idWorldspawn +Worldspawn class. Each map has one worldspawn which handles global spawnargs. Every map should have exactly one worldspawn. ================ */ diff --git a/game/WorldSpawn.h b/game/WorldSpawn.h index bf88243..b8bb4e0 100644 --- a/game/WorldSpawn.h +++ b/game/WorldSpawn.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_WORLDSPAWN_H__ #define __GAME_WORLDSPAWN_H__ +#include "Entity.h" + /* =============================================================================== diff --git a/game/ai/AAS.cpp b/game/ai/AAS.cpp index 9fd1ac8..10ab9c2 100644 --- a/game/ai/AAS.cpp +++ b/game/ai/AAS.cpp @@ -26,10 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/Common.h" +#include "tools/compilers/aas/AASFileManager.h" -#include "AAS_local.h" +#include "ai/AAS_local.h" /* ============ diff --git a/game/ai/AAS.h b/game/ai/AAS.h index 8f272b4..08ab9c0 100644 --- a/game/ai/AAS.h +++ b/game/ai/AAS.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __AAS_H__ #define __AAS_H__ +#include "tools/compilers/aas/AASFile.h" + /* =============================================================================== diff --git a/game/ai/AAS_debug.cpp b/game/ai/AAS_debug.cpp index b3b4175..ad9d8c6 100644 --- a/game/ai/AAS_debug.cpp +++ b/game/ai/AAS_debug.cpp @@ -26,12 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop - -#include "AAS_local.h" -#include "../Game_local.h" // for cvars and debug drawing +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "ai/AI.h" +#include "Player.h" +#include "Game_local.h" +#include "ai/AAS_local.h" /* ============ diff --git a/game/ai/AAS_local.h b/game/ai/AAS_local.h index 5b9af24..6d32c2e 100644 --- a/game/ai/AAS_local.h +++ b/game/ai/AAS_local.h @@ -29,9 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __AAS_LOCAL_H__ #define __AAS_LOCAL_H__ -#include "AAS.h" -#include "../Pvs.h" - +#include "ai/AAS.h" +#include "Pvs.h" class idRoutingCache { friend class idAASLocal; diff --git a/game/ai/AAS_pathing.cpp b/game/ai/AAS_pathing.cpp index a47929f..916b5b6 100644 --- a/game/ai/AAS_pathing.cpp +++ b/game/ai/AAS_pathing.cpp @@ -26,10 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/Common.h" -#include "AAS_local.h" +#include "ai/AAS_local.h" #define SUBSAMPLE_WALK_PATH 1 #define SUBSAMPLE_FLY_PATH 0 diff --git a/game/ai/AAS_routing.cpp b/game/ai/AAS_routing.cpp index 2cb7104..eafd01e 100644 --- a/game/ai/AAS_routing.cpp +++ b/game/ai/AAS_routing.cpp @@ -26,11 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "Game_local.h" -#include "AAS_local.h" -#include "../Game_local.h" // for print and error +#include "ai/AAS_local.h" #define CACHETYPE_AREA 1 #define CACHETYPE_PORTAL 2 diff --git a/game/ai/AI.cpp b/game/ai/AI.cpp index 8574946..cc99b87 100644 --- a/game/ai/AI.cpp +++ b/game/ai/AI.cpp @@ -26,10 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Quat.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "Moveable.h" +#include "SmokeParticles.h" + +#include "ai/AI.h" static const char *moveCommandString[ NUM_MOVE_COMMANDS ] = { "MOVE_NONE", diff --git a/game/ai/AI.h b/game/ai/AI.h index aeb4f37..b038ba4 100644 --- a/game/ai/AI.h +++ b/game/ai/AI.h @@ -29,6 +29,11 @@ If you have questions concerning this license or the applicable additional terms #ifndef __AI_H__ #define __AI_H__ +#include "physics/Physics_Monster.h" +#include "Entity.h" +#include "Actor.h" +#include "Projectile.h" + /* =============================================================================== @@ -218,6 +223,8 @@ private: float maxDistSqr; }; +class idAI; + class idAASFindAttackPosition : public idAASCallback { public: idAASFindAttackPosition( const idAI *self, const idMat3 &gravityAxis, idEntity *target, const idVec3 &targetPos, const idVec3 &fireOffset ); diff --git a/game/ai/AI_Vagary.cpp b/game/ai/AI_Vagary.cpp index 24c7a86..6d8463b 100644 --- a/game/ai/AI_Vagary.cpp +++ b/game/ai/AI_Vagary.cpp @@ -33,10 +33,13 @@ Vagary specific AI code ***********************************************************************/ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "script/Script_Thread.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "Moveable.h" + +#include "ai/AI.h" class idAI_Vagary : public idAI { public: diff --git a/game/ai/AI_events.cpp b/game/ai/AI_events.cpp index 97ad247..04d6687 100644 --- a/game/ai/AI_events.cpp +++ b/game/ai/AI_events.cpp @@ -26,10 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "Moveable.h" +#include "Misc.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "ai/AI.h" /*********************************************************************** diff --git a/game/ai/AI_pathing.cpp b/game/ai/AI_pathing.cpp index 308e612..314928e 100644 --- a/game/ai/AI_pathing.cpp +++ b/game/ai/AI_pathing.cpp @@ -26,10 +26,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/containers/Queue.h" +#include "idlib/geometry/Winding2D.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "Moveable.h" +#include "WorldSpawn.h" + +#include "ai/AI.h" /* =============================================================================== diff --git a/game/anim/Anim.cpp b/game/anim/Anim.cpp index 1dc2a94..a9f6252 100644 --- a/game/anim/Anim.cpp +++ b/game/anim/Anim.cpp @@ -26,10 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/geometry/JointTransform.h" +#include "idlib/math/Quat.h" -#include "../Game_local.h" +#include "Game_local.h" + +#include "anim/Anim.h" bool idAnimManager::forceExport = false; diff --git a/game/anim/Anim.h b/game/anim/Anim.h index b58d44f..dcba853 100644 --- a/game/anim/Anim.h +++ b/game/anim/Anim.h @@ -28,6 +28,13 @@ If you have questions concerning this license or the applicable additional terms #ifndef __ANIM_H__ #define __ANIM_H__ +#include "idlib/containers/StrList.h" +#include "idlib/containers/HashTable.h" +#include "idlib/Dict.h" +#include "renderer/Model.h" + +#include "physics/Clip.h" + // // animation channels // these can be changed by modmakers and licensees to be whatever they need. diff --git a/game/anim/Anim_Blend.cpp b/game/anim/Anim_Blend.cpp index db33658..2bcd452 100644 --- a/game/anim/Anim_Blend.cpp +++ b/game/anim/Anim_Blend.cpp @@ -26,10 +26,19 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/containers/BinSearch.h" +#include "idlib/geometry/JointTransform.h" +#include "idlib/math/Quat.h" +#include "renderer/ModelManager.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "ai/AI.h" +#include "Entity.h" +#include "Fx.h" +#include "Game_local.h" + +#include "anim/Anim.h" static const char *channelNames[ ANIM_NumAnimChannels ] = { "all", "torso", "legs", "head", "eyelids" diff --git a/game/anim/Anim_Import.cpp b/game/anim/Anim_Import.cpp index 6a7bf3b..0aaf3e2 100644 --- a/game/anim/Anim_Import.cpp +++ b/game/anim/Anim_Import.cpp @@ -26,11 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/Licensee.h" +#include "MayaImport/maya_main.h" -#include "../Game_local.h" -#include "../../MayaImport/maya_main.h" +#include "gamesys/SysCvar.h" +#include "Game_local.h" + +#include "anim/Anim.h" /*********************************************************************** diff --git a/game/anim/Anim_Testmodel.cpp b/game/anim/Anim_Testmodel.cpp index b1c863f..eea46e4 100644 --- a/game/anim/Anim_Testmodel.cpp +++ b/game/anim/Anim_Testmodel.cpp @@ -25,6 +25,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ + +#include "sys/platform.h" +#include "renderer/ModelManager.h" + +#include "gamesys/SysCvar.h" +#include "Player.h" + +#include "anim/Anim_Testmodel.h" + /* ============================================================================= @@ -48,11 +57,6 @@ move around it to view it from different angles. ============================================================================= */ -#include "../../idlib/precompiled.h" -#pragma hdrstop - -#include "../Game_local.h" - CLASS_DECLARATION( idAnimatedEntity, idTestModel ) EVENT( EV_FootstepLeft, idTestModel::Event_Footstep ) EVENT( EV_FootstepRight, idTestModel::Event_Footstep ) diff --git a/game/anim/Anim_Testmodel.h b/game/anim/Anim_Testmodel.h index e63a7c4..398b7b5 100644 --- a/game/anim/Anim_Testmodel.h +++ b/game/anim/Anim_Testmodel.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __ANIM_TESTMODEL_H__ #define __ANIM_TESTMODEL_H__ +#include "physics/Physics_Parametric.h" +#include "Entity.h" +#include "Actor.h" + /* ============================================================================================== diff --git a/game/gamesys/Class.cpp b/game/gamesys/Class.cpp index f03e100..9c57763 100644 --- a/game/gamesys/Class.cpp +++ b/game/gamesys/Class.cpp @@ -25,6 +25,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ + +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" + +#include "Class.h" + /* Base class for all C++ objects. Provides fast run-time type checking and run-time @@ -32,14 +39,6 @@ instancing of objects. */ -#include "../../idlib/precompiled.h" -#pragma hdrstop - -#include "../Game_local.h" - -#include "TypeInfo.h" - - /*********************************************************************** idTypeInfo diff --git a/game/gamesys/Class.h b/game/gamesys/Class.h index 853d1f9..99040fe 100644 --- a/game/gamesys/Class.h +++ b/game/gamesys/Class.h @@ -25,6 +25,17 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ + +#ifndef __SYS_CLASS_H__ +#define __SYS_CLASS_H__ + +#include "idlib/containers/Hierarchy.h" + +#include "gamesys/Event.h" + +class idClass; +class idTypeInfo; + /* Base class for all game objects. Provides fast run-time type checking and run-time @@ -32,12 +43,6 @@ instancing of objects. */ -#ifndef __SYS_CLASS_H__ -#define __SYS_CLASS_H__ - -class idClass; -class idTypeInfo; - extern const idEventDef EV_Remove; extern const idEventDef EV_SafeRemove; diff --git a/game/gamesys/DebugGraph.cpp b/game/gamesys/DebugGraph.cpp index f79c627..4f98662 100644 --- a/game/gamesys/DebugGraph.cpp +++ b/game/gamesys/DebugGraph.cpp @@ -25,10 +25,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop -#include "../Game_local.h" +#include "sys/platform.h" +#include "Player.h" +#include "Game_local.h" + +#include "DebugGraph.h" /* ================ diff --git a/game/gamesys/DebugGraph.h b/game/gamesys/DebugGraph.h index 0729d49..1760248 100644 --- a/game/gamesys/DebugGraph.h +++ b/game/gamesys/DebugGraph.h @@ -26,6 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ +#ifndef __DEBUGGRAPH_H__ +#define __DEBUGGRAPH_H__ + +#include "idlib/containers/List.h" +#include "idlib/math/Vector.h" + class idDebugGraph { public: idDebugGraph(); @@ -37,3 +43,5 @@ private: idList samples; int index; }; + +#endif diff --git a/game/gamesys/Event.cpp b/game/gamesys/Event.cpp index cd46f36..24b1c41 100644 --- a/game/gamesys/Event.cpp +++ b/game/gamesys/Event.cpp @@ -25,6 +25,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ + +#include "sys/platform.h" +#include "script/Script_Program.h" +#include "Entity.h" +#include "Game_local.h" + +#include "Event.h" + /* sys_event.cpp @@ -32,11 +40,6 @@ Event are used for scheduling tasks and for linking script commands. */ -#include "../../idlib/precompiled.h" -#pragma hdrstop - -#include "../Game_local.h" - #define MAX_EVENTSPERFRAME 4096 //#define CREATE_EVENT_CODE diff --git a/game/gamesys/Event.h b/game/gamesys/Event.h index 4e2c517..c90c067 100644 --- a/game/gamesys/Event.h +++ b/game/gamesys/Event.h @@ -25,14 +25,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -/* -sys_event.h -Event are used for scheduling tasks and for linking script commands. -*/ #ifndef __SYS_EVENT_H__ #define __SYS_EVENT_H__ +#include "idlib/containers/LinkList.h" +#include "cm/CollisionModel.h" + +// Event are used for scheduling tasks and for linking script commands. + #define D_EVENT_MAXARGS 8 // if changed, enable the CREATE_EVENT_CODE define in Event.cpp to generate switch statement for idClass::ProcessEventArgPtr. // running the game will then generate c:\doom\base\events.txt, the contents of which should be copied into the switch statement. diff --git a/game/gamesys/SaveGame.cpp b/game/gamesys/SaveGame.cpp index 432f19f..e0b70c9 100644 --- a/game/gamesys/SaveGame.cpp +++ b/game/gamesys/SaveGame.cpp @@ -26,12 +26,16 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/BuildVersion.h" +#include "framework/DeclSkin.h" +#include "renderer/ModelManager.h" -#include "../Game_local.h" +#include "physics/Clip.h" +#include "Entity.h" +#include "Game_local.h" -#include "TypeInfo.h" +#include "SaveGame.h" /* Save game related helper classes. diff --git a/game/gamesys/SaveGame.h b/game/gamesys/SaveGame.h index 7b3be8e..4b0927f 100644 --- a/game/gamesys/SaveGame.h +++ b/game/gamesys/SaveGame.h @@ -29,6 +29,13 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SAVEGAME_H__ #define __SAVEGAME_H__ +#include "framework/DeclFX.h" +#include "framework/Game.h" +#include "renderer/Model.h" +#include "renderer/RenderSystem.h" + +#include "gamesys/Class.h" + /* Save game related helper classes. diff --git a/game/gamesys/SysCmds.cpp b/game/gamesys/SysCmds.cpp index bab152a..9645b8d 100644 --- a/game/gamesys/SysCmds.cpp +++ b/game/gamesys/SysCmds.cpp @@ -26,12 +26,23 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/LangDict.h" +#include "framework/async/NetworkSystem.h" +#include "framework/FileSystem.h" -#include "../Game_local.h" +#include "gamesys/TypeInfo.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Thread.h" +#include "ai/AI.h" +#include "anim/Anim_Testmodel.h" +#include "Entity.h" +#include "Moveable.h" +#include "WorldSpawn.h" +#include "Fx.h" +#include "Misc.h" -#include "TypeInfo.h" +#include "SysCmds.h" /* ================== diff --git a/game/gamesys/SysCvar.cpp b/game/gamesys/SysCvar.cpp index 5961814..e1467dd 100644 --- a/game/gamesys/SysCvar.cpp +++ b/game/gamesys/SysCvar.cpp @@ -26,10 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/Licensee.h" +#include "framework/BuildVersion.h" -#include "../Game_local.h" +#include "GameBase.h" +#include "MultiplayerGame.h" + +#include "SysCvar.h" #if defined( _DEBUG ) #define BUILD_DEBUG "-debug" diff --git a/game/gamesys/SysCvar.h b/game/gamesys/SysCvar.h index bcecd1d..da8e26e 100644 --- a/game/gamesys/SysCvar.h +++ b/game/gamesys/SysCvar.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SYS_CVAR_H__ #define __SYS_CVAR_H__ +#include "framework/CVarSystem.h" + extern idCVar developer; extern idCVar g_cinematic; diff --git a/game/gamesys/TypeInfo.cpp b/game/gamesys/TypeInfo.cpp index 9e71192..6ed9b64 100644 --- a/game/gamesys/TypeInfo.cpp +++ b/game/gamesys/TypeInfo.cpp @@ -30,10 +30,17 @@ If you have questions concerning this license or the applicable additional terms #define private public #define protected public -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/containers/LinkList.h" +#include "idlib/containers/StaticList.h" +#include "idlib/math/Quat.h" +#include "idlib/math/Interpolate.h" +#include "idlib/bv/Bounds.h" +#include "idlib/Lexer.h" +#include "framework/Common.h" +#include "framework/FileSystem.h" -#include "../Game_local.h" +#include "Entity.h" #ifdef ID_DEBUG_MEMORY #include "GameTypeInfo.h" // Make sure this is up to date! @@ -41,6 +48,8 @@ If you have questions concerning this license or the applicable additional terms #include "NoGameTypeInfo.h" #endif +#include "TypeInfo.h" + // disabled because it's adds about 64MB to state dumps and takes a really long time //#define DUMP_GAMELOCAL diff --git a/game/gamesys/TypeInfo.h b/game/gamesys/TypeInfo.h index cd47bfd..b9efa2d 100644 --- a/game/gamesys/TypeInfo.h +++ b/game/gamesys/TypeInfo.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SYS_TYPEINFO_H__ #define __SYS_TYPEINFO_H__ +#include "idlib/CmdArgs.h" + +class idFile; + /* =================================================================================== diff --git a/game/physics/Clip.cpp b/game/physics/Clip.cpp index e6a30fe..c6c5c91 100644 --- a/game/physics/Clip.cpp +++ b/game/physics/Clip.cpp @@ -26,10 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "gamesys/SaveGame.h" +#include "Entity.h" +#include "Game_local.h" -#include "../Game_local.h" +#include "physics/Clip.h" #define MAX_SECTOR_DEPTH 12 #define MAX_SECTORS ((1<<(MAX_SECTOR_DEPTH+1))-1) diff --git a/game/physics/Clip.h b/game/physics/Clip.h index 1d79c84..e6f0c20 100644 --- a/game/physics/Clip.h +++ b/game/physics/Clip.h @@ -29,6 +29,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __CLIP_H__ #define __CLIP_H__ +#include "idlib/geometry/TraceModel.h" +#include "cm/CollisionModel.h" + +class idSaveGame; +class idRestoreGame; + /* =============================================================================== @@ -41,7 +47,6 @@ If you have questions concerning this license or the applicable additional terms #define JOINT_HANDLE_TO_CLIPMODEL_ID( id ) ( -1 - id ) class idClip; -class idClipModel; class idEntity; diff --git a/game/physics/Force.cpp b/game/physics/Force.cpp index a835a55..874bdd0 100644 --- a/game/physics/Force.cpp +++ b/game/physics/Force.cpp @@ -26,10 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" -#include "../Game_local.h" +#include "physics/Force.h" CLASS_DECLARATION( idClass, idForce ) END_CLASS diff --git a/game/physics/Force.h b/game/physics/Force.h index ff6f448..582225e 100644 --- a/game/physics/Force.h +++ b/game/physics/Force.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __FORCE_H__ #define __FORCE_H__ +#include "gamesys/Class.h" + /* =============================================================================== diff --git a/game/physics/Force_Constant.cpp b/game/physics/Force_Constant.cpp index 2b15096..d62bc34 100644 --- a/game/physics/Force_Constant.cpp +++ b/game/physics/Force_Constant.cpp @@ -26,10 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "physics/Physics.h" +#include "gamesys/SaveGame.h" -#include "../Game_local.h" +#include "physics/Force_Constant.h" CLASS_DECLARATION( idForce, idForce_Constant ) END_CLASS diff --git a/game/physics/Force_Constant.h b/game/physics/Force_Constant.h index 0466b3a..e62df35 100644 --- a/game/physics/Force_Constant.h +++ b/game/physics/Force_Constant.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __FORCE_CONSTANT_H__ #define __FORCE_CONSTANT_H__ +#include "physics/Force.h" + /* =============================================================================== diff --git a/game/physics/Force_Drag.cpp b/game/physics/Force_Drag.cpp index ee41c7f..f8682a1 100644 --- a/game/physics/Force_Drag.cpp +++ b/game/physics/Force_Drag.cpp @@ -26,10 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/UsercmdGen.h" -#include "../Game_local.h" +#include "physics/Physics.h" + +#include "physics/Force_Drag.h" CLASS_DECLARATION( idForce, idForce_Drag ) END_CLASS diff --git a/game/physics/Force_Drag.h b/game/physics/Force_Drag.h index 97465ae..4010845 100644 --- a/game/physics/Force_Drag.h +++ b/game/physics/Force_Drag.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __FORCE_DRAG_H__ #define __FORCE_DRAG_H__ +#include "physics/Force.h" + /* =============================================================================== diff --git a/game/physics/Force_Field.cpp b/game/physics/Force_Field.cpp index 8db7022..8c02b12 100644 --- a/game/physics/Force_Field.cpp +++ b/game/physics/Force_Field.cpp @@ -26,10 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "physics/Physics_Player.h" +#include "physics/Physics_Monster.h" +#include "WorldSpawn.h" -#include "../Game_local.h" +#include "physics/Force_Field.h" CLASS_DECLARATION( idForce, idForce_Field ) END_CLASS diff --git a/game/physics/Force_Field.h b/game/physics/Force_Field.h index e3bfc83..ea963ac 100644 --- a/game/physics/Force_Field.h +++ b/game/physics/Force_Field.h @@ -29,6 +29,11 @@ If you have questions concerning this license or the applicable additional terms #ifndef __FORCE_FIELD_H__ #define __FORCE_FIELD_H__ +#include "physics/Force.h" +#include "physics/Clip.h" +#include "Entity.h" +#include "AFEntity.h" + /* =============================================================================== diff --git a/game/physics/Force_Spring.cpp b/game/physics/Force_Spring.cpp index 93a6d19..c805b7a 100644 --- a/game/physics/Force_Spring.cpp +++ b/game/physics/Force_Spring.cpp @@ -26,10 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "physics/Physics.h" -#include "../Game_local.h" +#include "physics/Force_Spring.h" CLASS_DECLARATION( idForce, idForce_Spring ) END_CLASS diff --git a/game/physics/Force_Spring.h b/game/physics/Force_Spring.h index 06db706..2a890b2 100644 --- a/game/physics/Force_Spring.h +++ b/game/physics/Force_Spring.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __FORCE_SPRING_H__ #define __FORCE_SPRING_H__ +#include "physics/Force.h" + /* =============================================================================== diff --git a/game/physics/Physics.cpp b/game/physics/Physics.cpp index bb48704..86e35d4 100644 --- a/game/physics/Physics.cpp +++ b/game/physics/Physics.cpp @@ -26,10 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "Game_local.h" -#include "../Game_local.h" +#include "physics/Physics.h" ABSTRACT_DECLARATION( idClass, idPhysics ) END_CLASS diff --git a/game/physics/Physics.h b/game/physics/Physics.h index 3d70adb..545c6ee 100644 --- a/game/physics/Physics.h +++ b/game/physics/Physics.h @@ -29,6 +29,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_H__ #define __PHYSICS_H__ +#include "idlib/BitMsg.h" + +#include "gamesys/Class.h" +#include "physics/Clip.h" +#include "GameBase.h" + /* =============================================================================== diff --git a/game/physics/Physics_AF.cpp b/game/physics/Physics_AF.cpp index 77766df..4c1a559 100644 --- a/game/physics/Physics_AF.cpp +++ b/game/physics/Physics_AF.cpp @@ -26,10 +26,16 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Quat.h" +#include "idlib/Timer.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "Entity.h" +#include "Player.h" +#include "WorldSpawn.h" + +#include "physics/Physics_AF.h" CLASS_DECLARATION( idPhysics_Base, idPhysics_AF ) END_CLASS diff --git a/game/physics/Physics_AF.h b/game/physics/Physics_AF.h index 4d712b1..90b57c9 100644 --- a/game/physics/Physics_AF.h +++ b/game/physics/Physics_AF.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_AF_H__ #define __PHYSICS_AF_H__ +#include "idlib/math/Lcp.h" + +#include "physics/Physics_Base.h" + /* =================================================================================== diff --git a/game/physics/Physics_Actor.cpp b/game/physics/Physics_Actor.cpp index 5237272..85a45a7 100644 --- a/game/physics/Physics_Actor.cpp +++ b/game/physics/Physics_Actor.cpp @@ -26,10 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "Entity.h" -#include "../Game_local.h" +#include "physics/Physics_Actor.h" CLASS_DECLARATION( idPhysics_Base, idPhysics_Actor ) END_CLASS diff --git a/game/physics/Physics_Actor.h b/game/physics/Physics_Actor.h index 0e4fec1..e50ae17 100644 --- a/game/physics/Physics_Actor.h +++ b/game/physics/Physics_Actor.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_ACTOR_H__ #define __PHYSICS_ACTOR_H__ +#include "physics/Physics_Base.h" + /* =================================================================================== diff --git a/game/physics/Physics_Base.cpp b/game/physics/Physics_Base.cpp index ee421c7..41b455b 100644 --- a/game/physics/Physics_Base.cpp +++ b/game/physics/Physics_Base.cpp @@ -26,10 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "physics/Force.h" +#include "Entity.h" -#include "../Game_local.h" +#include "physics/Physics_Base.h" CLASS_DECLARATION( idPhysics, idPhysics_Base ) END_CLASS diff --git a/game/physics/Physics_Base.h b/game/physics/Physics_Base.h index a0ac05b..0d73934 100644 --- a/game/physics/Physics_Base.h +++ b/game/physics/Physics_Base.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_BASE_H__ #define __PHYSICS_BASE_H__ +#include "physics/Physics.h" +#include "Game_local.h" + /* =============================================================================== diff --git a/game/physics/Physics_Monster.cpp b/game/physics/Physics_Monster.cpp index c5b919c..1e48b7f 100644 --- a/game/physics/Physics_Monster.cpp +++ b/game/physics/Physics_Monster.cpp @@ -26,10 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "Entity.h" +#include "Actor.h" -#include "../Game_local.h" +#include "physics/Physics_Monster.h" CLASS_DECLARATION( idPhysics_Actor, idPhysics_Monster ) END_CLASS diff --git a/game/physics/Physics_Monster.h b/game/physics/Physics_Monster.h index 5492324..0df59dd 100644 --- a/game/physics/Physics_Monster.h +++ b/game/physics/Physics_Monster.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_MONSTER_H__ #define __PHYSICS_MONSTER_H__ +#include "idlib/math/Vector.h" + +#include "physics/Physics_Actor.h" + /* =================================================================================== diff --git a/game/physics/Physics_Parametric.cpp b/game/physics/Physics_Parametric.cpp index 2208b94..c502ba5 100644 --- a/game/physics/Physics_Parametric.cpp +++ b/game/physics/Physics_Parametric.cpp @@ -26,10 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "Entity.h" -#include "../Game_local.h" +#include "physics/Physics_Parametric.h" CLASS_DECLARATION( idPhysics_Base, idPhysics_Parametric ) END_CLASS diff --git a/game/physics/Physics_Parametric.h b/game/physics/Physics_Parametric.h index 3cbd6a5..ad4745b 100644 --- a/game/physics/Physics_Parametric.h +++ b/game/physics/Physics_Parametric.h @@ -29,6 +29,11 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_PARAMETRIC_H__ #define __PHYSICS_PARAMETRIC_H__ +#include "idlib/math/Curve.h" +#include "idlib/math/Interpolate.h" + +#include "physics/Physics_Base.h" + /* =================================================================================== diff --git a/game/physics/Physics_Player.cpp b/game/physics/Physics_Player.cpp index f7a2d1e..6a74c5e 100644 --- a/game/physics/Physics_Player.cpp +++ b/game/physics/Physics_Player.cpp @@ -26,10 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "Entity.h" -#include "../Game_local.h" +#include "physics/Physics_Player.h" CLASS_DECLARATION( idPhysics_Actor, idPhysics_Player ) END_CLASS diff --git a/game/physics/Physics_Player.h b/game/physics/Physics_Player.h index f3aa852..40d52e7 100644 --- a/game/physics/Physics_Player.h +++ b/game/physics/Physics_Player.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_PLAYER_H__ #define __PHYSICS_PLAYER_H__ +#include "physics/Physics_Actor.h" + /* =================================================================================== diff --git a/game/physics/Physics_RigidBody.cpp b/game/physics/Physics_RigidBody.cpp index aaefd04..8d0436f 100644 --- a/game/physics/Physics_RigidBody.cpp +++ b/game/physics/Physics_RigidBody.cpp @@ -26,10 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Quat.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "Entity.h" +#include "Player.h" + +#include "physics/Physics_RigidBody.h" CLASS_DECLARATION( idPhysics_Base, idPhysics_RigidBody ) END_CLASS diff --git a/game/physics/Physics_RigidBody.h b/game/physics/Physics_RigidBody.h index 1e9874d..d211ebe 100644 --- a/game/physics/Physics_RigidBody.h +++ b/game/physics/Physics_RigidBody.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_RIGIDBODY_H__ #define __PHYSICS_RIGIDBODY_H__ +#include "idlib/math/Ode.h" + +#include "physics/Physics_Base.h" + /* =================================================================================== diff --git a/game/physics/Physics_Static.cpp b/game/physics/Physics_Static.cpp index 4ff07e2..cf9f0cf 100644 --- a/game/physics/Physics_Static.cpp +++ b/game/physics/Physics_Static.cpp @@ -26,10 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Quat.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "physics/Force.h" +#include "Entity.h" + +#include "physics/Physics_Static.h" CLASS_DECLARATION( idPhysics, idPhysics_Static ) END_CLASS diff --git a/game/physics/Physics_Static.h b/game/physics/Physics_Static.h index e8002e1..bb58951 100644 --- a/game/physics/Physics_Static.h +++ b/game/physics/Physics_Static.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_STATIC_H__ #define __PHYSICS_STATIC_H__ +#include "physics/Physics.h" + /* =============================================================================== diff --git a/game/physics/Physics_StaticMulti.cpp b/game/physics/Physics_StaticMulti.cpp index df2c293..287d901 100644 --- a/game/physics/Physics_StaticMulti.cpp +++ b/game/physics/Physics_StaticMulti.cpp @@ -26,10 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Quat.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "physics/Force.h" +#include "Entity.h" + +#include "physics/Physics_StaticMulti.h" CLASS_DECLARATION( idPhysics, idPhysics_StaticMulti ) END_CLASS diff --git a/game/physics/Physics_StaticMulti.h b/game/physics/Physics_StaticMulti.h index a6055f9..0cd94ed 100644 --- a/game/physics/Physics_StaticMulti.h +++ b/game/physics/Physics_StaticMulti.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PHYSICS_STATICMULTI_H__ #define __PHYSICS_STATICMULTI_H__ +#include "physics/Physics_Static.h" + /* =============================================================================== diff --git a/game/physics/Push.cpp b/game/physics/Push.cpp index 44c4220..0b98613 100644 --- a/game/physics/Push.cpp +++ b/game/physics/Push.cpp @@ -26,11 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop - -#include "../Game_local.h" +#include "sys/platform.h" +#include "physics/Physics_Actor.h" +#include "Entity.h" +#include "Player.h" +#include "Moveable.h" +#include "Game_local.h" +#include "physics/Push.h" /* ============ diff --git a/game/physics/Push.h b/game/physics/Push.h index b122d01..0cb7406 100644 --- a/game/physics/Push.h +++ b/game/physics/Push.h @@ -29,6 +29,13 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PUSH_H__ #define __PUSH_H__ +#include "cm/CollisionModel.h" + +#include "physics/Clip.h" +#include "GameBase.h" + +class idEntity; + /* =============================================================================== diff --git a/game/script/Script_Compiler.cpp b/game/script/Script_Compiler.cpp index df900e2..d698be2 100644 --- a/game/script/Script_Compiler.cpp +++ b/game/script/Script_Compiler.cpp @@ -26,10 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/Timer.h" -#include "../Game_local.h" +#include "script/Script_Thread.h" +#include "Game_local.h" + +#include "script/Script_Compiler.h" #define FUNCTION_PRIORITY 2 #define INT_PRIORITY 2 diff --git a/game/script/Script_Compiler.h b/game/script/Script_Compiler.h index fdcfe42..be9fb68 100644 --- a/game/script/Script_Compiler.h +++ b/game/script/Script_Compiler.h @@ -28,6 +28,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SCRIPT_COMPILER_H__ #define __SCRIPT_COMPILER_H__ +#include "idlib/Parser.h" + +#include "script/Script_Program.h" + const char * const RESULT_STRING = ""; typedef struct opcode_s { diff --git a/game/script/Script_Interpreter.cpp b/game/script/Script_Interpreter.cpp index c7de466..b6d044c 100644 --- a/game/script/Script_Interpreter.cpp +++ b/game/script/Script_Interpreter.cpp @@ -26,10 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Compiler.h" +#include "script/Script_Thread.h" -#include "../Game_local.h" +#include "script/Script_Interpreter.h" /* ================ diff --git a/game/script/Script_Interpreter.h b/game/script/Script_Interpreter.h index b852571..e7ec0f6 100644 --- a/game/script/Script_Interpreter.h +++ b/game/script/Script_Interpreter.h @@ -29,6 +29,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SCRIPT_INTERPRETER_H__ #define __SCRIPT_INTERPRETER_H__ +#include "script/Script_Program.h" +#include "Entity.h" +#include "Game_local.h" + +class idThread; + #define MAX_STACK_DEPTH 64 #define LOCALSTACK_SIZE (6144 * 2) diff --git a/game/script/Script_Program.cpp b/game/script/Script_Program.cpp index 465c58b..bfcd719 100644 --- a/game/script/Script_Program.cpp +++ b/game/script/Script_Program.cpp @@ -26,10 +26,18 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/hashing/MD4.h" +#include "framework/FileSystem.h" -#include "../Game_local.h" +#include "gamesys/Event.h" +#include "gamesys/SysCvar.h" +#include "script/Script_Compiler.h" +#include "script/Script_Thread.h" +#include "Entity.h" +#include "Game_local.h" + +#include "script/Script_Program.h" // simple types. function types are dynamically allocated idTypeDef type_void( ev_void, &def_void, "void", 0, NULL ); diff --git a/game/script/Script_Program.h b/game/script/Script_Program.h index 937f1f0..5975677 100644 --- a/game/script/Script_Program.h +++ b/game/script/Script_Program.h @@ -29,12 +29,17 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SCRIPT_PROGRAM_H__ #define __SCRIPT_PROGRAM_H__ -class idScriptObject; +#include "idlib/containers/StrList.h" +#include "idlib/containers/StaticList.h" +#include "idlib/containers/HashIndex.h" +#include "idlib/math/Vector.h" + +#include "GameBase.h" + class idEventDef; class idVarDef; class idTypeDef; class idEntity; -class idThread; class idSaveGame; class idRestoreGame; diff --git a/game/script/Script_Thread.cpp b/game/script/Script_Thread.cpp index 9b59685..58daa5d 100644 --- a/game/script/Script_Thread.cpp +++ b/game/script/Script_Thread.cpp @@ -26,10 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" -#include "../Game_local.h" +#include "gamesys/SysCvar.h" +#include "Player.h" +#include "Camera.h" + +#include "script/Script_Thread.h" const idEventDef EV_Thread_Execute( "", NULL ); const idEventDef EV_Thread_SetCallback( "", NULL ); diff --git a/game/script/Script_Thread.h b/game/script/Script_Thread.h index 232f6cc..fe24943 100644 --- a/game/script/Script_Thread.h +++ b/game/script/Script_Thread.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SCRIPT_THREAD_H__ #define __SCRIPT_THREAD_H__ +#include "script/Script_Interpreter.h" +#include "gamesys/Class.h" +#include "gamesys/Event.h" + extern const idEventDef EV_Thread_Execute; extern const idEventDef EV_Thread_SetCallback; extern const idEventDef EV_Thread_TerminateThread; diff --git a/idlib/Base64.cpp b/idlib/Base64.cpp index ce024b8..85d4639 100644 --- a/idlib/Base64.cpp +++ b/idlib/Base64.cpp @@ -1,6 +1,7 @@ +#include "sys/platform.h" +#include "framework/File.h" -#include "precompiled.h" -#pragma hdrstop +#include "idlib/Base64.h" /* Copyright (c) 1996 Lars Wirzenius. All rights reserved. diff --git a/idlib/Base64.h b/idlib/Base64.h index 632d011..2284913 100644 --- a/idlib/Base64.h +++ b/idlib/Base64.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __BASE64_H__ #define __BASE64_H__ +#include "idlib/Str.h" + /* =============================================================================== diff --git a/idlib/BitMsg.cpp b/idlib/BitMsg.cpp index ed8072c..27be80d 100644 --- a/idlib/BitMsg.cpp +++ b/idlib/BitMsg.cpp @@ -26,9 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/BitMsg.h" /* ============================================================================== diff --git a/idlib/BitMsg.h b/idlib/BitMsg.h index ad727fe..82edfa4 100644 --- a/idlib/BitMsg.h +++ b/idlib/BitMsg.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __BITMSG_H__ #define __BITMSG_H__ +#include "idlib/math/Vector.h" +#include "idlib/Dict.h" +#include "framework/Common.h" + /* =============================================================================== diff --git a/idlib/CmdArgs.cpp b/idlib/CmdArgs.cpp index 34d2889..f862986 100644 --- a/idlib/CmdArgs.cpp +++ b/idlib/CmdArgs.cpp @@ -26,8 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/Lexer.h" +#include "idlib/Lib.h" +#include "framework/CVarSystem.h" + +#include "idlib/CmdArgs.h" /* ============ diff --git a/idlib/Dict.cpp b/idlib/Dict.cpp index 9c98566..b1039cc 100644 --- a/idlib/Dict.cpp +++ b/idlib/Dict.cpp @@ -26,8 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/hashing/CRC32.h" +#include "framework/Common.h" +#include "framework/File.h" + +#include "idlib/Dict.h" idStrPool idDict::globalKeys; idStrPool idDict::globalValues; diff --git a/idlib/Dict.h b/idlib/Dict.h index 29b9dd3..94d68d6 100644 --- a/idlib/Dict.h +++ b/idlib/Dict.h @@ -29,6 +29,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __DICT_H__ #define __DICT_H__ +#include "idlib/containers/StrPool.h" +#include "idlib/math/Angles.h" +#include "idlib/math/Matrix.h" +#include "idlib/Str.h" +#include "idlib/Parser.h" + /* =============================================================================== diff --git a/idlib/Heap.cpp b/idlib/Heap.cpp index 611a385..a76fb4a 100644 --- a/idlib/Heap.cpp +++ b/idlib/Heap.cpp @@ -26,8 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/Common.h" + +#include "idlib/Heap.h" #ifndef USE_LIBC_MALLOC #define USE_LIBC_MALLOC 0 diff --git a/idlib/Heap.h b/idlib/Heap.h index f7bda34..6cc27eb 100644 --- a/idlib/Heap.h +++ b/idlib/Heap.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __HEAP_H__ #define __HEAP_H__ +#include "idlib/Lib.h" +#include "sys/sys_public.h" + /* =============================================================================== diff --git a/idlib/LangDict.cpp b/idlib/LangDict.cpp index 426d909..63b477a 100644 --- a/idlib/LangDict.cpp +++ b/idlib/LangDict.cpp @@ -26,9 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/Lexer.h" +#include "framework/FileSystem.h" +#include "idlib/LangDict.h" /* ============ diff --git a/idlib/LangDict.h b/idlib/LangDict.h index a1cd1f5..200a96d 100644 --- a/idlib/LangDict.h +++ b/idlib/LangDict.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __LANGDICT_H__ #define __LANGDICT_H__ +#include "idlib/containers/List.h" +#include "idlib/containers/HashIndex.h" +#include "idlib/Str.h" + /* =============================================================================== diff --git a/idlib/Lexer.cpp b/idlib/Lexer.cpp index 9bdef6a..4629a58 100644 --- a/idlib/Lexer.cpp +++ b/idlib/Lexer.cpp @@ -26,8 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/Heap.h" +#include "framework/Common.h" +#include "framework/FileSystem.h" + +#include "idlib/Lexer.h" #define PUNCTABLE diff --git a/idlib/Lexer.h b/idlib/Lexer.h index 8fd7dae..09d7da4 100644 --- a/idlib/Lexer.h +++ b/idlib/Lexer.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __LEXER_H__ #define __LEXER_H__ +#include "idlib/Token.h" + /* =============================================================================== diff --git a/idlib/Lib.cpp b/idlib/Lib.cpp index 9487b5a..a790c56 100644 --- a/idlib/Lib.cpp +++ b/idlib/Lib.cpp @@ -26,15 +26,21 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "precompiled.h" -#pragma hdrstop - #if defined( MACOS_X ) #include #include #include #endif +#include "sys/platform.h" +#include "idlib/math/Vector.h" +#include "idlib/math/Polynomial.h" +#include "idlib/Str.h" +#include "idlib/Dict.h" +#include "framework/Common.h" + +#include "idlib/Lib.h" + /* =============================================================================== diff --git a/idlib/Lib.h b/idlib/Lib.h index 44607f4..ce7ecef 100644 --- a/idlib/Lib.h +++ b/idlib/Lib.h @@ -29,7 +29,6 @@ If you have questions concerning this license or the applicable additional terms #ifndef __LIB_H__ #define __LIB_H__ - /* =============================================================================== @@ -47,6 +46,11 @@ If you have questions concerning this license or the applicable additional terms =============================================================================== */ +class idSys; +class idCommon; +class idCVarSystem; +class idFileSystem; + class idLib { public: static class idSys * sys; @@ -135,87 +139,4 @@ public: template ID_INLINE T Max( T x, T y ) { return ( x > y ) ? x : y; } template ID_INLINE T Min( T x, T y ) { return ( x < y ) ? x : y; } -/* -=============================================================================== - - idLib headers. - -=============================================================================== -*/ - -// memory management and arrays -#include "Heap.h" -#include "containers/List.h" - -// math -#include "math/Simd.h" -#include "math/Math.h" -#include "math/Random.h" -#include "math/Complex.h" -#include "math/Vector.h" -#include "math/Matrix.h" -#include "math/Angles.h" -#include "math/Quat.h" -#include "math/Rotation.h" -#include "math/Plane.h" -#include "math/Pluecker.h" -#include "math/Polynomial.h" -#include "math/Extrapolate.h" -#include "math/Interpolate.h" -#include "math/Curve.h" -#include "math/Ode.h" -#include "math/Lcp.h" - -// bounding volumes -#include "bv/Sphere.h" -#include "bv/Bounds.h" -#include "bv/Box.h" -#include "bv/Frustum.h" - -// geometry -#include "geometry/DrawVert.h" -#include "geometry/JointTransform.h" -#include "geometry/Winding.h" -#include "geometry/Winding2D.h" -#include "geometry/Surface.h" -#include "geometry/Surface_Patch.h" -#include "geometry/Surface_Polytope.h" -#include "geometry/Surface_SweptSpline.h" -#include "geometry/TraceModel.h" - -// text manipulation -#include "Str.h" -#include "Token.h" -#include "Lexer.h" -#include "Parser.h" -#include "Base64.h" -#include "CmdArgs.h" - -// containers -#include "containers/BTree.h" -#include "containers/BinSearch.h" -#include "containers/HashIndex.h" -#include "containers/HashTable.h" -#include "containers/StaticList.h" -#include "containers/LinkList.h" -#include "containers/Hierarchy.h" -#include "containers/Queue.h" -#include "containers/Stack.h" -#include "containers/StrList.h" -#include "containers/StrPool.h" -#include "containers/VectorSet.h" -#include "containers/PlaneSet.h" - -// hashing -#include "hashing/CRC32.h" -#include "hashing/MD4.h" -#include "hashing/MD5.h" - -// misc -#include "Dict.h" -#include "LangDict.h" -#include "BitMsg.h" -#include "MapFile.h" -#include "Timer.h" - #endif /* !__LIB_H__ */ diff --git a/idlib/MapFile.cpp b/idlib/MapFile.cpp index 639322a..afbfa1d 100644 --- a/idlib/MapFile.cpp +++ b/idlib/MapFile.cpp @@ -26,9 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "framework/File.h" +#include "framework/FileSystem.h" +#include "idlib/MapFile.h" /* =============== diff --git a/idlib/MapFile.h b/idlib/MapFile.h index ba5d357..fb93339 100644 --- a/idlib/MapFile.h +++ b/idlib/MapFile.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MAPFILE_H__ #define __MAPFILE_H__ +#include "idlib/geometry/Surface_Patch.h" +#include "idlib/math/Plane.h" +#include "idlib/Dict.h" + /* =============================================================================== diff --git a/idlib/Parser.cpp b/idlib/Parser.cpp index 8bc23cb..199ac7f 100644 --- a/idlib/Parser.cpp +++ b/idlib/Parser.cpp @@ -26,8 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/Lib.h" +#include "framework/Common.h" + +#include "idlib/Parser.h" //#define DEBUG_EVAL #define MAX_DEFINEPARMS 128 diff --git a/idlib/Parser.h b/idlib/Parser.h index 6843b05..a8c821a 100644 --- a/idlib/Parser.h +++ b/idlib/Parser.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PARSER_H__ #define __PARSER_H__ +#include "idlib/Token.h" +#include "idlib/Lexer.h" + /* =============================================================================== diff --git a/idlib/Str.cpp b/idlib/Str.cpp index bc54504..034fbe9 100644 --- a/idlib/Str.cpp +++ b/idlib/Str.cpp @@ -26,8 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Vector.h" +#include "idlib/Heap.h" +#include "framework/Common.h" + +#include "idlib/Str.h" #if !defined( ID_REDIRECT_NEWDELETE ) && !defined( MACOS_X ) #define USE_STRING_DATA_ALLOCATOR diff --git a/idlib/Str.h b/idlib/Str.h index 21160d5..9b2d103 100644 --- a/idlib/Str.h +++ b/idlib/Str.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __STR_H__ #define __STR_H__ +#include "idlib/CmdArgs.h" + /* =============================================================================== diff --git a/idlib/Timer.cpp b/idlib/Timer.cpp index 51a3fe0..55bc298 100644 --- a/idlib/Timer.cpp +++ b/idlib/Timer.cpp @@ -26,12 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/Lib.h" +#include "framework/Common.h" + +#include "idlib/Timer.h" double idTimer::base = -1.0; - /* ================= idTimer::InitBaseClockTicks diff --git a/idlib/Timer.h b/idlib/Timer.h index 39110c6..24c5b1c 100644 --- a/idlib/Timer.h +++ b/idlib/Timer.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __TIMER_H__ #define __TIMER_H__ +#include "idlib/containers/StrList.h" +#include "idlib/Lib.h" +#include "sys/sys_public.h" + /* =============================================================================== diff --git a/idlib/Token.cpp b/idlib/Token.cpp index 73fd163..51fe5b6 100644 --- a/idlib/Token.cpp +++ b/idlib/Token.cpp @@ -26,9 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Math.h" +#include "idlib/Token.h" /* ================ diff --git a/idlib/Token.h b/idlib/Token.h index af6df0c..b80d471 100644 --- a/idlib/Token.h +++ b/idlib/Token.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __TOKEN_H__ #define __TOKEN_H__ +#include "idlib/Str.h" + /* =============================================================================== diff --git a/idlib/bv/Bounds.cpp b/idlib/bv/Bounds.cpp index 10207ce..c28b6a1 100644 --- a/idlib/bv/Bounds.cpp +++ b/idlib/bv/Bounds.cpp @@ -26,8 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" + +#include "idlib/bv/Bounds.h" idBounds bounds_zero( vec3_zero, vec3_zero ); diff --git a/idlib/bv/Bounds.h b/idlib/bv/Bounds.h index 5fb97cc..7e79b8a 100644 --- a/idlib/bv/Bounds.h +++ b/idlib/bv/Bounds.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __BV_BOUNDS_H__ #define __BV_BOUNDS_H__ +#include "idlib/math/Vector.h" +#include "idlib/math/Rotation.h" +#include "idlib/bv/Sphere.h" + /* =============================================================================== diff --git a/idlib/bv/Box.cpp b/idlib/bv/Box.cpp index 28acecf..75be26d 100644 --- a/idlib/bv/Box.cpp +++ b/idlib/bv/Box.cpp @@ -26,8 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" + +#include "idlib/bv/Box.h" idBox box_zero( vec3_zero, vec3_zero, mat3_identity ); diff --git a/idlib/bv/Box.h b/idlib/bv/Box.h index 2d8e3cb..fd5f70d 100644 --- a/idlib/bv/Box.h +++ b/idlib/bv/Box.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __BV_BOX_H__ #define __BV_BOX_H__ +#include "idlib/math/Vector.h" +#include "idlib/bv/Bounds.h" + /* =============================================================================== diff --git a/idlib/bv/Frustum.cpp b/idlib/bv/Frustum.cpp index 5a76bab..c50641a 100644 --- a/idlib/bv/Frustum.cpp +++ b/idlib/bv/Frustum.cpp @@ -26,8 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/containers/List.h" + +#include "idlib/bv/Frustum.h" //#define FRUSTUM_DEBUG diff --git a/idlib/bv/Frustum.h b/idlib/bv/Frustum.h index 7340368..f7443ed 100644 --- a/idlib/bv/Frustum.h +++ b/idlib/bv/Frustum.h @@ -29,6 +29,11 @@ If you have questions concerning this license or the applicable additional terms #ifndef __BV_FRUSTUM_H__ #define __BV_FRUSTUM_H__ +#include "idlib/geometry/Winding.h" +#include "idlib/math/Vector.h" +#include "idlib/bv/Bounds.h" +#include "idlib/bv/Box.h" + /* =============================================================================== diff --git a/idlib/bv/Sphere.cpp b/idlib/bv/Sphere.cpp index f06d813..335997e 100644 --- a/idlib/bv/Sphere.cpp +++ b/idlib/bv/Sphere.cpp @@ -26,13 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/bv/Sphere.h" idSphere sphere_zero( vec3_zero, 0.0f ); - /* ================ idSphere::PlaneDistance diff --git a/idlib/bv/Sphere.h b/idlib/bv/Sphere.h index a5e2e5f..e4bfeab 100644 --- a/idlib/bv/Sphere.h +++ b/idlib/bv/Sphere.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __BV_SPHERE_H__ #define __BV_SPHERE_H__ +#include "idlib/math/Vector.h" +#include "idlib/math/Plane.h" +#include "idlib/math/Rotation.h" + /* =============================================================================== diff --git a/idlib/containers/HashIndex.cpp b/idlib/containers/HashIndex.cpp index 1bfb38b..53fc291 100644 --- a/idlib/containers/HashIndex.cpp +++ b/idlib/containers/HashIndex.cpp @@ -26,8 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" + +#include "idlib/containers/HashIndex.h" int idHashIndex::INVALID_INDEX[1] = { -1 }; diff --git a/idlib/containers/HashIndex.h b/idlib/containers/HashIndex.h index 6385074..d01c2b8 100644 --- a/idlib/containers/HashIndex.h +++ b/idlib/containers/HashIndex.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __HASHINDEX_H__ #define __HASHINDEX_H__ +#include "idlib/math/Vector.h" +#include "idlib/Str.h" + /* =============================================================================== diff --git a/idlib/containers/HashTable.h b/idlib/containers/HashTable.h index aab3d1a..289b9ab 100644 --- a/idlib/containers/HashTable.h +++ b/idlib/containers/HashTable.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __HASHTABLE_H__ #define __HASHTABLE_H__ +#include "idlib/math/Math.h" +#include "idlib/Str.h" + /* =============================================================================== diff --git a/idlib/containers/Hierarchy.h b/idlib/containers/Hierarchy.h index 79143aa..df1d513 100644 --- a/idlib/containers/Hierarchy.h +++ b/idlib/containers/Hierarchy.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __HIERARCHY_H__ #define __HIERARCHY_H__ +#include "idlib/Lib.h" + /* ============================================================================== diff --git a/idlib/containers/PlaneSet.h b/idlib/containers/PlaneSet.h index bd5912f..c631640 100644 --- a/idlib/containers/PlaneSet.h +++ b/idlib/containers/PlaneSet.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __PLANESET_H__ #define __PLANESET_H__ +#include "idlib/containers/List.h" +#include "idlib/containers/HashIndex.h" +#include "idlib/math/Plane.h" + /* =============================================================================== diff --git a/idlib/containers/StrList.h b/idlib/containers/StrList.h index 1a2916d..8333e16 100644 --- a/idlib/containers/StrList.h +++ b/idlib/containers/StrList.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __STRLIST_H__ #define __STRLIST_H__ +#include "idlib/containers/List.h" +#include "idlib/Str.h" + /* =============================================================================== diff --git a/idlib/containers/StrPool.h b/idlib/containers/StrPool.h index 104bf8c..196493d 100644 --- a/idlib/containers/StrPool.h +++ b/idlib/containers/StrPool.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __STRPOOL_H__ #define __STRPOOL_H__ +#include "idlib/containers/List.h" +#include "idlib/containers/HashIndex.h" + /* =============================================================================== diff --git a/idlib/containers/VectorSet.h b/idlib/containers/VectorSet.h index 81fe625..baba116 100644 --- a/idlib/containers/VectorSet.h +++ b/idlib/containers/VectorSet.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __VECTORSET_H__ #define __VECTORSET_H__ +#include "idlib/containers/List.h" +#include "idlib/containers/HashIndex.h" + /* =============================================================================== diff --git a/idlib/geometry/DrawVert.cpp b/idlib/geometry/DrawVert.cpp index cd14b22..07cce89 100644 --- a/idlib/geometry/DrawVert.cpp +++ b/idlib/geometry/DrawVert.cpp @@ -26,9 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/geometry/DrawVert.h" /* ============= diff --git a/idlib/geometry/DrawVert.h b/idlib/geometry/DrawVert.h index b33c660..d454430 100644 --- a/idlib/geometry/DrawVert.h +++ b/idlib/geometry/DrawVert.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __DRAWVERT_H__ #define __DRAWVERT_H__ +#include "idlib/math/Vector.h" + /* =============================================================================== diff --git a/idlib/geometry/JointTransform.cpp b/idlib/geometry/JointTransform.cpp index fe8badd..3dea0f1 100644 --- a/idlib/geometry/JointTransform.cpp +++ b/idlib/geometry/JointTransform.cpp @@ -26,9 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/geometry/JointTransform.h" /* ============= diff --git a/idlib/geometry/JointTransform.h b/idlib/geometry/JointTransform.h index ceaa1c8..3eaa776 100644 --- a/idlib/geometry/JointTransform.h +++ b/idlib/geometry/JointTransform.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __JOINTTRANSFORM_H__ #define __JOINTTRANSFORM_H__ +#include "idlib/math/Matrix.h" +#include "idlib/math/Quat.h" + /* =============================================================================== diff --git a/idlib/geometry/Surface.cpp b/idlib/geometry/Surface.cpp index d3b19fc..369601b 100644 --- a/idlib/geometry/Surface.cpp +++ b/idlib/geometry/Surface.cpp @@ -26,9 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Pluecker.h" +#include "idlib/geometry/Surface.h" /* ================= diff --git a/idlib/geometry/Surface.h b/idlib/geometry/Surface.h index 847c67e..983bce2 100644 --- a/idlib/geometry/Surface.h +++ b/idlib/geometry/Surface.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SURFACE_H__ #define __SURFACE_H__ +#include "idlib/containers/List.h" +#include "idlib/geometry/DrawVert.h" +#include "idlib/math/Plane.h" + /* =============================================================================== diff --git a/idlib/geometry/Surface_Patch.cpp b/idlib/geometry/Surface_Patch.cpp index 06413d1..6f6f744 100644 --- a/idlib/geometry/Surface_Patch.cpp +++ b/idlib/geometry/Surface_Patch.cpp @@ -26,9 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/geometry/Surface_Patch.h" /* ================= diff --git a/idlib/geometry/Surface_Patch.h b/idlib/geometry/Surface_Patch.h index dae0e5b..e16b906 100644 --- a/idlib/geometry/Surface_Patch.h +++ b/idlib/geometry/Surface_Patch.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SURFACE_PATCH_H__ #define __SURFACE_PATCH_H__ +#include "idlib/geometry/Surface.h" +#include "framework/Common.h" + /* =============================================================================== diff --git a/idlib/geometry/Surface_Polytope.cpp b/idlib/geometry/Surface_Polytope.cpp index 3fc91d6..b80598c 100644 --- a/idlib/geometry/Surface_Polytope.cpp +++ b/idlib/geometry/Surface_Polytope.cpp @@ -26,12 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" + +#include "idlib/geometry/Surface_Polytope.h" #define POLYTOPE_VERTEX_EPSILON 0.1f - /* ==================== idSurface_Polytope::FromPlanes diff --git a/idlib/geometry/Surface_Polytope.h b/idlib/geometry/Surface_Polytope.h index be1336a..ea74dba 100644 --- a/idlib/geometry/Surface_Polytope.h +++ b/idlib/geometry/Surface_Polytope.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SURFACE_POLYTOPE_H__ #define __SURFACE_POLYTOPE_H__ +#include "idlib/geometry/Surface.h" + /* =============================================================================== diff --git a/idlib/geometry/Surface_SweptSpline.cpp b/idlib/geometry/Surface_SweptSpline.cpp index c004ad1..1132aa6 100644 --- a/idlib/geometry/Surface_SweptSpline.cpp +++ b/idlib/geometry/Surface_SweptSpline.cpp @@ -26,9 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/geometry/Surface_SweptSpline.h" /* ==================== diff --git a/idlib/geometry/Surface_SweptSpline.h b/idlib/geometry/Surface_SweptSpline.h index 3ccb131..627a6fa 100644 --- a/idlib/geometry/Surface_SweptSpline.h +++ b/idlib/geometry/Surface_SweptSpline.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SURFACE_SWEPTSPLINE_H__ #define __SURFACE_SWEPTSPLINE_H__ +#include "idlib/geometry/Surface.h" +#include "idlib/math/Curve.h" + /* =============================================================================== diff --git a/idlib/geometry/TraceModel.cpp b/idlib/geometry/TraceModel.cpp index 2bd7d6b..b1a88ff 100644 --- a/idlib/geometry/TraceModel.cpp +++ b/idlib/geometry/TraceModel.cpp @@ -26,11 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop - -#include "TraceModel.h" +#include "sys/platform.h" +#include "framework/Common.h" +#include "idlib/geometry/TraceModel.h" /* ============ diff --git a/idlib/geometry/TraceModel.h b/idlib/geometry/TraceModel.h index bd7ada3..5882648 100644 --- a/idlib/geometry/TraceModel.h +++ b/idlib/geometry/TraceModel.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __TRACEMODEL_H__ #define __TRACEMODEL_H__ +#include "idlib/geometry/Winding.h" +#include "idlib/math/Vector.h" +#include "idlib/bv/Bounds.h" + /* =============================================================================== diff --git a/idlib/geometry/Winding.cpp b/idlib/geometry/Winding.cpp index 09f3454..5f38423 100644 --- a/idlib/geometry/Winding.cpp +++ b/idlib/geometry/Winding.cpp @@ -26,9 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Pluecker.h" +#include "framework/Common.h" +#include "idlib/geometry/Winding.h" //=============================================================== // diff --git a/idlib/geometry/Winding.h b/idlib/geometry/Winding.h index 7636e35..788b6d4 100644 --- a/idlib/geometry/Winding.h +++ b/idlib/geometry/Winding.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __WINDING_H__ #define __WINDING_H__ +#include "idlib/math/Vector.h" +#include "idlib/bv/Bounds.h" + /* =============================================================================== diff --git a/idlib/geometry/Winding2D.cpp b/idlib/geometry/Winding2D.cpp index baa6617..3106d10 100644 --- a/idlib/geometry/Winding2D.cpp +++ b/idlib/geometry/Winding2D.cpp @@ -26,11 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop - -#include "Winding2D.h" +#include "sys/platform.h" +#include "idlib/Lib.h" +#include "framework/Common.h" +#include "idlib/geometry/Winding2D.h" /* ============ diff --git a/idlib/geometry/Winding2D.h b/idlib/geometry/Winding2D.h index 6a27e19..0f32616 100644 --- a/idlib/geometry/Winding2D.h +++ b/idlib/geometry/Winding2D.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __WINDING2D_H__ #define __WINDING2D_H__ +#include "idlib/math/Vector.h" +#include "idlib/math/Plane.h" + /* =============================================================================== diff --git a/idlib/hashing/CRC32.cpp b/idlib/hashing/CRC32.cpp index fd3f3b6..b4b9fd6 100644 --- a/idlib/hashing/CRC32.cpp +++ b/idlib/hashing/CRC32.cpp @@ -1,6 +1,6 @@ +#include "sys/platform.h" -#include "../precompiled.h" -#pragma hdrstop +#include "idlib/hashing/CRC32.h" /* CRC-32 diff --git a/idlib/hashing/MD4.cpp b/idlib/hashing/MD4.cpp index cba08bb..dc76196 100644 --- a/idlib/hashing/MD4.cpp +++ b/idlib/hashing/MD4.cpp @@ -1,6 +1,6 @@ +#include "sys/platform.h" -#include "../precompiled.h" -#pragma hdrstop +#include "idlib/hashing/MD4.h" /* RSA Data Security, Inc., MD4 message-digest algorithm. (RFC1320) diff --git a/idlib/hashing/MD5.cpp b/idlib/hashing/MD5.cpp index 71e4214..f2d503f 100644 --- a/idlib/hashing/MD5.cpp +++ b/idlib/hashing/MD5.cpp @@ -1,6 +1,7 @@ +#include "sys/platform.h" +#include "idlib/Lib.h" -#include "../precompiled.h" -#pragma hdrstop +#include "idlib/hashing/MD5.h" /* MD5 Message Digest Algorithm. (RFC1321) diff --git a/idlib/math/Angles.cpp b/idlib/math/Angles.cpp index f7ee446..6f46357 100644 --- a/idlib/math/Angles.cpp +++ b/idlib/math/Angles.cpp @@ -26,13 +26,16 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop - #include -idAngles ang_zero( 0.0f, 0.0f, 0.0f ); +#include "sys/platform.h" +#include "idlib/math/Quat.h" +#include "idlib/math/Rotation.h" +#include "idlib/Str.h" +#include "idlib/math/Angles.h" + +idAngles ang_zero( 0.0f, 0.0f, 0.0f ); /* ================= diff --git a/idlib/math/Angles.h b/idlib/math/Angles.h index 51c9312..99ed880 100644 --- a/idlib/math/Angles.h +++ b/idlib/math/Angles.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_ANGLES_H__ #define __MATH_ANGLES_H__ +#include "idlib/math/Vector.h" + /* =============================================================================== diff --git a/idlib/math/Complex.cpp b/idlib/math/Complex.cpp index dfb74c4..3c63026 100644 --- a/idlib/math/Complex.cpp +++ b/idlib/math/Complex.cpp @@ -26,8 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" + +#include "idlib/math/Complex.h" idComplex complex_origin( 0.0f, 0.0f ); diff --git a/idlib/math/Complex.h b/idlib/math/Complex.h index d4ef2ee..10919ff 100644 --- a/idlib/math/Complex.h +++ b/idlib/math/Complex.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_COMPLEX_H__ #define __MATH_COMPLEX_H__ +#include "idlib/math/Math.h" + /* =============================================================================== diff --git a/idlib/math/Curve.h b/idlib/math/Curve.h index bbda862..c8f9979 100644 --- a/idlib/math/Curve.h +++ b/idlib/math/Curve.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_CURVE_H__ #define __MATH_CURVE_H__ +#include "idlib/containers/List.h" +#include "idlib/math/Math.h" +#include "idlib/math/Matrix.h" + /* =============================================================================== diff --git a/idlib/math/Extrapolate.h b/idlib/math/Extrapolate.h index 1c8ec1a..f486de9 100644 --- a/idlib/math/Extrapolate.h +++ b/idlib/math/Extrapolate.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_EXTRAPOLATE_H__ #define __MATH_EXTRAPOLATE_H__ +#include "idlib/math/Math.h" + /* ============================================================================================== diff --git a/idlib/math/Interpolate.h b/idlib/math/Interpolate.h index 2659dd8..4ac1805 100644 --- a/idlib/math/Interpolate.h +++ b/idlib/math/Interpolate.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_INTERPOLATE_H__ #define __MATH_INTERPOLATE_H__ +#include "idlib/math/Extrapolate.h" + /* ============================================================================================== diff --git a/idlib/math/Lcp.cpp b/idlib/math/Lcp.cpp index f41dbbc..13ad756 100644 --- a/idlib/math/Lcp.cpp +++ b/idlib/math/Lcp.cpp @@ -26,8 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" + +#include "idlib/math/Lcp.h" static idCVar lcp_showFailures( "lcp_showFailures", "0", CVAR_SYSTEM | CVAR_BOOL, "show LCP solver failures" ); diff --git a/idlib/math/Lcp.h b/idlib/math/Lcp.h index e800fae..b5787ad 100644 --- a/idlib/math/Lcp.h +++ b/idlib/math/Lcp.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_LCP_H__ #define __MATH_LCP_H__ +#include "idlib/math/Matrix.h" +#include "framework/Common.h" +#include "framework/CVarSystem.h" + /* =============================================================================== diff --git a/idlib/math/Math.cpp b/idlib/math/Math.cpp index 3745259..1fdad2d 100644 --- a/idlib/math/Math.cpp +++ b/idlib/math/Math.cpp @@ -26,9 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Math.h" const float idMath::PI = 3.14159265358979323846f; const float idMath::TWO_PI = 2.0f * PI; diff --git a/idlib/math/Math.h b/idlib/math/Math.h index be7ada0..4aa22c6 100644 --- a/idlib/math/Math.h +++ b/idlib/math/Math.h @@ -33,6 +33,7 @@ If you have questions concerning this license or the applicable additional terms // for FLT_MIN #include #endif + /* =============================================================================== diff --git a/idlib/math/Matrix.cpp b/idlib/math/Matrix.cpp index f723ee9..f83e061 100644 --- a/idlib/math/Matrix.cpp +++ b/idlib/math/Matrix.cpp @@ -26,9 +26,16 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/containers/List.h" +#include "idlib/math/Math.h" +#include "idlib/math/Angles.h" +#include "idlib/math/Quat.h" +#include "idlib/math/Rotation.h" +#include "idlib/Str.h" +#include "framework/Common.h" +#include "idlib/math/Matrix.h" //=============================================================== // diff --git a/idlib/math/Matrix.h b/idlib/math/Matrix.h index 71361f3..9b267ea 100644 --- a/idlib/math/Matrix.h +++ b/idlib/math/Matrix.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_MATRIX_H__ #define __MATH_MATRIX_H__ +#include "idlib/math/Vector.h" + /* =============================================================================== diff --git a/idlib/math/Ode.cpp b/idlib/math/Ode.cpp index 1ce6db3..2397adc 100644 --- a/idlib/math/Ode.cpp +++ b/idlib/math/Ode.cpp @@ -26,8 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Math.h" + +#include "idlib/math/Ode.h" //=============================================================== // diff --git a/idlib/math/Plane.cpp b/idlib/math/Plane.cpp index 7336053..fc4a940 100644 --- a/idlib/math/Plane.cpp +++ b/idlib/math/Plane.cpp @@ -26,8 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/Str.h" + +#include "idlib/math/Plane.h" idPlane plane_origin( 0.0f, 0.0f, 0.0f, 0.0f ); diff --git a/idlib/math/Plane.h b/idlib/math/Plane.h index 075687c..d64f35d 100644 --- a/idlib/math/Plane.h +++ b/idlib/math/Plane.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_PLANE_H__ #define __MATH_PLANE_H__ +#include "idlib/math/Vector.h" +#include "idlib/math/Matrix.h" + /* =============================================================================== diff --git a/idlib/math/Pluecker.cpp b/idlib/math/Pluecker.cpp index de91698..ff9294f 100644 --- a/idlib/math/Pluecker.cpp +++ b/idlib/math/Pluecker.cpp @@ -26,8 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Plane.h" +#include "idlib/Str.h" + +#include "idlib/math/Pluecker.h" idPluecker pluecker_origin( 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f ); diff --git a/idlib/math/Pluecker.h b/idlib/math/Pluecker.h index bc8b66b..73a5263 100644 --- a/idlib/math/Pluecker.h +++ b/idlib/math/Pluecker.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_PLUECKER_H__ #define __MATH_PLUECKER_H__ +#include "idlib/math/Vector.h" + /* =============================================================================== diff --git a/idlib/math/Polynomial.cpp b/idlib/math/Polynomial.cpp index d539dd1..7a95542 100644 --- a/idlib/math/Polynomial.cpp +++ b/idlib/math/Polynomial.cpp @@ -26,8 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/Str.h" + +#include "idlib/math/Polynomial.h" const float EPSILON = 1e-6f; diff --git a/idlib/math/Polynomial.h b/idlib/math/Polynomial.h index 2ceac0c..840d098 100644 --- a/idlib/math/Polynomial.h +++ b/idlib/math/Polynomial.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_POLYNOMIAL_H__ #define __MATH_POLYNOMIAL_H__ +#include "idlib/math/Complex.h" +#include "idlib/Heap.h" + /* =============================================================================== diff --git a/idlib/math/Quat.cpp b/idlib/math/Quat.cpp index af2885e..84758dd 100644 --- a/idlib/math/Quat.cpp +++ b/idlib/math/Quat.cpp @@ -26,8 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Angles.h" +#include "idlib/math/Matrix.h" +#include "idlib/math/Rotation.h" +#include "idlib/Str.h" + +#include "idlib/math/Quat.h" /* ===================== diff --git a/idlib/math/Quat.h b/idlib/math/Quat.h index 1bc0360..bdd10ca 100644 --- a/idlib/math/Quat.h +++ b/idlib/math/Quat.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_QUAT_H__ #define __MATH_QUAT_H__ +#include "idlib/math/Vector.h" + /* =============================================================================== diff --git a/idlib/math/Random.h b/idlib/math/Random.h index a908cf0..1640901 100644 --- a/idlib/math/Random.h +++ b/idlib/math/Random.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_RANDOM_H__ #define __MATH_RANDOM_H__ +#include "idlib/math/Math.h" + /* =============================================================================== diff --git a/idlib/math/Rotation.cpp b/idlib/math/Rotation.cpp index 606b8cd..3248a94 100644 --- a/idlib/math/Rotation.cpp +++ b/idlib/math/Rotation.cpp @@ -26,9 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Angles.h" +#include "idlib/math/Quat.h" +#include "idlib/math/Rotation.h" /* ============ diff --git a/idlib/math/Rotation.h b/idlib/math/Rotation.h index 6250643..6972bdf 100644 --- a/idlib/math/Rotation.h +++ b/idlib/math/Rotation.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_ROTATION_H__ #define __MATH_ROTATION_H__ +#include "idlib/math/Matrix.h" + /* =============================================================================== @@ -38,13 +40,7 @@ If you have questions concerning this license or the applicable additional terms =============================================================================== */ - -class idAngles; -class idQuat; -class idMat3; - class idRotation { - friend class idAngles; friend class idQuat; friend class idMat3; diff --git a/idlib/math/Simd.cpp b/idlib/math/Simd.cpp index 75e86ab..b540e44 100644 --- a/idlib/math/Simd.cpp +++ b/idlib/math/Simd.cpp @@ -26,23 +26,36 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#if MACOS_X +#include +#include // this is for sleep() +#include +#include +#include +#endif -#include "Simd_Generic.h" -#include "Simd_MMX.h" -#include "Simd_3DNow.h" -#include "Simd_SSE.h" -#include "Simd_SSE2.h" -#include "Simd_SSE3.h" -#include "Simd_AltiVec.h" +#include "sys/platform.h" +#include "idlib/geometry/DrawVert.h" +#include "idlib/geometry/JointTransform.h" +#include "idlib/math/Simd_Generic.h" +#include "idlib/math/Simd_MMX.h" +#include "idlib/math/Simd_3DNow.h" +#include "idlib/math/Simd_SSE.h" +#include "idlib/math/Simd_SSE2.h" +#include "idlib/math/Simd_SSE3.h" +#include "idlib/math/Simd_AltiVec.h" +#include "idlib/math/Plane.h" +#include "idlib/bv/Bounds.h" +#include "idlib/Lib.h" +#include "framework/Common.h" +#include "renderer/Model.h" +#include "idlib/math/Simd.h" idSIMDProcessor * processor = NULL; // pointer to SIMD processor idSIMDProcessor * generic = NULL; // pointer to generic SIMD implementation idSIMDProcessor * SIMDProcessor = NULL; - /* ================ idSIMD::Init @@ -169,12 +182,6 @@ long saved_ebx = 0; #elif MACOS_X -#include -#include // this is for sleep() -#include -#include -#include - double ticksPerNanosecond; #define TIME_TYPE uint64_t diff --git a/idlib/math/Simd.h b/idlib/math/Simd.h index 2039229..97e4c44 100644 --- a/idlib/math/Simd.h +++ b/idlib/math/Simd.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_SIMD_H__ #define __MATH_SIMD_H__ +#include "sys/sys_public.h" + /* =============================================================================== diff --git a/idlib/math/Simd_3DNow.cpp b/idlib/math/Simd_3DNow.cpp index f64bf79..fc877f9 100644 --- a/idlib/math/Simd_3DNow.cpp +++ b/idlib/math/Simd_3DNow.cpp @@ -26,13 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop - -#include "Simd_Generic.h" -#include "Simd_MMX.h" -#include "Simd_3DNow.h" +#include "sys/platform.h" +#include "idlib/math/Simd_3DNow.h" //=============================================================== // diff --git a/idlib/math/Simd_3DNow.h b/idlib/math/Simd_3DNow.h index 52f5e79..73708fc 100644 --- a/idlib/math/Simd_3DNow.h +++ b/idlib/math/Simd_3DNow.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_SIMD_3DNOW_H__ #define __MATH_SIMD_3DNOW_H__ +#include "idlib/math/Simd_MMX.h" + /* =============================================================================== diff --git a/idlib/math/Simd_AltiVec.cpp b/idlib/math/Simd_AltiVec.cpp index 4b894f3..96ac930 100644 --- a/idlib/math/Simd_AltiVec.cpp +++ b/idlib/math/Simd_AltiVec.cpp @@ -26,15 +26,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ - -#include "../precompiled.h" -#pragma hdrstop - -#include "Simd_Generic.h" -#include "Simd_AltiVec.h" #include #include +#include "sys/platform.h" + +#include "idlib/math/Simd_AltiVec.h" + // Doom3 SIMD Library version 0.5 // Patrick Flanagan (pflanagan@apple.com) // Sanjay Patel (spatel@apple.com) diff --git a/idlib/math/Simd_AltiVec.h b/idlib/math/Simd_AltiVec.h index 351ca6c..903caac 100644 --- a/idlib/math/Simd_AltiVec.h +++ b/idlib/math/Simd_AltiVec.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_SIMD_ALTIVEC_H__ #define __MATH_SIMD_ALTIVEC_H__ +#include "idlib/math/Simd_Generic.h" + /* =============================================================================== diff --git a/idlib/math/Simd_Generic.cpp b/idlib/math/Simd_Generic.cpp index f238a77..f4d0fd5 100644 --- a/idlib/math/Simd_Generic.cpp +++ b/idlib/math/Simd_Generic.cpp @@ -26,11 +26,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop - -#include "Simd_Generic.h" +#include "sys/platform.h" +#include "idlib/geometry/DrawVert.h" +#include "idlib/geometry/JointTransform.h" +#include "idlib/math/Vector.h" +#include "idlib/math/Plane.h" +#include "idlib/math/Matrix.h" +#include "renderer/Model.h" +#include "idlib/math/Simd_Generic.h" //=============================================================== // diff --git a/idlib/math/Simd_Generic.h b/idlib/math/Simd_Generic.h index 6af6b26..a9a4632 100644 --- a/idlib/math/Simd_Generic.h +++ b/idlib/math/Simd_Generic.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_SIMD_GENERIC_H__ #define __MATH_SIMD_GENERIC_H__ +#include "idlib/math/Simd.h" + /* =============================================================================== diff --git a/idlib/math/Simd_MMX.cpp b/idlib/math/Simd_MMX.cpp index 37bb917..806bb18 100644 --- a/idlib/math/Simd_MMX.cpp +++ b/idlib/math/Simd_MMX.cpp @@ -26,12 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop - -#include "Simd_Generic.h" -#include "Simd_MMX.h" +#include "sys/platform.h" +#include "idlib/math/Simd_MMX.h" //=============================================================== // diff --git a/idlib/math/Simd_MMX.h b/idlib/math/Simd_MMX.h index 83fce24..115e6cc 100644 --- a/idlib/math/Simd_MMX.h +++ b/idlib/math/Simd_MMX.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_SIMD_MMX_H__ #define __MATH_SIMD_MMX_H__ +#include "idlib/math/Simd_Generic.h" + /* =============================================================================== diff --git a/idlib/math/Simd_SSE.cpp b/idlib/math/Simd_SSE.cpp index 2cf61a0..e3dbc32 100644 --- a/idlib/math/Simd_SSE.cpp +++ b/idlib/math/Simd_SSE.cpp @@ -26,13 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop - -#include "Simd_Generic.h" -#include "Simd_MMX.h" -#include "Simd_SSE.h" +#include "sys/platform.h" +#include "idlib/geometry/DrawVert.h" +#include "idlib/math/Simd_SSE.h" //=============================================================== // M diff --git a/idlib/math/Simd_SSE.h b/idlib/math/Simd_SSE.h index 906f861..e9deef1 100644 --- a/idlib/math/Simd_SSE.h +++ b/idlib/math/Simd_SSE.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_SIMD_SSE_H__ #define __MATH_SIMD_SSE_H__ +#include "idlib/math/Simd_MMX.h" + /* =============================================================================== diff --git a/idlib/math/Simd_SSE2.cpp b/idlib/math/Simd_SSE2.cpp index 21a69ca..2c4e5b7 100644 --- a/idlib/math/Simd_SSE2.cpp +++ b/idlib/math/Simd_SSE2.cpp @@ -26,14 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop - -#include "Simd_Generic.h" -#include "Simd_MMX.h" -#include "Simd_SSE.h" -#include "Simd_SSE2.h" +#include "sys/platform.h" +#include "idlib/math/Simd_SSE2.h" //=============================================================== // diff --git a/idlib/math/Simd_SSE2.h b/idlib/math/Simd_SSE2.h index 91ff3f4..34992cc 100644 --- a/idlib/math/Simd_SSE2.h +++ b/idlib/math/Simd_SSE2.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_SIMD_SSE2_H__ #define __MATH_SIMD_SSE2_H__ +#include "idlib/math/Simd_SSE.h" + /* =============================================================================== diff --git a/idlib/math/Simd_SSE3.cpp b/idlib/math/Simd_SSE3.cpp index 92533b1..cbcbf42 100644 --- a/idlib/math/Simd_SSE3.cpp +++ b/idlib/math/Simd_SSE3.cpp @@ -26,15 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop - -#include "Simd_Generic.h" -#include "Simd_MMX.h" -#include "Simd_SSE.h" -#include "Simd_SSE2.h" -#include "Simd_SSE3.h" +#include "sys/platform.h" +#include "idlib/math/Simd_SSE3.h" //=============================================================== // diff --git a/idlib/math/Simd_SSE3.h b/idlib/math/Simd_SSE3.h index 3ec8fbb..623574d 100644 --- a/idlib/math/Simd_SSE3.h +++ b/idlib/math/Simd_SSE3.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_SIMD_SSE3_H__ #define __MATH_SIMD_SSE3_H__ +#include "idlib/math/Simd_SSE2.h" + /* =============================================================================== diff --git a/idlib/math/Vector.cpp b/idlib/math/Vector.cpp index 552bed2..a863ec7 100644 --- a/idlib/math/Vector.cpp +++ b/idlib/math/Vector.cpp @@ -26,8 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/math/Angles.h" +#include "idlib/math/Matrix.h" +#include "idlib/Str.h" + +#include "idlib/math/Vector.h" idVec2 vec2_origin( 0.0f, 0.0f ); idVec3 vec3_origin( 0.0f, 0.0f, 0.0f ); @@ -36,7 +40,6 @@ idVec5 vec5_origin( 0.0f, 0.0f, 0.0f, 0.0f, 0.0f ); idVec6 vec6_origin( 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f ); idVec6 vec6_infinity( idMath::INFINITY, idMath::INFINITY, idMath::INFINITY, idMath::INFINITY, idMath::INFINITY, idMath::INFINITY ); - //=============================================================== // // idVec2 diff --git a/idlib/math/Vector.h b/idlib/math/Vector.h index 1590188..d00949f 100644 --- a/idlib/math/Vector.h +++ b/idlib/math/Vector.h @@ -29,6 +29,11 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATH_VECTOR_H__ #define __MATH_VECTOR_H__ +#include "idlib/math/Math.h" +#include "idlib/math/Random.h" +#include "idlib/math/Simd.h" +#include "idlib/Heap.h" + /* =============================================================================== diff --git a/idlib/precompiled.h b/idlib/precompiled.h index 05bb87f..6dde992 100644 --- a/idlib/precompiled.h +++ b/idlib/precompiled.h @@ -37,7 +37,7 @@ If you have questions concerning this license or the applicable additional terms #if defined(_MFC_VER) && !defined(_D3SDK) && !defined(GAME_DLL) #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // prevent auto literal to string conversion -#include "../tools/comafx/StdAfx.h" +#include "tools/comafx/StdAfx.h" #endif #include @@ -66,65 +66,138 @@ If you have questions concerning this license or the applicable additional terms //----------------------------------------------------- // non-portable system services -#include "../sys/platform.h" -#include "../sys/sys_public.h" +#include "sys/platform.h" +#include "sys/sys_public.h" // id lib -#include "../idlib/Lib.h" +#include "idlib/Lib.h" + +// memory management and arrays +#include "idlib/Heap.h" +#include "idlib/containers/List.h" + +// math +#include "idlib/math/Simd.h" +#include "idlib/math/Math.h" +#include "idlib/math/Random.h" +#include "idlib/math/Complex.h" +#include "idlib/math/Vector.h" +#include "idlib/math/Matrix.h" +#include "idlib/math/Angles.h" +#include "idlib/math/Quat.h" +#include "idlib/math/Rotation.h" +#include "idlib/math/Plane.h" +#include "idlib/math/Pluecker.h" +#include "idlib/math/Polynomial.h" +#include "idlib/math/Extrapolate.h" +#include "idlib/math/Interpolate.h" +#include "idlib/math/Curve.h" +#include "idlib/math/Ode.h" +#include "idlib/math/Lcp.h" + +// bounding volumes +#include "idlib/bv/Sphere.h" +#include "idlib/bv/Bounds.h" +#include "idlib/bv/Box.h" +#include "idlib/bv/Frustum.h" + +// geometry +#include "idlib/geometry/DrawVert.h" +#include "idlib/geometry/JointTransform.h" +#include "idlib/geometry/Winding.h" +#include "idlib/geometry/Winding2D.h" +#include "idlib/geometry/Surface.h" +#include "idlib/geometry/Surface_Patch.h" +#include "idlib/geometry/Surface_Polytope.h" +#include "idlib/geometry/Surface_SweptSpline.h" +#include "idlib/geometry/TraceModel.h" + +// text manipulation +#include "idlib/Str.h" +#include "idlib/Token.h" +#include "idlib/Lexer.h" +#include "idlib/Parser.h" +#include "idlib/Base64.h" +#include "idlib/CmdArgs.h" + +// containers +#include "idlib/containers/BTree.h" +#include "idlib/containers/BinSearch.h" +#include "idlib/containers/HashIndex.h" +#include "idlib/containers/HashTable.h" +#include "idlib/containers/StaticList.h" +#include "idlib/containers/LinkList.h" +#include "idlib/containers/Hierarchy.h" +#include "idlib/containers/Queue.h" +#include "idlib/containers/Stack.h" +#include "idlib/containers/StrList.h" +#include "idlib/containers/StrPool.h" +#include "idlib/containers/VectorSet.h" +#include "idlib/containers/PlaneSet.h" + +// hashing +#include "idlib/hashing/CRC32.h" +#include "idlib/hashing/MD4.h" +#include "idlib/hashing/MD5.h" + +// misc +#include "idlib/Dict.h" +#include "idlib/LangDict.h" +#include "idlib/BitMsg.h" +#include "idlib/MapFile.h" +#include "idlib/Timer.h" // framework -#include "../framework/BuildVersion.h" -#include "../framework/Licensee.h" -#include "../framework/CmdSystem.h" -#include "../framework/CVarSystem.h" -#include "../framework/Common.h" -#include "../framework/File.h" -#include "../framework/FileSystem.h" -#include "../framework/UsercmdGen.h" +#include "framework/BuildVersion.h" +#include "framework/Licensee.h" +#include "framework/CmdSystem.h" +#include "framework/CVarSystem.h" +#include "framework/Common.h" +#include "framework/File.h" +#include "framework/FileSystem.h" +#include "framework/UsercmdGen.h" // decls -#include "../framework/DeclManager.h" -#include "../framework/DeclTable.h" -#include "../framework/DeclSkin.h" -#include "../framework/DeclEntityDef.h" -#include "../framework/DeclFX.h" -#include "../framework/DeclParticle.h" -#include "../framework/DeclAF.h" -#include "../framework/DeclPDA.h" +#include "framework/DeclManager.h" +#include "framework/DeclTable.h" +#include "framework/DeclSkin.h" +#include "framework/DeclEntityDef.h" +#include "framework/DeclFX.h" +#include "framework/DeclParticle.h" +#include "framework/DeclAF.h" +#include "framework/DeclPDA.h" // We have expression parsing and evaluation code in multiple places: // materials, sound shaders, and guis. We should unify them. -const int MAX_EXPRESSION_OPS = 4096; -const int MAX_EXPRESSION_REGISTERS = 4096; // renderer -#include "../renderer/qgl.h" -#include "../renderer/Cinematic.h" -#include "../renderer/Material.h" -#include "../renderer/Model.h" -#include "../renderer/ModelManager.h" -#include "../renderer/RenderSystem.h" -#include "../renderer/RenderWorld.h" +#include "renderer/qgl.h" +#include "renderer/Cinematic.h" +#include "renderer/Material.h" +#include "renderer/Model.h" +#include "renderer/ModelManager.h" +#include "renderer/RenderSystem.h" +#include "renderer/RenderWorld.h" // sound engine -#include "../sound/sound.h" +#include "sound/sound.h" // asynchronous networking -#include "../framework/async/NetworkSystem.h" +#include "framework/async/NetworkSystem.h" // user interfaces -#include "../ui/ListGUI.h" -#include "../ui/UserInterface.h" +#include "ui/ListGUI.h" +#include "ui/UserInterface.h" // collision detection system -#include "../cm/CollisionModel.h" +#include "cm/CollisionModel.h" // AAS files and manager -#include "../tools/compilers/aas/AASFile.h" -#include "../tools/compilers/aas/AASFileManager.h" +#include "tools/compilers/aas/AASFile.h" +#include "tools/compilers/aas/AASFileManager.h" // game interface -#include "../framework/Game.h" +#include "framework/Game.h" //----------------------------------------------------- @@ -134,26 +207,26 @@ const int MAX_EXPRESSION_REGISTERS = 4096; #include "Game_local.h" #else -#include "../framework/DemoChecksum.h" +#include "framework/DemoChecksum.h" // framework -#include "../framework/Compressor.h" -#include "../framework/EventLoop.h" -#include "../framework/KeyInput.h" -#include "../framework/EditField.h" -#include "../framework/Console.h" -#include "../framework/DemoFile.h" -#include "../framework/Session.h" +#include "framework/Compressor.h" +#include "framework/EventLoop.h" +#include "framework/KeyInput.h" +#include "framework/EditField.h" +#include "framework/Console.h" +#include "framework/DemoFile.h" +#include "framework/Session.h" // asynchronous networking -#include "../framework/async/AsyncNetwork.h" +#include "framework/async/AsyncNetwork.h" // The editor entry points are always declared, but may just be // stubbed out on non-windows platforms. -#include "../tools/edit_public.h" +#include "tools/edit_public.h" // Compilers for map, model, video etc. processing. -#include "../tools/compilers/compiler_public.h" +#include "tools/compilers/compiler_public.h" #endif /* !GAME_DLL */ diff --git a/renderer/Material.h b/renderer/Material.h index 71ee936..ab450f8 100644 --- a/renderer/Material.h +++ b/renderer/Material.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MATERIAL_H__ #define __MATERIAL_H__ +#include "idlib/containers/List.h" +#include "idlib/Lexer.h" +#include "framework/DeclManager.h" + /* =============================================================================== diff --git a/renderer/Model.h b/renderer/Model.h index da6aa27..79ff89c 100644 --- a/renderer/Model.h +++ b/renderer/Model.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MODEL_H__ #define __MODEL_H__ +#include "idlib/bv/Bounds.h" +#include "renderer/Material.h" + /* =============================================================================== diff --git a/renderer/ModelManager.h b/renderer/ModelManager.h index 2b61f43..deb078d 100644 --- a/renderer/ModelManager.h +++ b/renderer/ModelManager.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MODELMANAGER_H__ #define __MODELMANAGER_H__ +#include "framework/Common.h" +#include "renderer/Model.h" + /* =============================================================================== diff --git a/renderer/RenderSystem.h b/renderer/RenderSystem.h index 806734c..79609b5 100644 --- a/renderer/RenderSystem.h +++ b/renderer/RenderSystem.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __RENDERER_H__ #define __RENDERER_H__ +#include "framework/Common.h" +#include "renderer/Model.h" + /* =============================================================================== diff --git a/renderer/RenderWorld.h b/renderer/RenderWorld.h index 8507d29..462774e 100644 --- a/renderer/RenderWorld.h +++ b/renderer/RenderWorld.h @@ -29,6 +29,15 @@ If you have questions concerning this license or the applicable additional terms #ifndef __RENDERWORLD_H__ #define __RENDERWORLD_H__ +#include "idlib/geometry/Winding.h" +#include "idlib/bv/Box.h" +#include "idlib/bv/Frustum.h" +#include "framework/DeclParticle.h" +#include "renderer/Material.h" + +class idDemoFile; +class idRenderModel; + /* =============================================================================== diff --git a/sound/sound.h b/sound/sound.h index 6f670d9..d94e361 100644 --- a/sound/sound.h +++ b/sound/sound.h @@ -29,6 +29,11 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SOUND__ #define __SOUND__ +#include "idlib/math/Vector.h" +#include "framework/DeclManager.h" +#include "framework/DemoFile.h" +#include "renderer/Cinematic.h" + /* =============================================================================== diff --git a/tools/compilers/aas/AASFile.h b/tools/compilers/aas/AASFile.h index d066f6e..9ae001c 100644 --- a/tools/compilers/aas/AASFile.h +++ b/tools/compilers/aas/AASFile.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __AASFILE_H__ #define __AASFILE_H__ +#include "idlib/containers/PlaneSet.h" +#include "idlib/bv/Bounds.h" +#include "idlib/Dict.h" + /* =============================================================================== diff --git a/tools/compilers/aas/AASFileManager.h b/tools/compilers/aas/AASFileManager.h index a3abaf8..eb10a5f 100644 --- a/tools/compilers/aas/AASFileManager.h +++ b/tools/compilers/aas/AASFileManager.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __AASFILEMANAGER_H__ #define __AASFILEMANAGER_H__ +#include "tools/compilers/aas/AASFile.h" + /* =============================================================================== diff --git a/ui/ListGUI.h b/ui/ListGUI.h index 044dfe9..db4f311 100644 --- a/ui/ListGUI.h +++ b/ui/ListGUI.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __LISTGUI_H__ #define __LISTGUI_H__ +#include "idlib/Str.h" + +class idUserInterface; + /* =============================================================================== diff --git a/ui/UserInterface.h b/ui/UserInterface.h index 82aac37..2b5eb0a 100644 --- a/ui/UserInterface.h +++ b/ui/UserInterface.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __USERINTERFACE_H__ #define __USERINTERFACE_H__ +#include "idlib/Dict.h" +#include "ui/ListGUI.h" + /* ===============================================================================