From 736ec20d4d854a0469067ed2f8551e0c43bfe573 Mon Sep 17 00:00:00 2001 From: dhewg Date: Fri, 16 Dec 2011 23:28:29 +0100 Subject: [PATCH] Untangle the epic precompiled.h mess Don't include the lazy precompiled.h everywhere, only what's required for the compilation unit. platform.h needs to be included instead to provide all essential defines and types. All includes use the relative path to the neo or the game specific root. Move all idlib related includes from idlib/Lib.h to precompiled.h. precompiled.h still exists for the MFC stuff in tools/. Add some missing header guards. --- neo/MayaImport/maya_main.cpp | 7 +- neo/MayaImport/maya_main.h | 5 + neo/TypeInfo/TypeInfoGen.cpp | 6 +- neo/TypeInfo/main.cpp | 7 +- neo/cm/CollisionModel.h | 8 + neo/cm/CollisionModel_contacts.cpp | 5 +- neo/cm/CollisionModel_contents.cpp | 5 +- neo/cm/CollisionModel_debug.cpp | 14 +- neo/cm/CollisionModel_files.cpp | 9 +- neo/cm/CollisionModel_load.cpp | 10 +- neo/cm/CollisionModel_local.h | 3 +- neo/cm/CollisionModel_rotate.cpp | 5 +- neo/cm/CollisionModel_trace.cpp | 5 +- neo/cm/CollisionModel_translate.cpp | 7 +- neo/d3xp/AF.cpp | 7 +- neo/d3xp/AF.h | 7 + neo/d3xp/AFEntity.cpp | 12 +- neo/d3xp/AFEntity.h | 4 + neo/d3xp/Actor.cpp | 11 +- neo/d3xp/Actor.h | 4 + neo/d3xp/BrittleFracture.cpp | 8 +- neo/d3xp/BrittleFracture.h | 4 + neo/d3xp/Camera.cpp | 8 +- neo/d3xp/Camera.h | 3 + neo/d3xp/EndLevel.cpp | 5 +- neo/d3xp/EndLevel.h | 7 + neo/d3xp/Entity.cpp | 21 ++- neo/d3xp/Entity.h | 10 ++ neo/d3xp/Fx.cpp | 11 +- neo/d3xp/Fx.h | 4 + neo/d3xp/GameEdit.cpp | 14 +- neo/d3xp/GameEdit.h | 6 + neo/d3xp/Game_local.cpp | 22 ++- neo/d3xp/Game_local.h | 126 ++++--------- neo/d3xp/Game_network.cpp | 10 +- neo/d3xp/Grabber.cpp | 11 +- neo/d3xp/Grabber.h | 9 + neo/d3xp/IK.cpp | 9 +- neo/d3xp/IK.h | 5 + neo/d3xp/Item.cpp | 10 +- neo/d3xp/Item.h | 2 + neo/d3xp/Light.cpp | 9 +- neo/d3xp/Light.h | 3 + neo/d3xp/Misc.cpp | 15 +- neo/d3xp/Misc.h | 3 + neo/d3xp/Moveable.cpp | 10 +- neo/d3xp/Moveable.h | 7 + neo/d3xp/Mover.cpp | 8 +- neo/d3xp/Mover.h | 3 + neo/d3xp/MultiplayerGame.cpp | 14 +- neo/d3xp/MultiplayerGame.h | 6 + neo/d3xp/Player.cpp | 16 +- neo/d3xp/Player.h | 13 ++ neo/d3xp/PlayerIcon.cpp | 8 +- neo/d3xp/PlayerView.cpp | 11 +- neo/d3xp/PlayerView.h | 8 + neo/d3xp/Projectile.cpp | 14 +- neo/d3xp/Projectile.h | 4 + neo/d3xp/Pvs.cpp | 7 +- neo/d3xp/Pvs.h | 4 + neo/d3xp/SecurityCamera.cpp | 21 ++- neo/d3xp/SecurityCamera.h | 2 + neo/d3xp/SmokeParticles.cpp | 8 +- neo/d3xp/SmokeParticles.h | 6 + neo/d3xp/Sound.cpp | 6 +- neo/d3xp/Sound.h | 2 + neo/d3xp/Target.cpp | 21 ++- neo/d3xp/Target.h | 3 + neo/d3xp/Trigger.cpp | 8 +- neo/d3xp/Trigger.h | 3 + neo/d3xp/Weapon.cpp | 15 +- neo/d3xp/Weapon.h | 8 + neo/d3xp/WorldSpawn.cpp | 14 +- neo/d3xp/WorldSpawn.h | 2 + neo/d3xp/ai/AAS.cpp | 7 +- neo/d3xp/ai/AAS.h | 2 + neo/d3xp/ai/AAS_debug.cpp | 11 +- neo/d3xp/ai/AAS_local.h | 5 +- neo/d3xp/ai/AAS_pathing.cpp | 6 +- neo/d3xp/ai/AAS_routing.cpp | 7 +- neo/d3xp/ai/AI.cpp | 13 +- neo/d3xp/ai/AI.h | 9 + neo/d3xp/ai/AI_Vagary.cpp | 9 +- neo/d3xp/ai/AI_events.cpp | 8 +- neo/d3xp/ai/AI_pathing.cpp | 11 +- neo/d3xp/anim/Anim.cpp | 9 +- neo/d3xp/anim/Anim.h | 7 + neo/d3xp/anim/Anim_Blend.cpp | 15 +- neo/d3xp/anim/Anim_Import.cpp | 11 +- neo/d3xp/anim/Anim_Testmodel.cpp | 14 +- neo/d3xp/anim/Anim_Testmodel.h | 4 + neo/d3xp/gamesys/Class.cpp | 15 +- neo/d3xp/gamesys/Class.h | 17 +- neo/d3xp/gamesys/DebugGraph.cpp | 8 +- neo/d3xp/gamesys/DebugGraph.h | 8 + neo/d3xp/gamesys/Event.cpp | 13 +- neo/d3xp/gamesys/Event.h | 9 +- neo/d3xp/gamesys/SaveGame.cpp | 12 +- neo/d3xp/gamesys/SaveGame.h | 7 + neo/d3xp/gamesys/SysCmds.cpp | 19 +- neo/d3xp/gamesys/SysCvar.cpp | 10 +- neo/d3xp/gamesys/SysCvar.h | 2 + neo/d3xp/gamesys/TypeInfo.cpp | 15 +- neo/d3xp/gamesys/TypeInfo.h | 4 + neo/d3xp/physics/Clip.cpp | 8 +- neo/d3xp/physics/Clip.h | 7 +- neo/d3xp/physics/Force.cpp | 5 +- neo/d3xp/physics/Force.h | 2 + neo/d3xp/physics/Force_Constant.cpp | 7 +- neo/d3xp/physics/Force_Constant.h | 2 + neo/d3xp/physics/Force_Drag.cpp | 8 +- neo/d3xp/physics/Force_Drag.h | 2 + neo/d3xp/physics/Force_Field.cpp | 8 +- neo/d3xp/physics/Force_Field.h | 5 + neo/d3xp/physics/Force_Grab.cpp | 12 +- neo/d3xp/physics/Force_Grab.h | 2 + neo/d3xp/physics/Force_Spring.cpp | 6 +- neo/d3xp/physics/Force_Spring.h | 2 + neo/d3xp/physics/Physics.cpp | 6 +- neo/d3xp/physics/Physics.h | 6 + neo/d3xp/physics/Physics_AF.cpp | 12 +- neo/d3xp/physics/Physics_AF.h | 4 + neo/d3xp/physics/Physics_Actor.cpp | 6 +- neo/d3xp/physics/Physics_Actor.h | 2 + neo/d3xp/physics/Physics_Base.cpp | 7 +- neo/d3xp/physics/Physics_Base.h | 3 + neo/d3xp/physics/Physics_Monster.cpp | 7 +- neo/d3xp/physics/Physics_Monster.h | 4 + neo/d3xp/physics/Physics_Parametric.cpp | 6 +- neo/d3xp/physics/Physics_Parametric.h | 5 + neo/d3xp/physics/Physics_Player.cpp | 7 +- neo/d3xp/physics/Physics_Player.h | 2 + neo/d3xp/physics/Physics_RigidBody.cpp | 10 +- neo/d3xp/physics/Physics_RigidBody.h | 4 + neo/d3xp/physics/Physics_Static.cpp | 10 +- neo/d3xp/physics/Physics_Static.h | 2 + neo/d3xp/physics/Physics_StaticMulti.cpp | 10 +- neo/d3xp/physics/Physics_StaticMulti.h | 2 + neo/d3xp/physics/Push.cpp | 11 +- neo/d3xp/physics/Push.h | 7 + neo/d3xp/script/Script_Compiler.cpp | 9 +- neo/d3xp/script/Script_Compiler.h | 4 + neo/d3xp/script/Script_Interpreter.cpp | 8 +- neo/d3xp/script/Script_Interpreter.h | 6 + neo/d3xp/script/Script_Program.cpp | 14 +- neo/d3xp/script/Script_Program.h | 9 +- neo/d3xp/script/Script_Thread.cpp | 9 +- neo/d3xp/script/Script_Thread.h | 4 + neo/framework/CVarSystem.cpp | 8 +- neo/framework/CVarSystem.h | 4 + neo/framework/CmdSystem.cpp | 10 +- neo/framework/CmdSystem.h | 2 + neo/framework/Common.cpp | 24 ++- neo/framework/Common.h | 4 + neo/framework/Compressor.cpp | 5 +- neo/framework/Compressor.h | 2 + neo/framework/Console.cpp | 15 +- neo/framework/Console.h | 2 + neo/framework/DeclAF.cpp | 10 +- neo/framework/DeclAF.h | 7 + neo/framework/DeclEntityDef.cpp | 6 +- neo/framework/DeclEntityDef.h | 3 + neo/framework/DeclFX.cpp | 7 +- neo/framework/DeclFX.h | 5 + neo/framework/DeclManager.cpp | 20 ++- neo/framework/DeclManager.h | 4 + neo/framework/DeclPDA.cpp | 7 +- neo/framework/DeclPDA.h | 3 + neo/framework/DeclParticle.cpp | 8 +- neo/framework/DeclParticle.h | 8 + neo/framework/DeclSkin.cpp | 4 +- neo/framework/DeclSkin.h | 4 + neo/framework/DeclTable.cpp | 5 +- neo/framework/DeclTable.h | 3 + neo/framework/DemoFile.cpp | 8 +- neo/framework/DemoFile.h | 5 + neo/framework/EditField.cpp | 8 +- neo/framework/EditField.h | 2 + neo/framework/EventLoop.cpp | 7 +- neo/framework/EventLoop.h | 4 + neo/framework/File.cpp | 7 +- neo/framework/File.h | 3 + neo/framework/FileSystem.cpp | 15 +- neo/framework/FileSystem.h | 3 + neo/framework/Game.h | 14 ++ neo/framework/KeyInput.cpp | 11 +- neo/framework/KeyInput.h | 4 + neo/framework/Session.cpp | 12 +- neo/framework/Session.h | 7 + neo/framework/Session_local.h | 10 ++ neo/framework/Session_menu.cpp | 12 +- neo/framework/Unzip.cpp | 7 +- neo/framework/UsercmdGen.cpp | 10 +- neo/framework/async/AsyncClient.cpp | 14 +- neo/framework/async/AsyncClient.h | 6 + neo/framework/async/AsyncNetwork.cpp | 10 +- neo/framework/async/AsyncNetwork.h | 12 +- neo/framework/async/AsyncServer.cpp | 10 +- neo/framework/async/AsyncServer.h | 2 + neo/framework/async/MsgChannel.cpp | 7 +- neo/framework/async/MsgChannel.h | 3 + neo/framework/async/NetworkSystem.cpp | 7 +- neo/framework/async/NetworkSystem.h | 1 + neo/framework/async/ServerScan.cpp | 12 +- neo/framework/async/ServerScan.h | 2 + neo/game/AF.cpp | 7 +- neo/game/AF.h | 7 + neo/game/AFEntity.cpp | 11 +- neo/game/AFEntity.h | 4 + neo/game/Actor.cpp | 11 +- neo/game/Actor.h | 4 + neo/game/BrittleFracture.cpp | 8 +- neo/game/BrittleFracture.h | 4 + neo/game/Camera.cpp | 8 +- neo/game/Camera.h | 3 + neo/game/EndLevel.cpp | 5 +- neo/game/EndLevel.h | 7 + neo/game/Entity.cpp | 21 ++- neo/game/Entity.h | 10 ++ neo/game/Fx.cpp | 11 +- neo/game/Fx.h | 4 + neo/game/GameEdit.cpp | 14 +- neo/game/GameEdit.h | 6 + neo/game/Game_local.cpp | 22 ++- neo/game/Game_local.h | 135 +++++--------- neo/game/Game_network.cpp | 10 +- neo/game/IK.cpp | 9 +- neo/game/IK.h | 5 + neo/game/Item.cpp | 10 +- neo/game/Item.h | 2 + neo/game/Light.cpp | 9 +- neo/game/Light.h | 3 + neo/game/Misc.cpp | 15 +- neo/game/Misc.h | 3 + neo/game/Moveable.cpp | 8 +- neo/game/Moveable.h | 7 + neo/game/Mover.cpp | 8 +- neo/game/Mover.h | 3 + neo/game/MultiplayerGame.cpp | 13 +- neo/game/MultiplayerGame.h | 6 + neo/game/Player.cpp | 16 +- neo/game/Player.h | 12 ++ neo/game/PlayerIcon.cpp | 7 +- neo/game/PlayerView.cpp | 11 +- neo/game/PlayerView.h | 8 + neo/game/Projectile.cpp | 13 +- neo/game/Projectile.h | 4 + neo/game/Pvs.cpp | 7 +- neo/game/Pvs.h | 4 + neo/game/SecurityCamera.cpp | 21 ++- neo/game/SecurityCamera.h | 2 + neo/game/SmokeParticles.cpp | 7 +- neo/game/SmokeParticles.h | 6 + neo/game/Sound.cpp | 6 +- neo/game/Sound.h | 2 + neo/game/Target.cpp | 21 ++- neo/game/Target.h | 3 + neo/game/Trigger.cpp | 8 +- neo/game/Trigger.h | 3 + neo/game/Weapon.cpp | 14 +- neo/game/Weapon.h | 5 + neo/game/WorldSpawn.cpp | 14 +- neo/game/WorldSpawn.h | 2 + neo/game/ai/AAS.cpp | 7 +- neo/game/ai/AAS.h | 2 + neo/game/ai/AAS_debug.cpp | 11 +- neo/game/ai/AAS_local.h | 5 +- neo/game/ai/AAS_pathing.cpp | 6 +- neo/game/ai/AAS_routing.cpp | 7 +- neo/game/ai/AI.cpp | 10 +- neo/game/ai/AI.h | 7 + neo/game/ai/AI_Vagary.cpp | 9 +- neo/game/ai/AI_events.cpp | 8 +- neo/game/ai/AI_pathing.cpp | 11 +- neo/game/anim/Anim.cpp | 9 +- neo/game/anim/Anim.h | 7 + neo/game/anim/Anim_Blend.cpp | 15 +- neo/game/anim/Anim_Import.cpp | 11 +- neo/game/anim/Anim_Testmodel.cpp | 14 +- neo/game/anim/Anim_Testmodel.h | 4 + neo/game/gamesys/Class.cpp | 15 +- neo/game/gamesys/Class.h | 17 +- neo/game/gamesys/DebugGraph.cpp | 8 +- neo/game/gamesys/DebugGraph.h | 8 + neo/game/gamesys/Event.cpp | 13 +- neo/game/gamesys/Event.h | 9 +- neo/game/gamesys/SaveGame.cpp | 12 +- neo/game/gamesys/SaveGame.h | 7 + neo/game/gamesys/SysCmds.cpp | 19 +- neo/game/gamesys/SysCvar.cpp | 10 +- neo/game/gamesys/SysCvar.h | 2 + neo/game/gamesys/TypeInfo.cpp | 15 +- neo/game/gamesys/TypeInfo.h | 4 + neo/game/physics/Clip.cpp | 8 +- neo/game/physics/Clip.h | 7 +- neo/game/physics/Force.cpp | 5 +- neo/game/physics/Force.h | 2 + neo/game/physics/Force_Constant.cpp | 7 +- neo/game/physics/Force_Constant.h | 2 + neo/game/physics/Force_Drag.cpp | 8 +- neo/game/physics/Force_Drag.h | 2 + neo/game/physics/Force_Field.cpp | 8 +- neo/game/physics/Force_Field.h | 5 + neo/game/physics/Force_Spring.cpp | 6 +- neo/game/physics/Force_Spring.h | 2 + neo/game/physics/Physics.cpp | 6 +- neo/game/physics/Physics.h | 6 + neo/game/physics/Physics_AF.cpp | 12 +- neo/game/physics/Physics_AF.h | 4 + neo/game/physics/Physics_Actor.cpp | 6 +- neo/game/physics/Physics_Actor.h | 2 + neo/game/physics/Physics_Base.cpp | 7 +- neo/game/physics/Physics_Base.h | 3 + neo/game/physics/Physics_Monster.cpp | 7 +- neo/game/physics/Physics_Monster.h | 4 + neo/game/physics/Physics_Parametric.cpp | 6 +- neo/game/physics/Physics_Parametric.h | 5 + neo/game/physics/Physics_Player.cpp | 7 +- neo/game/physics/Physics_Player.h | 2 + neo/game/physics/Physics_RigidBody.cpp | 10 +- neo/game/physics/Physics_RigidBody.h | 4 + neo/game/physics/Physics_Static.cpp | 10 +- neo/game/physics/Physics_Static.h | 2 + neo/game/physics/Physics_StaticMulti.cpp | 10 +- neo/game/physics/Physics_StaticMulti.h | 2 + neo/game/physics/Push.cpp | 11 +- neo/game/physics/Push.h | 7 + neo/game/script/Script_Compiler.cpp | 9 +- neo/game/script/Script_Compiler.h | 4 + neo/game/script/Script_Interpreter.cpp | 8 +- neo/game/script/Script_Interpreter.h | 6 + neo/game/script/Script_Program.cpp | 14 +- neo/game/script/Script_Program.h | 9 +- neo/game/script/Script_Thread.cpp | 9 +- neo/game/script/Script_Thread.h | 4 + neo/idlib/Base64.cpp | 5 +- neo/idlib/Base64.h | 2 + neo/idlib/BitMsg.cpp | 4 +- neo/idlib/BitMsg.h | 4 + neo/idlib/CmdArgs.cpp | 8 +- neo/idlib/Dict.cpp | 8 +- neo/idlib/Dict.h | 6 + neo/idlib/Heap.cpp | 6 +- neo/idlib/Heap.h | 3 + neo/idlib/LangDict.cpp | 6 +- neo/idlib/LangDict.h | 4 + neo/idlib/Lexer.cpp | 8 +- neo/idlib/Lexer.h | 2 + neo/idlib/Lib.cpp | 12 +- neo/idlib/Lib.h | 89 +-------- neo/idlib/MapFile.cpp | 6 +- neo/idlib/MapFile.h | 4 + neo/idlib/Parser.cpp | 7 +- neo/idlib/Parser.h | 3 + neo/idlib/Str.cpp | 8 +- neo/idlib/Str.h | 2 + neo/idlib/Timer.cpp | 8 +- neo/idlib/Timer.h | 4 + neo/idlib/Token.cpp | 5 +- neo/idlib/Token.h | 2 + neo/idlib/bv/Bounds.cpp | 5 +- neo/idlib/bv/Bounds.h | 4 + neo/idlib/bv/Box.cpp | 5 +- neo/idlib/bv/Box.h | 3 + neo/idlib/bv/Frustum.cpp | 6 +- neo/idlib/bv/Frustum.h | 5 + neo/idlib/bv/Sphere.cpp | 5 +- neo/idlib/bv/Sphere.h | 4 + neo/idlib/containers/HashIndex.cpp | 5 +- neo/idlib/containers/HashIndex.h | 3 + neo/idlib/containers/HashTable.h | 3 + neo/idlib/containers/Hierarchy.h | 2 + neo/idlib/containers/PlaneSet.h | 4 + neo/idlib/containers/StrList.h | 3 + neo/idlib/containers/StrPool.h | 3 + neo/idlib/containers/VectorSet.h | 3 + neo/idlib/geometry/DrawVert.cpp | 4 +- neo/idlib/geometry/DrawVert.h | 2 + neo/idlib/geometry/JointTransform.cpp | 4 +- neo/idlib/geometry/JointTransform.h | 3 + neo/idlib/geometry/Surface.cpp | 5 +- neo/idlib/geometry/Surface.h | 4 + neo/idlib/geometry/Surface_Patch.cpp | 4 +- neo/idlib/geometry/Surface_Patch.h | 3 + neo/idlib/geometry/Surface_Polytope.cpp | 6 +- neo/idlib/geometry/Surface_Polytope.h | 2 + neo/idlib/geometry/Surface_SweptSpline.cpp | 4 +- neo/idlib/geometry/Surface_SweptSpline.h | 3 + neo/idlib/geometry/TraceModel.cpp | 7 +- neo/idlib/geometry/TraceModel.h | 4 + neo/idlib/geometry/Winding.cpp | 6 +- neo/idlib/geometry/Winding.h | 3 + neo/idlib/geometry/Winding2D.cpp | 8 +- neo/idlib/geometry/Winding2D.h | 3 + neo/idlib/hashing/CRC32.cpp | 4 +- neo/idlib/hashing/MD4.cpp | 4 +- neo/idlib/hashing/MD5.cpp | 5 +- neo/idlib/math/Angles.cpp | 11 +- neo/idlib/math/Angles.h | 2 + neo/idlib/math/Complex.cpp | 5 +- neo/idlib/math/Complex.h | 2 + neo/idlib/math/Curve.h | 4 + neo/idlib/math/Extrapolate.h | 2 + neo/idlib/math/Interpolate.h | 2 + neo/idlib/math/Lcp.cpp | 5 +- neo/idlib/math/Lcp.h | 4 + neo/idlib/math/Math.cpp | 4 +- neo/idlib/math/Math.h | 1 + neo/idlib/math/Matrix.cpp | 11 +- neo/idlib/math/Matrix.h | 2 + neo/idlib/math/Ode.cpp | 6 +- neo/idlib/math/Plane.cpp | 6 +- neo/idlib/math/Plane.h | 3 + neo/idlib/math/Pluecker.cpp | 7 +- neo/idlib/math/Pluecker.h | 2 + neo/idlib/math/Polynomial.cpp | 6 +- neo/idlib/math/Polynomial.h | 3 + neo/idlib/math/Quat.cpp | 9 +- neo/idlib/math/Quat.h | 2 + neo/idlib/math/Random.h | 2 + neo/idlib/math/Rotation.cpp | 6 +- neo/idlib/math/Rotation.h | 8 +- neo/idlib/math/Simd.cpp | 39 ++-- neo/idlib/math/Simd.h | 2 + neo/idlib/math/Simd_3DNow.cpp | 8 +- neo/idlib/math/Simd_3DNow.h | 2 + neo/idlib/math/Simd_AltiVec.cpp | 10 +- neo/idlib/math/Simd_AltiVec.h | 2 + neo/idlib/math/Simd_Generic.cpp | 12 +- neo/idlib/math/Simd_Generic.h | 2 + neo/idlib/math/Simd_MMX.cpp | 7 +- neo/idlib/math/Simd_MMX.h | 2 + neo/idlib/math/Simd_SSE.cpp | 9 +- neo/idlib/math/Simd_SSE.h | 2 + neo/idlib/math/Simd_SSE2.cpp | 9 +- neo/idlib/math/Simd_SSE2.h | 2 + neo/idlib/math/Simd_SSE3.cpp | 10 +- neo/idlib/math/Simd_SSE3.h | 2 + neo/idlib/math/Vector.cpp | 9 +- neo/idlib/math/Vector.h | 5 + neo/idlib/precompiled.h | 169 +++++++++++++----- neo/renderer/Cinematic.cpp | 9 +- neo/renderer/GuiModel.cpp | 9 +- neo/renderer/GuiModel.h | 5 + neo/renderer/Image.h | 10 ++ neo/renderer/Image_files.cpp | 7 +- neo/renderer/Image_init.cpp | 8 +- neo/renderer/Image_load.cpp | 7 +- neo/renderer/Image_process.cpp | 7 +- neo/renderer/Image_program.cpp | 16 +- neo/renderer/Interaction.cpp | 8 +- neo/renderer/Interaction.h | 4 + neo/renderer/Material.cpp | 11 +- neo/renderer/Material.h | 4 + neo/renderer/MegaTexture.cpp | 8 +- neo/renderer/MegaTexture.h | 7 + neo/renderer/Model.cpp | 17 +- neo/renderer/Model.h | 3 + neo/renderer/ModelDecal.cpp | 8 +- neo/renderer/ModelDecal.h | 3 + neo/renderer/ModelManager.cpp | 12 +- neo/renderer/ModelManager.h | 3 + neo/renderer/ModelOverlay.cpp | 9 +- neo/renderer/Model_ase.cpp | 7 +- neo/renderer/Model_ase.h | 3 + neo/renderer/Model_beam.cpp | 7 +- neo/renderer/Model_liquid.cpp | 7 +- neo/renderer/Model_local.h | 3 + neo/renderer/Model_lwo.cpp | 6 +- neo/renderer/Model_ma.cpp | 9 +- neo/renderer/Model_ma.h | 4 + neo/renderer/Model_md3.cpp | 10 +- neo/renderer/Model_md5.cpp | 9 +- neo/renderer/Model_prt.cpp | 7 +- neo/renderer/Model_sprite.cpp | 8 +- neo/renderer/RenderEntity.cpp | 5 +- neo/renderer/RenderSystem.cpp | 14 +- neo/renderer/RenderSystem.h | 3 + neo/renderer/RenderSystem_init.cpp | 17 +- neo/renderer/RenderWorld.cpp | 9 +- neo/renderer/RenderWorld.h | 9 + neo/renderer/RenderWorld_demo.cpp | 16 +- neo/renderer/RenderWorld_load.cpp | 9 +- neo/renderer/RenderWorld_local.h | 7 +- neo/renderer/RenderWorld_portals.cpp | 8 +- neo/renderer/VertexCache.cpp | 8 +- neo/renderer/VertexCache.h | 3 + neo/renderer/draw_arb.cpp | 7 +- neo/renderer/draw_arb2.cpp | 6 +- neo/renderer/draw_common.cpp | 7 +- neo/renderer/draw_exp.cpp | 7 +- neo/renderer/draw_nv10.cpp | 6 +- neo/renderer/draw_nv20.cpp | 6 +- neo/renderer/draw_r200.cpp | 7 +- neo/renderer/tr_backend.cpp | 7 +- neo/renderer/tr_deform.cpp | 7 +- neo/renderer/tr_font.cpp | 6 +- neo/renderer/tr_guisurf.cpp | 8 +- neo/renderer/tr_light.cpp | 11 +- neo/renderer/tr_lightrun.cpp | 9 +- neo/renderer/tr_local.h | 20 +-- neo/renderer/tr_main.cpp | 10 +- neo/renderer/tr_orderIndexes.cpp | 5 +- neo/renderer/tr_polytope.cpp | 5 +- neo/renderer/tr_render.cpp | 7 +- neo/renderer/tr_rendertools.cpp | 10 +- neo/renderer/tr_shadowbounds.cpp | 7 +- neo/renderer/tr_stencilshadow.cpp | 5 +- neo/renderer/tr_subview.cpp | 6 +- neo/renderer/tr_trace.cpp | 5 +- neo/renderer/tr_trisurf.cpp | 6 +- neo/renderer/tr_turboshadow.cpp | 6 +- neo/sound/efxlib.h | 7 +- neo/sound/snd_cache.cpp | 8 +- neo/sound/snd_decoder.cpp | 8 +- neo/sound/snd_efxfile.cpp | 6 +- neo/sound/snd_emitter.cpp | 8 +- neo/sound/snd_local.h | 5 +- neo/sound/snd_shader.cpp | 7 +- neo/sound/snd_system.cpp | 5 +- neo/sound/snd_wavefile.cpp | 6 +- neo/sound/snd_world.cpp | 8 +- neo/sound/sound.h | 5 + neo/sys/linux/dedicated.cpp | 10 +- neo/sys/linux/glimp.cpp | 10 +- neo/sys/linux/input.cpp | 9 +- neo/sys/linux/local.h | 7 +- neo/sys/linux/main.cpp | 12 +- neo/sys/osx/DOOMController.mm | 17 +- neo/sys/osx/PickMonitor.cpp | 3 +- neo/sys/osx/PickMonitor.h | 2 + neo/sys/osx/PreferencesDialog.cpp | 10 +- neo/sys/osx/PreferencesDialog.h | 3 +- neo/sys/osx/macosx_event.mm | 13 +- neo/sys/osx/macosx_glimp.mm | 18 +- neo/sys/osx/macosx_guids.cpp | 5 +- neo/sys/osx/macosx_local.h | 2 +- neo/sys/osx/macosx_misc.mm | 5 +- neo/sys/osx/macosx_sys.h | 2 +- neo/sys/osx/macosx_sys.mm | 18 +- neo/sys/osx/macosx_utils.mm | 10 +- neo/sys/posix/posix_input.cpp | 6 +- neo/sys/posix/posix_main.cpp | 10 +- neo/sys/posix/posix_net.cpp | 7 +- neo/sys/posix/posix_public.h | 2 + neo/sys/posix/posix_signal.cpp | 7 +- neo/sys/posix/posix_threads.cpp | 6 +- neo/sys/stub/openal_stub.cpp | 6 +- neo/sys/stub/stub_gl.cpp | 5 +- neo/sys/stub/sys_stub.cpp | 3 +- neo/sys/stub/util_stub.cpp | 3 +- neo/sys/sys_local.cpp | 7 +- neo/sys/sys_local.h | 3 + neo/sys/win32/rc/CreateResourceIDs.cpp | 2 +- neo/sys/win32/win_cpu.cpp | 6 +- neo/sys/win32/win_gamma.cpp | 7 +- neo/sys/win32/win_glimp.cpp | 16 +- neo/sys/win32/win_input.cpp | 8 +- neo/sys/win32/win_local.h | 20 ++- neo/sys/win32/win_main.cpp | 17 +- neo/sys/win32/win_net.cpp | 9 +- neo/sys/win32/win_qgl.cpp | 8 +- neo/sys/win32/win_shared.cpp | 6 +- neo/sys/win32/win_syscon.cpp | 15 +- neo/sys/win32/win_taskkeyhook.cpp | 11 +- neo/sys/win32/win_wndproc.cpp | 9 +- neo/tools/compilers/aas/AASBuild.cpp | 8 +- neo/tools/compilers/aas/AASBuild_file.cpp | 5 +- neo/tools/compilers/aas/AASBuild_gravity.cpp | 6 +- neo/tools/compilers/aas/AASBuild_ledge.cpp | 5 +- neo/tools/compilers/aas/AASBuild_local.h | 14 +- neo/tools/compilers/aas/AASBuild_merge.cpp | 5 +- neo/tools/compilers/aas/AASCluster.cpp | 9 +- neo/tools/compilers/aas/AASCluster.h | 2 + neo/tools/compilers/aas/AASFile.cpp | 9 +- neo/tools/compilers/aas/AASFile.h | 4 + neo/tools/compilers/aas/AASFileManager.cpp | 7 +- neo/tools/compilers/aas/AASFileManager.h | 2 + neo/tools/compilers/aas/AASFile_local.h | 2 + neo/tools/compilers/aas/AASFile_optimize.cpp | 7 +- neo/tools/compilers/aas/AASFile_sample.cpp | 8 +- neo/tools/compilers/aas/AASReach.cpp | 8 +- neo/tools/compilers/aas/AASReach.h | 3 + neo/tools/compilers/aas/Brush.cpp | 8 +- neo/tools/compilers/aas/Brush.h | 3 + neo/tools/compilers/aas/BrushBSP.cpp | 9 +- neo/tools/compilers/aas/BrushBSP.h | 6 + neo/tools/compilers/compiler_public.h | 2 + neo/tools/compilers/dmap/dmap.cpp | 6 +- neo/tools/compilers/dmap/dmap.h | 6 +- neo/tools/compilers/dmap/facebsp.cpp | 5 +- neo/tools/compilers/dmap/gldraw.cpp | 11 +- neo/tools/compilers/dmap/glfile.cpp | 5 +- neo/tools/compilers/dmap/leakfile.cpp | 5 +- neo/tools/compilers/dmap/map.cpp | 6 +- neo/tools/compilers/dmap/optimize.cpp | 6 +- neo/tools/compilers/dmap/output.cpp | 5 +- neo/tools/compilers/dmap/portals.cpp | 6 +- neo/tools/compilers/dmap/shadowopt3.cpp | 7 +- neo/tools/compilers/dmap/tritjunction.cpp | 6 +- neo/tools/compilers/dmap/tritools.cpp | 5 +- neo/tools/compilers/dmap/ubrush.cpp | 5 +- neo/tools/compilers/dmap/usurface.cpp | 7 +- neo/tools/compilers/renderbump/renderbump.cpp | 11 +- .../compilers/roqvq/NSBitmapImageRep.cpp | 6 +- neo/tools/compilers/roqvq/codec.cpp | 8 +- neo/tools/compilers/roqvq/codec.h | 8 +- neo/tools/compilers/roqvq/gdefs.h | 1 - neo/tools/compilers/roqvq/quaddefs.h | 2 - neo/tools/compilers/roqvq/roq.cpp | 10 +- neo/tools/compilers/roqvq/roq.h | 8 +- neo/tools/compilers/roqvq/roqParam.cpp | 6 +- neo/tools/compilers/roqvq/roqParam.h | 5 +- neo/tools/edit_stub.cpp | 4 +- neo/tools/guied/GEWindowWrapper_stub.cpp | 15 +- neo/ui/BindWindow.cpp | 14 +- neo/ui/BindWindow.h | 3 + neo/ui/ChoiceWindow.cpp | 13 +- neo/ui/ChoiceWindow.h | 4 +- neo/ui/DeviceContext.cpp | 6 +- neo/ui/DeviceContext.h | 4 +- neo/ui/EditWindow.cpp | 16 +- neo/ui/EditWindow.h | 2 +- neo/ui/FieldWindow.cpp | 12 +- neo/ui/FieldWindow.h | 3 +- neo/ui/GameBearShootWindow.cpp | 15 +- neo/ui/GameBearShootWindow.h | 2 + neo/ui/GameBustOutWindow.cpp | 16 +- neo/ui/GameBustOutWindow.h | 2 + neo/ui/GameSSDWindow.cpp | 15 +- neo/ui/GameSSDWindow.h | 2 + neo/ui/GameWindow.cpp | 11 +- neo/ui/GameWindow.h | 2 + neo/ui/GuiScript.cpp | 15 +- neo/ui/GuiScript.h | 4 +- neo/ui/ListGUI.cpp | 8 +- neo/ui/ListGUI.h | 4 + neo/ui/ListGUILocal.h | 3 + neo/ui/ListWindow.cpp | 17 +- neo/ui/ListWindow.h | 4 + neo/ui/MarkerWindow.cpp | 15 +- neo/ui/MarkerWindow.h | 3 + neo/ui/Rectangle.h | 4 + neo/ui/RegExp.cpp | 13 +- neo/ui/RenderWindow.cpp | 13 +- neo/ui/RenderWindow.h | 5 + neo/ui/SimpleWindow.cpp | 12 +- neo/ui/SimpleWindow.h | 2 + neo/ui/SliderWindow.cpp | 12 +- neo/ui/SliderWindow.h | 2 + neo/ui/UserInterface.cpp | 14 +- neo/ui/UserInterface.h | 3 + neo/ui/UserInterfaceLocal.h | 2 + neo/ui/Window.cpp | 41 +++-- neo/ui/Window.h | 16 +- neo/ui/Winvar.cpp | 9 +- neo/ui/Winvar.h | 3 +- 657 files changed, 3452 insertions(+), 1834 deletions(-) diff --git a/neo/MayaImport/maya_main.cpp b/neo/MayaImport/maya_main.cpp index 3a089c14..d3d2488b 100644 --- a/neo/MayaImport/maya_main.cpp +++ b/neo/MayaImport/maya_main.cpp @@ -26,13 +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 "Maya5.0/maya.h" //#include "Maya6.0/maya.h" // must also change include directory in project from "MayaImport\Maya4.5\include" to "MayaImport\Maya6.0\include" (requires MSDev 7.1) -#include "exporter.h" -#include "maya_main.h" +#include "MayaImport/exporter.h" +#include "MayaImport/maya_main.h" idStr errorMessage; bool initialized = false; diff --git a/neo/MayaImport/maya_main.h b/neo/MayaImport/maya_main.h index 9f641709..03a3cf65 100644 --- a/neo/MayaImport/maya_main.h +++ b/neo/MayaImport/maya_main.h @@ -29,6 +29,11 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MAYA_MAIN_H__ #define __MAYA_MAIN_H__ +#include "framework/FileSystem.h" + +class idCommon; +class idSys; + /* ============================================================== diff --git a/neo/TypeInfo/TypeInfoGen.cpp b/neo/TypeInfo/TypeInfoGen.cpp index cacf2610..626a8ad5 100644 --- a/neo/TypeInfo/TypeInfoGen.cpp +++ b/neo/TypeInfo/TypeInfoGen.cpp @@ -25,10 +25,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "TypeInfoGen.h" +#include "sys/platform.h" + +#include "TypeInfo/TypeInfoGen.h" #define TYPE_INFO_GEN_VERSION "1.0" diff --git a/neo/TypeInfo/main.cpp b/neo/TypeInfo/main.cpp index a48093b1..c8251ae2 100644 --- a/neo/TypeInfo/main.cpp +++ b/neo/TypeInfo/main.cpp @@ -26,11 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#include "../sys/sys_local.h" -#pragma hdrstop +#include "sys/platform.h" +#include "sys/sys_local.h" -#include "TypeInfoGen.h" +#include "TypeInfo/TypeInfoGen.h" idSession * session = NULL; idDeclManager * declManager = NULL; diff --git a/neo/cm/CollisionModel.h b/neo/cm/CollisionModel.h index 57561f15..edb03659 100644 --- a/neo/cm/CollisionModel.h +++ b/neo/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/neo/cm/CollisionModel_contacts.cpp b/neo/cm/CollisionModel_contacts.cpp index 761d0331..7e7c8a39 100644 --- a/neo/cm/CollisionModel_contacts.cpp +++ b/neo/cm/CollisionModel_contacts.cpp @@ -34,10 +34,9 @@ If you have questions concerning this license or the applicable additional terms =============================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" -#include "CollisionModel_local.h" +#include "cm/CollisionModel_local.h" /* =============================================================================== diff --git a/neo/cm/CollisionModel_contents.cpp b/neo/cm/CollisionModel_contents.cpp index b61afbf6..6fe3c721 100644 --- a/neo/cm/CollisionModel_contents.cpp +++ b/neo/cm/CollisionModel_contents.cpp @@ -34,10 +34,9 @@ If you have questions concerning this license or the applicable additional terms =============================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" -#include "CollisionModel_local.h" +#include "cm/CollisionModel_local.h" /* =============================================================================== diff --git a/neo/cm/CollisionModel_debug.cpp b/neo/cm/CollisionModel_debug.cpp index 754ecc31..1160abfc 100644 --- a/neo/cm/CollisionModel_debug.cpp +++ b/neo/cm/CollisionModel_debug.cpp @@ -34,11 +34,15 @@ If you have questions concerning this license or the applicable additional terms =============================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "CollisionModel_local.h" +#include "sys/platform.h" +#include "idlib/Timer.h" +#include "framework/Common.h" +#include "framework/Session.h" +#include "renderer/Material.h" +#include "renderer/RenderWorld.h" +#include "sys/sys_public.h" +#include "cm/CollisionModel_local.h" /* =============================================================================== @@ -362,8 +366,6 @@ static int num_rotation = 0; static idVec3 start; static idVec3 *testend; -#include "../sys/sys_public.h" - void idCollisionModelManagerLocal::DebugOutput( const idVec3 &origin ) { int i, k, t; char buf[128]; diff --git a/neo/cm/CollisionModel_files.cpp b/neo/cm/CollisionModel_files.cpp index e8de061c..367cca83 100644 --- a/neo/cm/CollisionModel_files.cpp +++ b/neo/cm/CollisionModel_files.cpp @@ -34,16 +34,17 @@ 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 "renderer/Material.h" +#include "renderer/RenderWorld.h" -#include "CollisionModel_local.h" +#include "cm/CollisionModel_local.h" #define CM_FILE_EXT "cm" #define CM_FILEID "CM" #define CM_FILEVERSION "1.00" - /* =============================================================================== diff --git a/neo/cm/CollisionModel_load.cpp b/neo/cm/CollisionModel_load.cpp index 16bd13eb..851b21d3 100644 --- a/neo/cm/CollisionModel_load.cpp +++ b/neo/cm/CollisionModel_load.cpp @@ -45,11 +45,13 @@ If you have questions concerning this license or the applicable additional terms =============================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "CollisionModel_local.h" +#include "sys/platform.h" +#include "idlib/Timer.h" +#include "renderer/Model.h" +#include "renderer/ModelManager.h" +#include "renderer/RenderWorld.h" +#include "cm/CollisionModel_local.h" idCollisionModelManagerLocal collisionModelManagerLocal; idCollisionModelManager * collisionModelManager = &collisionModelManagerLocal; diff --git a/neo/cm/CollisionModel_local.h b/neo/cm/CollisionModel_local.h index 83609745..055e4e2a 100644 --- a/neo/cm/CollisionModel_local.h +++ b/neo/cm/CollisionModel_local.h @@ -34,7 +34,8 @@ If you have questions concerning this license or the applicable additional terms =============================================================================== */ -#include "CollisionModel.h" +#include "idlib/math/Pluecker.h" +#include "cm/CollisionModel.h" #define MIN_NODE_SIZE 64.0f #define MAX_NODE_POLYGONS 128 diff --git a/neo/cm/CollisionModel_rotate.cpp b/neo/cm/CollisionModel_rotate.cpp index 46aafb77..355234d0 100644 --- a/neo/cm/CollisionModel_rotate.cpp +++ b/neo/cm/CollisionModel_rotate.cpp @@ -34,10 +34,9 @@ If you have questions concerning this license or the applicable additional terms =============================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" -#include "CollisionModel_local.h" +#include "cm/CollisionModel_local.h" /* =============================================================================== diff --git a/neo/cm/CollisionModel_trace.cpp b/neo/cm/CollisionModel_trace.cpp index 60c52883..bee03fed 100644 --- a/neo/cm/CollisionModel_trace.cpp +++ b/neo/cm/CollisionModel_trace.cpp @@ -34,10 +34,9 @@ If you have questions concerning this license or the applicable additional terms =============================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" -#include "CollisionModel_local.h" +#include "cm/CollisionModel_local.h" /* =============================================================================== diff --git a/neo/cm/CollisionModel_translate.cpp b/neo/cm/CollisionModel_translate.cpp index 4c504a7a..1ff6d66d 100644 --- a/neo/cm/CollisionModel_translate.cpp +++ b/neo/cm/CollisionModel_translate.cpp @@ -34,10 +34,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/Session.h" +#include "renderer/RenderWorld.h" -#include "CollisionModel_local.h" +#include "cm/CollisionModel_local.h" /* =============================================================================== diff --git a/neo/d3xp/AF.cpp b/neo/d3xp/AF.cpp index 526c8cfd..e527b14e 100644 --- a/neo/d3xp/AF.cpp +++ b/neo/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/neo/d3xp/AF.h b/neo/d3xp/AF.h index 63807073..79e3751b 100644 --- a/neo/d3xp/AF.h +++ b/neo/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/neo/d3xp/AFEntity.cpp b/neo/d3xp/AFEntity.cpp index f730640f..2ebb5132 100644 --- a/neo/d3xp/AFEntity.cpp +++ b/neo/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/neo/d3xp/AFEntity.h b/neo/d3xp/AFEntity.h index 37391898..a63dda9a 100644 --- a/neo/d3xp/AFEntity.h +++ b/neo/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/neo/d3xp/Actor.cpp b/neo/d3xp/Actor.cpp index d4638c62..39cec391 100644 --- a/neo/d3xp/Actor.cpp +++ b/neo/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/neo/d3xp/Actor.h b/neo/d3xp/Actor.h index 4af60068..5ecef15c 100644 --- a/neo/d3xp/Actor.h +++ b/neo/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/neo/d3xp/BrittleFracture.cpp b/neo/d3xp/BrittleFracture.cpp index 665a623b..75e13492 100644 --- a/neo/d3xp/BrittleFracture.cpp +++ b/neo/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/neo/d3xp/BrittleFracture.h b/neo/d3xp/BrittleFracture.h index 18d704b7..0ccc1b0c 100644 --- a/neo/d3xp/BrittleFracture.h +++ b/neo/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/neo/d3xp/Camera.cpp b/neo/d3xp/Camera.cpp index 55eaafd6..dedba94f 100644 --- a/neo/d3xp/Camera.cpp +++ b/neo/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/neo/d3xp/Camera.h b/neo/d3xp/Camera.h index 3d6016e8..ee5f5f53 100644 --- a/neo/d3xp/Camera.h +++ b/neo/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/neo/d3xp/EndLevel.cpp b/neo/d3xp/EndLevel.cpp index 21f1ec9f..3dd4cd5c 100644 --- a/neo/d3xp/EndLevel.cpp +++ b/neo/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/neo/d3xp/EndLevel.h b/neo/d3xp/EndLevel.h index b2d6b046..2d830856 100644 --- a/neo/d3xp/EndLevel.h +++ b/neo/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/neo/d3xp/Entity.cpp b/neo/d3xp/Entity.cpp index 15b3953a..9fb6f24e 100644 --- a/neo/d3xp/Entity.cpp +++ b/neo/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/neo/d3xp/Entity.h b/neo/d3xp/Entity.h index 0fe5fb7e..4413c303 100644 --- a/neo/d3xp/Entity.h +++ b/neo/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/neo/d3xp/Fx.cpp b/neo/d3xp/Fx.cpp index a537b08c..d61fdf60 100644 --- a/neo/d3xp/Fx.cpp +++ b/neo/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/neo/d3xp/Fx.h b/neo/d3xp/Fx.h index f546d418..bb992254 100644 --- a/neo/d3xp/Fx.h +++ b/neo/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/neo/d3xp/GameEdit.cpp b/neo/d3xp/GameEdit.cpp index a5be11e2..0c637bdb 100644 --- a/neo/d3xp/GameEdit.cpp +++ b/neo/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/neo/d3xp/GameEdit.h b/neo/d3xp/GameEdit.h index 4e63f67e..bbc31ce5 100644 --- a/neo/d3xp/GameEdit.h +++ b/neo/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/neo/d3xp/Game_local.cpp b/neo/d3xp/Game_local.cpp index 97b6b4a3..0ad84419 100644 --- a/neo/d3xp/Game_local.cpp +++ b/neo/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/neo/d3xp/Game_local.h b/neo/d3xp/Game_local.h index 2ace524e..cb229cd9 100644 --- a/neo/d3xp/Game_local.h +++ b/neo/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/neo/d3xp/Game_network.cpp b/neo/d3xp/Game_network.cpp index ca979d8e..ae53fadd 100644 --- a/neo/d3xp/Game_network.cpp +++ b/neo/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/neo/d3xp/Grabber.cpp b/neo/d3xp/Grabber.cpp index 34b80678..9aa3a311 100644 --- a/neo/d3xp/Grabber.cpp +++ b/neo/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/neo/d3xp/Grabber.h b/neo/d3xp/Grabber.h index 1b14fae8..e5b2933c 100644 --- a/neo/d3xp/Grabber.h +++ b/neo/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/neo/d3xp/IK.cpp b/neo/d3xp/IK.cpp index 740accb5..6bd54d6b 100644 --- a/neo/d3xp/IK.cpp +++ b/neo/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/neo/d3xp/IK.h b/neo/d3xp/IK.h index 2e71b813..a2a9f837 100644 --- a/neo/d3xp/IK.h +++ b/neo/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/neo/d3xp/Item.cpp b/neo/d3xp/Item.cpp index 34713c17..87d0eeae 100644 --- a/neo/d3xp/Item.cpp +++ b/neo/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/neo/d3xp/Item.h b/neo/d3xp/Item.h index 8d6c7153..d02b7b26 100644 --- a/neo/d3xp/Item.h +++ b/neo/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/neo/d3xp/Light.cpp b/neo/d3xp/Light.cpp index 05cfb24e..7bbb149e 100644 --- a/neo/d3xp/Light.cpp +++ b/neo/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/neo/d3xp/Light.h b/neo/d3xp/Light.h index 123c8f2f..851bf02f 100644 --- a/neo/d3xp/Light.h +++ b/neo/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/neo/d3xp/Misc.cpp b/neo/d3xp/Misc.cpp index cce92cd8..55cf6790 100644 --- a/neo/d3xp/Misc.cpp +++ b/neo/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/neo/d3xp/Misc.h b/neo/d3xp/Misc.h index 4b51aa89..a3254096 100644 --- a/neo/d3xp/Misc.h +++ b/neo/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/neo/d3xp/Moveable.cpp b/neo/d3xp/Moveable.cpp index e2bdd1fb..2ab494ec 100644 --- a/neo/d3xp/Moveable.cpp +++ b/neo/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/neo/d3xp/Moveable.h b/neo/d3xp/Moveable.h index b8e0ba2c..53f27514 100644 --- a/neo/d3xp/Moveable.h +++ b/neo/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/neo/d3xp/Mover.cpp b/neo/d3xp/Mover.cpp index a2414bb9..4e4160fb 100644 --- a/neo/d3xp/Mover.cpp +++ b/neo/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/neo/d3xp/Mover.h b/neo/d3xp/Mover.h index 784c9eba..dc660da1 100644 --- a/neo/d3xp/Mover.h +++ b/neo/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/neo/d3xp/MultiplayerGame.cpp b/neo/d3xp/MultiplayerGame.cpp index ae43af66..c199ff30 100644 --- a/neo/d3xp/MultiplayerGame.cpp +++ b/neo/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/neo/d3xp/MultiplayerGame.h b/neo/d3xp/MultiplayerGame.h index 718b1ddd..100f9878 100644 --- a/neo/d3xp/MultiplayerGame.h +++ b/neo/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/neo/d3xp/Player.cpp b/neo/d3xp/Player.cpp index 411ddaf5..f53b09f0 100644 --- a/neo/d3xp/Player.cpp +++ b/neo/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/neo/d3xp/Player.h b/neo/d3xp/Player.h index d4697135..aadf8550 100644 --- a/neo/d3xp/Player.h +++ b/neo/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/neo/d3xp/PlayerIcon.cpp b/neo/d3xp/PlayerIcon.cpp index cb9828d9..3fd58efa 100644 --- a/neo/d3xp/PlayerIcon.cpp +++ b/neo/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/neo/d3xp/PlayerView.cpp b/neo/d3xp/PlayerView.cpp index 4dfd258a..00a5d21c 100644 --- a/neo/d3xp/PlayerView.cpp +++ b/neo/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/neo/d3xp/PlayerView.h b/neo/d3xp/PlayerView.h index 4971d794..502abb87 100644 --- a/neo/d3xp/PlayerView.h +++ b/neo/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/neo/d3xp/Projectile.cpp b/neo/d3xp/Projectile.cpp index 101706f3..4b7bbfec 100644 --- a/neo/d3xp/Projectile.cpp +++ b/neo/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/neo/d3xp/Projectile.h b/neo/d3xp/Projectile.h index 1b0784f5..ed2433a0 100644 --- a/neo/d3xp/Projectile.h +++ b/neo/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/neo/d3xp/Pvs.cpp b/neo/d3xp/Pvs.cpp index 95649822..7aabc78e 100644 --- a/neo/d3xp/Pvs.cpp +++ b/neo/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/neo/d3xp/Pvs.h b/neo/d3xp/Pvs.h index 17a5f4af..64251ddf 100644 --- a/neo/d3xp/Pvs.h +++ b/neo/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/neo/d3xp/SecurityCamera.cpp b/neo/d3xp/SecurityCamera.cpp index 44df1aab..c16405ac 100644 --- a/neo/d3xp/SecurityCamera.cpp +++ b/neo/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/neo/d3xp/SecurityCamera.h b/neo/d3xp/SecurityCamera.h index 02600df6..6e54dfd1 100644 --- a/neo/d3xp/SecurityCamera.h +++ b/neo/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/neo/d3xp/SmokeParticles.cpp b/neo/d3xp/SmokeParticles.cpp index 8eafa859..710baecf 100644 --- a/neo/d3xp/SmokeParticles.cpp +++ b/neo/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/neo/d3xp/SmokeParticles.h b/neo/d3xp/SmokeParticles.h index f0b4b458..0f2700ce 100644 --- a/neo/d3xp/SmokeParticles.h +++ b/neo/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/neo/d3xp/Sound.cpp b/neo/d3xp/Sound.cpp index 949324dc..d5a1f3e5 100644 --- a/neo/d3xp/Sound.cpp +++ b/neo/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/neo/d3xp/Sound.h b/neo/d3xp/Sound.h index 55d84973..7992f22e 100644 --- a/neo/d3xp/Sound.h +++ b/neo/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/neo/d3xp/Target.cpp b/neo/d3xp/Target.cpp index e07a49f1..c33878a9 100644 --- a/neo/d3xp/Target.cpp +++ b/neo/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/neo/d3xp/Target.h b/neo/d3xp/Target.h index 96ef1c89..9c2c0a80 100644 --- a/neo/d3xp/Target.h +++ b/neo/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/neo/d3xp/Trigger.cpp b/neo/d3xp/Trigger.cpp index b7b2881a..c3943440 100644 --- a/neo/d3xp/Trigger.cpp +++ b/neo/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/neo/d3xp/Trigger.h b/neo/d3xp/Trigger.h index fe6d7421..7e4e348a 100644 --- a/neo/d3xp/Trigger.h +++ b/neo/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/neo/d3xp/Weapon.cpp b/neo/d3xp/Weapon.cpp index 196c373f..c820ba17 100644 --- a/neo/d3xp/Weapon.cpp +++ b/neo/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/neo/d3xp/Weapon.h b/neo/d3xp/Weapon.h index f3ff8217..8e7a1d0e 100644 --- a/neo/d3xp/Weapon.h +++ b/neo/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/neo/d3xp/WorldSpawn.cpp b/neo/d3xp/WorldSpawn.cpp index 9e2ce5d3..1f97aad9 100644 --- a/neo/d3xp/WorldSpawn.cpp +++ b/neo/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/neo/d3xp/WorldSpawn.h b/neo/d3xp/WorldSpawn.h index bf882439..b8bb4e02 100644 --- a/neo/d3xp/WorldSpawn.h +++ b/neo/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/neo/d3xp/ai/AAS.cpp b/neo/d3xp/ai/AAS.cpp index 9fd1ac88..10ab9c25 100644 --- a/neo/d3xp/ai/AAS.cpp +++ b/neo/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/neo/d3xp/ai/AAS.h b/neo/d3xp/ai/AAS.h index 8f272b46..08ab9c09 100644 --- a/neo/d3xp/ai/AAS.h +++ b/neo/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/neo/d3xp/ai/AAS_debug.cpp b/neo/d3xp/ai/AAS_debug.cpp index b3b4175c..ad9d8c6c 100644 --- a/neo/d3xp/ai/AAS_debug.cpp +++ b/neo/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/neo/d3xp/ai/AAS_local.h b/neo/d3xp/ai/AAS_local.h index 5b9af242..6d32c2ed 100644 --- a/neo/d3xp/ai/AAS_local.h +++ b/neo/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/neo/d3xp/ai/AAS_pathing.cpp b/neo/d3xp/ai/AAS_pathing.cpp index a47929fb..916b5b6f 100644 --- a/neo/d3xp/ai/AAS_pathing.cpp +++ b/neo/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/neo/d3xp/ai/AAS_routing.cpp b/neo/d3xp/ai/AAS_routing.cpp index 2dbf2540..e82ca4eb 100644 --- a/neo/d3xp/ai/AAS_routing.cpp +++ b/neo/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/neo/d3xp/ai/AI.cpp b/neo/d3xp/ai/AI.cpp index 2c6c1a22..1353689c 100644 --- a/neo/d3xp/ai/AI.cpp +++ b/neo/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/neo/d3xp/ai/AI.h b/neo/d3xp/ai/AI.h index 8b337ad8..7264869a 100644 --- a/neo/d3xp/ai/AI.h +++ b/neo/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/neo/d3xp/ai/AI_Vagary.cpp b/neo/d3xp/ai/AI_Vagary.cpp index 24c7a861..6d8463b4 100644 --- a/neo/d3xp/ai/AI_Vagary.cpp +++ b/neo/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/neo/d3xp/ai/AI_events.cpp b/neo/d3xp/ai/AI_events.cpp index f4c4af22..15bbced2 100644 --- a/neo/d3xp/ai/AI_events.cpp +++ b/neo/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/neo/d3xp/ai/AI_pathing.cpp b/neo/d3xp/ai/AI_pathing.cpp index 3dafa622..4b043dc5 100644 --- a/neo/d3xp/ai/AI_pathing.cpp +++ b/neo/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/neo/d3xp/anim/Anim.cpp b/neo/d3xp/anim/Anim.cpp index 1dc2a949..a9f6252d 100644 --- a/neo/d3xp/anim/Anim.cpp +++ b/neo/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/neo/d3xp/anim/Anim.h b/neo/d3xp/anim/Anim.h index e3ae912f..b37b2096 100644 --- a/neo/d3xp/anim/Anim.h +++ b/neo/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/neo/d3xp/anim/Anim_Blend.cpp b/neo/d3xp/anim/Anim_Blend.cpp index 781fe707..842d00f8 100644 --- a/neo/d3xp/anim/Anim_Blend.cpp +++ b/neo/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/neo/d3xp/anim/Anim_Import.cpp b/neo/d3xp/anim/Anim_Import.cpp index 49dee842..65fa3bef 100644 --- a/neo/d3xp/anim/Anim_Import.cpp +++ b/neo/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/neo/d3xp/anim/Anim_Testmodel.cpp b/neo/d3xp/anim/Anim_Testmodel.cpp index 2fdc723a..d4cbc4cc 100644 --- a/neo/d3xp/anim/Anim_Testmodel.cpp +++ b/neo/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/neo/d3xp/anim/Anim_Testmodel.h b/neo/d3xp/anim/Anim_Testmodel.h index e63a7c49..398b7b59 100644 --- a/neo/d3xp/anim/Anim_Testmodel.h +++ b/neo/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/neo/d3xp/gamesys/Class.cpp b/neo/d3xp/gamesys/Class.cpp index 5df57aed..c5e8c6e0 100644 --- a/neo/d3xp/gamesys/Class.cpp +++ b/neo/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/neo/d3xp/gamesys/Class.h b/neo/d3xp/gamesys/Class.h index 853d1f94..99040feb 100644 --- a/neo/d3xp/gamesys/Class.h +++ b/neo/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/neo/d3xp/gamesys/DebugGraph.cpp b/neo/d3xp/gamesys/DebugGraph.cpp index f79c6274..4f98662f 100644 --- a/neo/d3xp/gamesys/DebugGraph.cpp +++ b/neo/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/neo/d3xp/gamesys/DebugGraph.h b/neo/d3xp/gamesys/DebugGraph.h index 0729d498..17602480 100644 --- a/neo/d3xp/gamesys/DebugGraph.h +++ b/neo/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/neo/d3xp/gamesys/Event.cpp b/neo/d3xp/gamesys/Event.cpp index b06ff5eb..8b5b4747 100644 --- a/neo/d3xp/gamesys/Event.cpp +++ b/neo/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/neo/d3xp/gamesys/Event.h b/neo/d3xp/gamesys/Event.h index 71061093..178fc270 100644 --- a/neo/d3xp/gamesys/Event.h +++ b/neo/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/neo/d3xp/gamesys/SaveGame.cpp b/neo/d3xp/gamesys/SaveGame.cpp index 2f6a3c33..2dd04a66 100644 --- a/neo/d3xp/gamesys/SaveGame.cpp +++ b/neo/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/neo/d3xp/gamesys/SaveGame.h b/neo/d3xp/gamesys/SaveGame.h index 7b3be8e6..4b0927f4 100644 --- a/neo/d3xp/gamesys/SaveGame.h +++ b/neo/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/neo/d3xp/gamesys/SysCmds.cpp b/neo/d3xp/gamesys/SysCmds.cpp index b31be994..5ee3a7da 100644 --- a/neo/d3xp/gamesys/SysCmds.cpp +++ b/neo/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/neo/d3xp/gamesys/SysCvar.cpp b/neo/d3xp/gamesys/SysCvar.cpp index b3846f93..1032a8c7 100644 --- a/neo/d3xp/gamesys/SysCvar.cpp +++ b/neo/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/neo/d3xp/gamesys/SysCvar.h b/neo/d3xp/gamesys/SysCvar.h index b4c07160..37ddbb69 100644 --- a/neo/d3xp/gamesys/SysCvar.h +++ b/neo/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/neo/d3xp/gamesys/TypeInfo.cpp b/neo/d3xp/gamesys/TypeInfo.cpp index 9e711923..6ed9b640 100644 --- a/neo/d3xp/gamesys/TypeInfo.cpp +++ b/neo/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/neo/d3xp/gamesys/TypeInfo.h b/neo/d3xp/gamesys/TypeInfo.h index cd47bfda..b9efa2db 100644 --- a/neo/d3xp/gamesys/TypeInfo.h +++ b/neo/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/neo/d3xp/physics/Clip.cpp b/neo/d3xp/physics/Clip.cpp index 07d47e07..c82ca84d 100644 --- a/neo/d3xp/physics/Clip.cpp +++ b/neo/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/neo/d3xp/physics/Clip.h b/neo/d3xp/physics/Clip.h index 1d79c84a..e6f0c205 100644 --- a/neo/d3xp/physics/Clip.h +++ b/neo/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/neo/d3xp/physics/Force.cpp b/neo/d3xp/physics/Force.cpp index a835a555..874bdd04 100644 --- a/neo/d3xp/physics/Force.cpp +++ b/neo/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/neo/d3xp/physics/Force.h b/neo/d3xp/physics/Force.h index ff6f4481..582225e6 100644 --- a/neo/d3xp/physics/Force.h +++ b/neo/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/neo/d3xp/physics/Force_Constant.cpp b/neo/d3xp/physics/Force_Constant.cpp index 2b15096c..d62bc348 100644 --- a/neo/d3xp/physics/Force_Constant.cpp +++ b/neo/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/neo/d3xp/physics/Force_Constant.h b/neo/d3xp/physics/Force_Constant.h index 0466b3a0..e62df35c 100644 --- a/neo/d3xp/physics/Force_Constant.h +++ b/neo/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/neo/d3xp/physics/Force_Drag.cpp b/neo/d3xp/physics/Force_Drag.cpp index ee41c7f7..f8682a11 100644 --- a/neo/d3xp/physics/Force_Drag.cpp +++ b/neo/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/neo/d3xp/physics/Force_Drag.h b/neo/d3xp/physics/Force_Drag.h index 97465ae3..4010845b 100644 --- a/neo/d3xp/physics/Force_Drag.h +++ b/neo/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/neo/d3xp/physics/Force_Field.cpp b/neo/d3xp/physics/Force_Field.cpp index 8db70222..8c02b120 100644 --- a/neo/d3xp/physics/Force_Field.cpp +++ b/neo/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/neo/d3xp/physics/Force_Field.h b/neo/d3xp/physics/Force_Field.h index e3bfc837..ea963ac1 100644 --- a/neo/d3xp/physics/Force_Field.h +++ b/neo/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/neo/d3xp/physics/Force_Grab.cpp b/neo/d3xp/physics/Force_Grab.cpp index d538f1ae..7e7c4ba2 100644 --- a/neo/d3xp/physics/Force_Grab.cpp +++ b/neo/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/neo/d3xp/physics/Force_Grab.h b/neo/d3xp/physics/Force_Grab.h index b06ab4df..b3b7df7e 100644 --- a/neo/d3xp/physics/Force_Grab.h +++ b/neo/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/neo/d3xp/physics/Force_Spring.cpp b/neo/d3xp/physics/Force_Spring.cpp index 93a6d19b..c805b7a9 100644 --- a/neo/d3xp/physics/Force_Spring.cpp +++ b/neo/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/neo/d3xp/physics/Force_Spring.h b/neo/d3xp/physics/Force_Spring.h index 06db7063..2a890b2c 100644 --- a/neo/d3xp/physics/Force_Spring.h +++ b/neo/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/neo/d3xp/physics/Physics.cpp b/neo/d3xp/physics/Physics.cpp index bb487047..86e35d46 100644 --- a/neo/d3xp/physics/Physics.cpp +++ b/neo/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/neo/d3xp/physics/Physics.h b/neo/d3xp/physics/Physics.h index 3d70adb9..545c6ee2 100644 --- a/neo/d3xp/physics/Physics.h +++ b/neo/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/neo/d3xp/physics/Physics_AF.cpp b/neo/d3xp/physics/Physics_AF.cpp index d994571d..965d95e1 100644 --- a/neo/d3xp/physics/Physics_AF.cpp +++ b/neo/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/neo/d3xp/physics/Physics_AF.h b/neo/d3xp/physics/Physics_AF.h index 4d712b1f..90b57c96 100644 --- a/neo/d3xp/physics/Physics_AF.h +++ b/neo/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/neo/d3xp/physics/Physics_Actor.cpp b/neo/d3xp/physics/Physics_Actor.cpp index 52372725..85a45a7f 100644 --- a/neo/d3xp/physics/Physics_Actor.cpp +++ b/neo/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/neo/d3xp/physics/Physics_Actor.h b/neo/d3xp/physics/Physics_Actor.h index 0e4fec1a..e50ae17e 100644 --- a/neo/d3xp/physics/Physics_Actor.h +++ b/neo/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/neo/d3xp/physics/Physics_Base.cpp b/neo/d3xp/physics/Physics_Base.cpp index ee421c77..41b455b5 100644 --- a/neo/d3xp/physics/Physics_Base.cpp +++ b/neo/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/neo/d3xp/physics/Physics_Base.h b/neo/d3xp/physics/Physics_Base.h index a0ac05b1..0d739342 100644 --- a/neo/d3xp/physics/Physics_Base.h +++ b/neo/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/neo/d3xp/physics/Physics_Monster.cpp b/neo/d3xp/physics/Physics_Monster.cpp index c5b919c2..1e48b7f9 100644 --- a/neo/d3xp/physics/Physics_Monster.cpp +++ b/neo/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/neo/d3xp/physics/Physics_Monster.h b/neo/d3xp/physics/Physics_Monster.h index 54923242..0df59dd8 100644 --- a/neo/d3xp/physics/Physics_Monster.h +++ b/neo/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/neo/d3xp/physics/Physics_Parametric.cpp b/neo/d3xp/physics/Physics_Parametric.cpp index 2208b94d..c502ba53 100644 --- a/neo/d3xp/physics/Physics_Parametric.cpp +++ b/neo/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/neo/d3xp/physics/Physics_Parametric.h b/neo/d3xp/physics/Physics_Parametric.h index 3cbd6a5c..ad4745b1 100644 --- a/neo/d3xp/physics/Physics_Parametric.h +++ b/neo/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/neo/d3xp/physics/Physics_Player.cpp b/neo/d3xp/physics/Physics_Player.cpp index f7a2d1ec..6a74c5e4 100644 --- a/neo/d3xp/physics/Physics_Player.cpp +++ b/neo/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/neo/d3xp/physics/Physics_Player.h b/neo/d3xp/physics/Physics_Player.h index f3aa8521..40d52e7e 100644 --- a/neo/d3xp/physics/Physics_Player.h +++ b/neo/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/neo/d3xp/physics/Physics_RigidBody.cpp b/neo/d3xp/physics/Physics_RigidBody.cpp index aaefd041..8d0436f2 100644 --- a/neo/d3xp/physics/Physics_RigidBody.cpp +++ b/neo/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/neo/d3xp/physics/Physics_RigidBody.h b/neo/d3xp/physics/Physics_RigidBody.h index 1e9874d1..d211ebea 100644 --- a/neo/d3xp/physics/Physics_RigidBody.h +++ b/neo/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/neo/d3xp/physics/Physics_Static.cpp b/neo/d3xp/physics/Physics_Static.cpp index 4ff07e2c..cf9f0cfb 100644 --- a/neo/d3xp/physics/Physics_Static.cpp +++ b/neo/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/neo/d3xp/physics/Physics_Static.h b/neo/d3xp/physics/Physics_Static.h index e8002e15..bb589513 100644 --- a/neo/d3xp/physics/Physics_Static.h +++ b/neo/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/neo/d3xp/physics/Physics_StaticMulti.cpp b/neo/d3xp/physics/Physics_StaticMulti.cpp index df2c293e..287d901c 100644 --- a/neo/d3xp/physics/Physics_StaticMulti.cpp +++ b/neo/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/neo/d3xp/physics/Physics_StaticMulti.h b/neo/d3xp/physics/Physics_StaticMulti.h index a6055f92..0cd94ed2 100644 --- a/neo/d3xp/physics/Physics_StaticMulti.h +++ b/neo/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/neo/d3xp/physics/Push.cpp b/neo/d3xp/physics/Push.cpp index 44c4220a..0b986130 100644 --- a/neo/d3xp/physics/Push.cpp +++ b/neo/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/neo/d3xp/physics/Push.h b/neo/d3xp/physics/Push.h index b122d016..0cb7406a 100644 --- a/neo/d3xp/physics/Push.h +++ b/neo/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/neo/d3xp/script/Script_Compiler.cpp b/neo/d3xp/script/Script_Compiler.cpp index 2e777127..abb35e36 100644 --- a/neo/d3xp/script/Script_Compiler.cpp +++ b/neo/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/neo/d3xp/script/Script_Compiler.h b/neo/d3xp/script/Script_Compiler.h index fdcfe427..be9fb68d 100644 --- a/neo/d3xp/script/Script_Compiler.h +++ b/neo/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/neo/d3xp/script/Script_Interpreter.cpp b/neo/d3xp/script/Script_Interpreter.cpp index 3ffa5ab3..c8e0cc45 100644 --- a/neo/d3xp/script/Script_Interpreter.cpp +++ b/neo/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/neo/d3xp/script/Script_Interpreter.h b/neo/d3xp/script/Script_Interpreter.h index b8525710..e7ec0f64 100644 --- a/neo/d3xp/script/Script_Interpreter.h +++ b/neo/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/neo/d3xp/script/Script_Program.cpp b/neo/d3xp/script/Script_Program.cpp index 465c58b0..bfcd719e 100644 --- a/neo/d3xp/script/Script_Program.cpp +++ b/neo/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/neo/d3xp/script/Script_Program.h b/neo/d3xp/script/Script_Program.h index be9094e7..ca0d7a8c 100644 --- a/neo/d3xp/script/Script_Program.h +++ b/neo/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/neo/d3xp/script/Script_Thread.cpp b/neo/d3xp/script/Script_Thread.cpp index fc0c0717..cb826331 100644 --- a/neo/d3xp/script/Script_Thread.cpp +++ b/neo/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/neo/d3xp/script/Script_Thread.h b/neo/d3xp/script/Script_Thread.h index 7f1a743f..7d776438 100644 --- a/neo/d3xp/script/Script_Thread.h +++ b/neo/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/neo/framework/CVarSystem.cpp b/neo/framework/CVarSystem.cpp index 686ec69e..413e3d5d 100644 --- a/neo/framework/CVarSystem.cpp +++ b/neo/framework/CVarSystem.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 "framework/async/AsyncNetwork.h" +#include "framework/Common.h" +#include "framework/Session.h" + +#include "framework/CVarSystem.h" idCVar * idCVar::staticVars = NULL; diff --git a/neo/framework/CVarSystem.h b/neo/framework/CVarSystem.h index baa5fd38..1f1bd310 100644 --- a/neo/framework/CVarSystem.h +++ b/neo/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/neo/framework/CmdSystem.cpp b/neo/framework/CmdSystem.cpp index 5fd076db..bdbc612e 100644 --- a/neo/framework/CmdSystem.cpp +++ b/neo/framework/CmdSystem.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 "idlib/containers/StrList.h" +#include "framework/Common.h" +#include "framework/FileSystem.h" +#include "framework/DeclManager.h" +#include "framework/Session.h" + +#include "framework/CmdSystem.h" /* =============================================================================== diff --git a/neo/framework/CmdSystem.h b/neo/framework/CmdSystem.h index ffbc4f03..9563d079 100644 --- a/neo/framework/CmdSystem.h +++ b/neo/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/neo/framework/Common.cpp b/neo/framework/Common.cpp index f43a63c2..72ee8fe5 100644 --- a/neo/framework/Common.cpp +++ b/neo/framework/Common.cpp @@ -26,10 +26,28 @@ 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/HashTable.h" +#include "idlib/LangDict.h" +#include "idlib/MapFile.h" +#include "cm/CollisionModel.h" +#include "framework/async/AsyncNetwork.h" +#include "framework/async/NetworkSystem.h" +#include "framework/BuildVersion.h" +#include "framework/Licensee.h" +#include "framework/Console.h" +#include "framework/Session.h" +#include "framework/Game.h" +#include "framework/KeyInput.h" +#include "framework/EventLoop.h" +#include "renderer/Image.h" +#include "renderer/Model.h" +#include "renderer/ModelManager.h" +#include "renderer/RenderSystem.h" +#include "tools/compilers/compiler_public.h" +#include "tools/compilers/aas/AASFileManager.h" -#include "../renderer/Image.h" +#include "framework/Common.h" #define MAX_PRINT_MSG_SIZE 4096 #define MAX_WARNING_LIST 256 diff --git a/neo/framework/Common.h b/neo/framework/Common.h index ac0e4c39..70886845 100644 --- a/neo/framework/Common.h +++ b/neo/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/neo/framework/Compressor.cpp b/neo/framework/Compressor.cpp index 682f84a5..afc9154d 100644 --- a/neo/framework/Compressor.cpp +++ b/neo/framework/Compressor.cpp @@ -25,9 +25,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/Compressor.h" /* ================================================================================= diff --git a/neo/framework/Compressor.h b/neo/framework/Compressor.h index 7efe8e42..0bf1a08c 100644 --- a/neo/framework/Compressor.h +++ b/neo/framework/Compressor.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __COMPRESSOR_H__ #define __COMPRESSOR_H__ +#include "framework/File.h" + /* =============================================================================== diff --git a/neo/framework/Console.cpp b/neo/framework/Console.cpp index dcc1cd69..9fd93170 100644 --- a/neo/framework/Console.cpp +++ b/neo/framework/Console.cpp @@ -26,8 +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/math/Vector.h" +#include "framework/async/AsyncNetwork.h" +#include "framework/BuildVersion.h" +#include "framework/CVarSystem.h" +#include "framework/Session.h" +#include "framework/EditField.h" +#include "framework/KeyInput.h" +#include "framework/EventLoop.h" +#include "renderer/RenderSystem.h" +#include "sound/sound.h" + +#include "framework/Console.h" void SCR_DrawTextLeftAlign( float &y, const char *text, ... ) id_attribute((format(printf,2,3))); void SCR_DrawTextRightAlign( float &y, const char *text, ... ) id_attribute((format(printf,2,3))); diff --git a/neo/framework/Console.h b/neo/framework/Console.h index 8f183519..99ef1770 100644 --- a/neo/framework/Console.h +++ b/neo/framework/Console.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __CONSOLE_H__ #define __CONSOLE_H__ +#include "framework/Session.h" + /* =============================================================================== diff --git a/neo/framework/DeclAF.cpp b/neo/framework/DeclAF.cpp index 51abd5fb..2809f29e 100644 --- a/neo/framework/DeclAF.cpp +++ b/neo/framework/DeclAF.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 "idlib/geometry/JointTransform.h" +#include "idlib/geometry/TraceModel.h" +#include "framework/Common.h" +#include "framework/File.h" +#include "renderer/Material.h" + +#include "framework/DeclAF.h" /* =============================================================================== diff --git a/neo/framework/DeclAF.h b/neo/framework/DeclAF.h index 105c05bb..63bc019a 100644 --- a/neo/framework/DeclAF.h +++ b/neo/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/neo/framework/DeclEntityDef.cpp b/neo/framework/DeclEntityDef.cpp index f5689b78..bb071f4d 100644 --- a/neo/framework/DeclEntityDef.cpp +++ b/neo/framework/DeclEntityDef.cpp @@ -26,9 +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 "framework/Game.h" +#include "framework/DeclEntityDef.h" /* ================= diff --git a/neo/framework/DeclEntityDef.h b/neo/framework/DeclEntityDef.h index dd82d0e6..a2cce44e 100644 --- a/neo/framework/DeclEntityDef.h +++ b/neo/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/neo/framework/DeclFX.cpp b/neo/framework/DeclFX.cpp index f141b24f..a92d1ca6 100644 --- a/neo/framework/DeclFX.cpp +++ b/neo/framework/DeclFX.cpp @@ -26,9 +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/math/Vector.h" +#include "framework/Common.h" +#include "renderer/ModelManager.h" +#include "framework/DeclFX.h" /* ================= diff --git a/neo/framework/DeclFX.h b/neo/framework/DeclFX.h index 0abfd3ce..c3411d17 100644 --- a/neo/framework/DeclFX.h +++ b/neo/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/neo/framework/DeclManager.cpp b/neo/framework/DeclManager.cpp index 9fa818a4..4df6415f 100644 --- a/neo/framework/DeclManager.cpp +++ b/neo/framework/DeclManager.cpp @@ -26,8 +26,24 @@ 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/List.h" +#include "idlib/containers/HashIndex.h" +#include "idlib/hashing/MD5.h" +#include "idlib/BitMsg.h" +#include "framework/FileSystem.h" +#include "framework/CVarSystem.h" +#include "framework/DeclAF.h" +#include "framework/DeclEntityDef.h" +#include "framework/DeclFX.h" +#include "framework/DeclPDA.h" +#include "framework/DeclParticle.h" +#include "framework/DeclSkin.h" +#include "framework/DeclTable.h" +#include "renderer/Material.h" +#include "sound/sound.h" + +#include "framework/DeclManager.h" /* diff --git a/neo/framework/DeclManager.h b/neo/framework/DeclManager.h index e4fa8b52..c30c70fd 100644 --- a/neo/framework/DeclManager.h +++ b/neo/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/neo/framework/DeclPDA.cpp b/neo/framework/DeclPDA.cpp index d255c0c9..81827d97 100644 --- a/neo/framework/DeclPDA.cpp +++ b/neo/framework/DeclPDA.cpp @@ -26,8 +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 "idlib/containers/StrList.h" +#include "framework/Common.h" + +#include "framework/DeclPDA.h" /* ================= diff --git a/neo/framework/DeclPDA.h b/neo/framework/DeclPDA.h index 77212743..8204ec0c 100644 --- a/neo/framework/DeclPDA.h +++ b/neo/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/neo/framework/DeclParticle.cpp b/neo/framework/DeclParticle.cpp index 87d15851..1b6f3ee5 100644 --- a/neo/framework/DeclParticle.cpp +++ b/neo/framework/DeclParticle.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/geometry/DrawVert.h" +#include "framework/File.h" +#include "renderer/RenderWorld.h" + +#include "framework/DeclParticle.h" struct ParticleParmDesc { const char *name; diff --git a/neo/framework/DeclParticle.h b/neo/framework/DeclParticle.h index a32ae348..03f32c73 100644 --- a/neo/framework/DeclParticle.h +++ b/neo/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/neo/framework/DeclSkin.cpp b/neo/framework/DeclSkin.cpp index fe09777b..f8de1ab2 100644 --- a/neo/framework/DeclSkin.cpp +++ b/neo/framework/DeclSkin.cpp @@ -26,9 +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 "framework/DeclSkin.h" /* ================= diff --git a/neo/framework/DeclSkin.h b/neo/framework/DeclSkin.h index 04ab4e04..a49562df 100644 --- a/neo/framework/DeclSkin.h +++ b/neo/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/neo/framework/DeclTable.cpp b/neo/framework/DeclTable.cpp index a17bc9d7..919979e3 100644 --- a/neo/framework/DeclTable.cpp +++ b/neo/framework/DeclTable.cpp @@ -26,9 +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 "idlib/math/Math.h" +#include "framework/DeclTable.h" /* ================= diff --git a/neo/framework/DeclTable.h b/neo/framework/DeclTable.h index 01bd48e9..fbe1871a 100644 --- a/neo/framework/DeclTable.h +++ b/neo/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/neo/framework/DemoFile.cpp b/neo/framework/DemoFile.cpp index bbc0b7ce..6db73f0b 100644 --- a/neo/framework/DemoFile.cpp +++ b/neo/framework/DemoFile.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/geometry/JointTransform.h" +#include "framework/Licensee.h" +#include "framework/FileSystem.h" + +#include "framework/DemoFile.h" idCVar idDemoFile::com_logDemos( "com_logDemos", "0", CVAR_SYSTEM | CVAR_BOOL, "Write demo.log with debug information in it" ); idCVar idDemoFile::com_compressDemos( "com_compressDemos", "1", CVAR_SYSTEM | CVAR_INTEGER | CVAR_ARCHIVE, "Compression scheme for demo files\n0: None (Fast, large files)\n1: LZW (Fast to compress, Fast to decompress, medium/small files)\n2: LZSS (Slow to compress, Fast to decompress, small files)\n3: Huffman (Fast to compress, Slow to decompress, medium files)\nSee also: The 'CompressDemo' command" ); diff --git a/neo/framework/DemoFile.h b/neo/framework/DemoFile.h index f9f32f00..e9ac65ee 100644 --- a/neo/framework/DemoFile.h +++ b/neo/framework/DemoFile.h @@ -29,6 +29,11 @@ If you have questions concerning this license or the applicable additional terms #ifndef __DEMOFILE_H__ #define __DEMOFILE_H__ +#include "framework/File.h" +#include "framework/Compressor.h" + +class idRenderWorld; + /* =============================================================================== diff --git a/neo/framework/EditField.cpp b/neo/framework/EditField.cpp index 2b09e3c6..ada5d064 100644 --- a/neo/framework/EditField.cpp +++ b/neo/framework/EditField.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 "framework/Common.h" +#include "framework/KeyInput.h" +#include "renderer/RenderSystem.h" + +#include "framework/EditField.h" static autoComplete_t globalAutoComplete; diff --git a/neo/framework/EditField.h b/neo/framework/EditField.h index 709a3e25..429e8f90 100644 --- a/neo/framework/EditField.h +++ b/neo/framework/EditField.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __EDITFIELD_H__ #define __EDITFIELD_H__ +#include "renderer/Material.h" + /* =============================================================================== diff --git a/neo/framework/EventLoop.cpp b/neo/framework/EventLoop.cpp index 02aa3d68..79d58164 100644 --- a/neo/framework/EventLoop.cpp +++ b/neo/framework/EventLoop.cpp @@ -26,8 +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/FileSystem.h" +#include "framework/KeyInput.h" + +#include "framework/EventLoop.h" idCVar idEventLoop::com_journal( "com_journal", "0", CVAR_INIT|CVAR_SYSTEM, "1 = record journal, 2 = play back journal", 0, 2, idCmdSystem::ArgCompletion_Integer<0,2> ); diff --git a/neo/framework/EventLoop.h b/neo/framework/EventLoop.h index 06819704..3e62bd1e 100644 --- a/neo/framework/EventLoop.h +++ b/neo/framework/EventLoop.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __EVENTLOOP_H__ #define __EVENTLOOP_H__ +#include "framework/File.h" +#include "framework/Session.h" +#include "sys/sys_public.h" + /* =============================================================================== diff --git a/neo/framework/File.cpp b/neo/framework/File.cpp index 81860634..c5854cb8 100644 --- a/neo/framework/File.cpp +++ b/neo/framework/File.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/Unzip.h" +#include "framework/FileSystem.h" -#include "Unzip.h" +#include "framework/File.h" #define MAX_PRINT_MSG 4096 diff --git a/neo/framework/File.h b/neo/framework/File.h index cf08a0e4..f181dfe3 100644 --- a/neo/framework/File.h +++ b/neo/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/neo/framework/FileSystem.cpp b/neo/framework/FileSystem.cpp index 44a9bf7c..dd2bd8da 100644 --- a/neo/framework/FileSystem.cpp +++ b/neo/framework/FileSystem.cpp @@ -26,11 +26,6 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "Unzip.h" - #ifdef WIN32 #include // for _read #else @@ -48,6 +43,16 @@ If you have questions concerning this license or the applicable additional terms #include #endif +#include "sys/platform.h" +#include "idlib/hashing/MD4.h" +#include "framework/Licensee.h" +#include "framework/Unzip.h" +#include "framework/EventLoop.h" +#include "framework/DeclEntityDef.h" +#include "framework/DeclManager.h" + +#include "framework/FileSystem.h" + /* ============================================================================= diff --git a/neo/framework/FileSystem.h b/neo/framework/FileSystem.h index d00ed858..18d5cc68 100644 --- a/neo/framework/FileSystem.h +++ b/neo/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/neo/framework/Game.h b/neo/framework/Game.h index df145c9c..c62ef817 100644 --- a/neo/framework/Game.h +++ b/neo/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/neo/framework/KeyInput.cpp b/neo/framework/KeyInput.cpp index bebf30ef..f2d80444 100644 --- a/neo/framework/KeyInput.cpp +++ b/neo/framework/KeyInput.cpp @@ -26,8 +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/Str.h" +#include "idlib/LangDict.h" +#include "framework/Common.h" +#include "framework/File.h" +#include "framework/UsercmdGen.h" +#include "sys/sys_public.h" + +#include "framework/KeyInput.h" typedef struct { const char *name; diff --git a/neo/framework/KeyInput.h b/neo/framework/KeyInput.h index d0e773a1..831595de 100644 --- a/neo/framework/KeyInput.h +++ b/neo/framework/KeyInput.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __KEYINPUT_H__ #define __KEYINPUT_H__ +#include "idlib/CmdArgs.h" + +class idFile; + /* =============================================================================== diff --git a/neo/framework/Session.cpp b/neo/framework/Session.cpp index a4f7d9ab..479c0a35 100644 --- a/neo/framework/Session.cpp +++ b/neo/framework/Session.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/hashing/CRC32.h" +#include "idlib/LangDict.h" +#include "framework/async/AsyncNetwork.h" +#include "framework/Console.h" +#include "framework/Game.h" +#include "framework/EventLoop.h" +#include "renderer/ModelManager.h" -#include "Session_local.h" +#include "framework/Session_local.h" idCVar idSessionLocal::com_showAngles( "com_showAngles", "0", CVAR_SYSTEM | CVAR_BOOL, "" ); idCVar idSessionLocal::com_minTics( "com_minTics", "1", CVAR_SYSTEM, "" ); diff --git a/neo/framework/Session.h b/neo/framework/Session.h index 288c0bee..f94081a9 100644 --- a/neo/framework/Session.h +++ b/neo/framework/Session.h @@ -29,6 +29,13 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SESSION_H__ #define __SESSION_H__ +struct sysEvent_t; +struct backgroundDownload_t; +class idDemoFile; +class idRenderWorld; +class idSoundWorld; +class idUserInterface; + /* =============================================================================== diff --git a/neo/framework/Session_local.h b/neo/framework/Session_local.h index 76429bca..0273af2b 100644 --- a/neo/framework/Session_local.h +++ b/neo/framework/Session_local.h @@ -29,6 +29,16 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SESSIONLOCAL_H__ #define __SESSIONLOCAL_H__ +#include "idlib/containers/StrList.h" +#include "idlib/Dict.h" +#include "framework/Session.h" +#include "framework/UsercmdGen.h" +#include "framework/KeyInput.h" +#include "framework/DeclEntityDef.h" +#include "renderer/RenderSystem.h" +#include "renderer/RenderWorld.h" +#include "ui/ListGUI.h" + /* IsConnectedToServer(); diff --git a/neo/framework/Session_menu.cpp b/neo/framework/Session_menu.cpp index e7100e0f..10df1ddd 100644 --- a/neo/framework/Session_menu.cpp +++ b/neo/framework/Session_menu.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/LangDict.h" +#include "framework/async/AsyncNetwork.h" +#include "framework/FileSystem.h" +#include "framework/Console.h" +#include "framework/Game.h" +#include "sound/sound.h" +#include "ui/UserInterface.h" -#include "Session_local.h" +#include "framework/Session_local.h" idCVar idSessionLocal::gui_configServerRate( "gui_configServerRate", "0", CVAR_GUI | CVAR_ARCHIVE | CVAR_ROM | CVAR_INTEGER, "" ); diff --git a/neo/framework/Unzip.cpp b/neo/framework/Unzip.cpp index 9d995b31..54d2e37d 100644 --- a/neo/framework/Unzip.cpp +++ b/neo/framework/Unzip.cpp @@ -1,7 +1,8 @@ -#include "../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" +#include "idlib/Heap.h" +#include "idlib/Lib.h" -#include "Unzip.h" +#include "framework/Unzip.h" /* unzip.h -- IO for uncompress .zip files using zlib Version 0.15 beta, Mar 19th, 1998, diff --git a/neo/framework/UsercmdGen.cpp b/neo/framework/UsercmdGen.cpp index efbb93f9..f0d090bf 100644 --- a/neo/framework/UsercmdGen.cpp +++ b/neo/framework/UsercmdGen.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/Vector.h" +#include "idlib/Lib.h" +#include "framework/CVarSystem.h" +#include "framework/KeyInput.h" +#include "framework/async/AsyncNetwork.h" -#include "Session_local.h" +#include "framework/UsercmdGen.h" /* ================ diff --git a/neo/framework/async/AsyncClient.cpp b/neo/framework/async/AsyncClient.cpp index c4c3cfcd..bf8c71df 100644 --- a/neo/framework/async/AsyncClient.cpp +++ b/neo/framework/async/AsyncClient.cpp @@ -26,18 +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/AsyncNetwork.h" +#include "framework/Licensee.h" +#include "framework/Game.h" +#include "framework/Session_local.h" +#include "sound/sound.h" -#include "AsyncNetwork.h" - -#include "../Session_local.h" +#include "framework/async/AsyncClient.h" const int SETUP_CONNECTION_RESEND_TIME = 1000; const int EMPTY_RESEND_TIME = 500; const int PREDICTION_FAST_ADJUST = 4; - /* ================== idAsyncClient::idAsyncClient diff --git a/neo/framework/async/AsyncClient.h b/neo/framework/async/AsyncClient.h index 63752fd7..7abaf292 100644 --- a/neo/framework/async/AsyncClient.h +++ b/neo/framework/async/AsyncClient.h @@ -29,6 +29,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __ASYNCCLIENT_H__ #define __ASYNCCLIENT_H__ +#include "framework/async/MsgChannel.h" +#include "framework/async/ServerScan.h" +#include "framework/UsercmdGen.h" +#include "framework/FileSystem.h" +#include "framework/Session.h" + /* =============================================================================== diff --git a/neo/framework/async/AsyncNetwork.cpp b/neo/framework/async/AsyncNetwork.cpp index a1f0e0b1..c8ba93b9 100644 --- a/neo/framework/async/AsyncNetwork.cpp +++ b/neo/framework/async/AsyncNetwork.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/LangDict.h" +#include "framework/Console.h" +#include "framework/Game.h" +#include "renderer/RenderSystem.h" +#include "sound/sound.h" -#include "AsyncNetwork.h" +#include "framework/async/AsyncNetwork.h" idAsyncServer idAsyncNetwork::server; idAsyncClient idAsyncNetwork::client; diff --git a/neo/framework/async/AsyncNetwork.h b/neo/framework/async/AsyncNetwork.h index c98ca8d4..a2cc1d69 100644 --- a/neo/framework/async/AsyncNetwork.h +++ b/neo/framework/async/AsyncNetwork.h @@ -29,10 +29,14 @@ If you have questions concerning this license or the applicable additional terms #ifndef __ASYNCNETWORK_H__ #define __ASYNCNETWORK_H__ -#include "MsgChannel.h" -#include "AsyncServer.h" -#include "ServerScan.h" -#include "AsyncClient.h" +#include "idlib/BitMsg.h" +#include "framework/async/MsgChannel.h" +#include "framework/async/AsyncClient.h" +#include "framework/async/AsyncServer.h" +#include "framework/Compressor.h" +#include "framework/Licensee.h" +#include "framework/CVarSystem.h" +#include "framework/UsercmdGen.h" /* =============================================================================== diff --git a/neo/framework/async/AsyncServer.cpp b/neo/framework/async/AsyncServer.cpp index 2e02331a..0425b1cb 100644 --- a/neo/framework/async/AsyncServer.cpp +++ b/neo/framework/async/AsyncServer.cpp @@ -26,12 +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/LangDict.h" +#include "framework/Session_local.h" +#include "framework/Game.h" -#include "AsyncNetwork.h" - -#include "../Session_local.h" +#include "framework/async/AsyncNetwork.h" const int MIN_RECONNECT_TIME = 2000; const int EMPTY_RESEND_TIME = 500; diff --git a/neo/framework/async/AsyncServer.h b/neo/framework/async/AsyncServer.h index 6069948a..36753745 100644 --- a/neo/framework/async/AsyncServer.h +++ b/neo/framework/async/AsyncServer.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __ASYNCSERVER_H__ #define __ASYNCSERVER_H__ +#include "framework/UsercmdGen.h" + /* =============================================================================== diff --git a/neo/framework/async/MsgChannel.cpp b/neo/framework/async/MsgChannel.cpp index e85308f1..b6c6cc23 100644 --- a/neo/framework/async/MsgChannel.cpp +++ b/neo/framework/async/MsgChannel.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 "idlib/BitMsg.h" +#include "framework/Compressor.h" -#include "MsgChannel.h" +#include "framework/async/MsgChannel.h" /* diff --git a/neo/framework/async/MsgChannel.h b/neo/framework/async/MsgChannel.h index 4b552498..34b0fc62 100644 --- a/neo/framework/async/MsgChannel.h +++ b/neo/framework/async/MsgChannel.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MSGCHANNEL_H__ #define __MSGCHANNEL_H__ +#include "sys/sys_public.h" + +class idCompressor; /* =============================================================================== diff --git a/neo/framework/async/NetworkSystem.cpp b/neo/framework/async/NetworkSystem.cpp index 473df7ea..bb947d2c 100644 --- a/neo/framework/async/NetworkSystem.cpp +++ b/neo/framework/async/NetworkSystem.cpp @@ -26,15 +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/async/AsyncNetwork.h" -#include "NetworkSystem.h" +#include "framework/async/NetworkSystem.h" idNetworkSystem networkSystemLocal; idNetworkSystem * networkSystem = &networkSystemLocal; - /* ================== idNetworkSystem::ServerSendReliableMessage diff --git a/neo/framework/async/NetworkSystem.h b/neo/framework/async/NetworkSystem.h index 4d5dc261..3a04bcd0 100644 --- a/neo/framework/async/NetworkSystem.h +++ b/neo/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/neo/framework/async/ServerScan.cpp b/neo/framework/async/ServerScan.cpp index 7749599b..1655533c 100644 --- a/neo/framework/async/ServerScan.cpp +++ b/neo/framework/async/ServerScan.cpp @@ -26,8 +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/LangDict.h" +#include "framework/async/AsyncNetwork.h" +#include "framework/Licensee.h" +#include "framework/Common.h" +#include "framework/CVarSystem.h" +#include "framework/DeclManager.h" +#include "framework/DeclEntityDef.h" + +#include "framework/async/ServerScan.h" idCVar gui_filter_password( "gui_filter_password", "0", CVAR_GUI | CVAR_INTEGER | CVAR_ARCHIVE, "Password filter" ); idCVar gui_filter_players( "gui_filter_players", "0", CVAR_GUI | CVAR_INTEGER | CVAR_ARCHIVE, "Players filter" ); diff --git a/neo/framework/async/ServerScan.h b/neo/framework/async/ServerScan.h index 6d958fcb..abb8d17c 100644 --- a/neo/framework/async/ServerScan.h +++ b/neo/framework/async/ServerScan.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SERVERSCAN_H__ #define __SERVERSCAN_H__ +#include "ui/UserInterface.h" + /* =============================================================================== diff --git a/neo/game/AF.cpp b/neo/game/AF.cpp index 526c8cfd..e527b14e 100644 --- a/neo/game/AF.cpp +++ b/neo/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/neo/game/AF.h b/neo/game/AF.h index 63807073..79e3751b 100644 --- a/neo/game/AF.h +++ b/neo/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/neo/game/AFEntity.cpp b/neo/game/AFEntity.cpp index 31151309..686263fc 100644 --- a/neo/game/AFEntity.cpp +++ b/neo/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/neo/game/AFEntity.h b/neo/game/AFEntity.h index f89a305e..bc7dee49 100644 --- a/neo/game/AFEntity.h +++ b/neo/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/neo/game/Actor.cpp b/neo/game/Actor.cpp index 0fb02ad6..15061a29 100644 --- a/neo/game/Actor.cpp +++ b/neo/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/neo/game/Actor.h b/neo/game/Actor.h index 0c257027..c52fb27f 100644 --- a/neo/game/Actor.h +++ b/neo/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/neo/game/BrittleFracture.cpp b/neo/game/BrittleFracture.cpp index 5a24871b..c6900fd8 100644 --- a/neo/game/BrittleFracture.cpp +++ b/neo/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/neo/game/BrittleFracture.h b/neo/game/BrittleFracture.h index 03622ef1..3eeca480 100644 --- a/neo/game/BrittleFracture.h +++ b/neo/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/neo/game/Camera.cpp b/neo/game/Camera.cpp index 7d3665ad..eddef373 100644 --- a/neo/game/Camera.cpp +++ b/neo/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/neo/game/Camera.h b/neo/game/Camera.h index 3d6016e8..ee5f5f53 100644 --- a/neo/game/Camera.h +++ b/neo/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/neo/game/EndLevel.cpp b/neo/game/EndLevel.cpp index 21f1ec9f..3dd4cd5c 100644 --- a/neo/game/EndLevel.cpp +++ b/neo/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/neo/game/EndLevel.h b/neo/game/EndLevel.h index b2d6b046..2d830856 100644 --- a/neo/game/EndLevel.h +++ b/neo/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/neo/game/Entity.cpp b/neo/game/Entity.cpp index 93d39f5a..d8552193 100644 --- a/neo/game/Entity.cpp +++ b/neo/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/neo/game/Entity.h b/neo/game/Entity.h index 57e437f2..709543b1 100644 --- a/neo/game/Entity.h +++ b/neo/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/neo/game/Fx.cpp b/neo/game/Fx.cpp index 076acd76..8ee3e7ca 100644 --- a/neo/game/Fx.cpp +++ b/neo/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/neo/game/Fx.h b/neo/game/Fx.h index f546d418..bb992254 100644 --- a/neo/game/Fx.h +++ b/neo/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/neo/game/GameEdit.cpp b/neo/game/GameEdit.cpp index a5be11e2..0c637bdb 100644 --- a/neo/game/GameEdit.cpp +++ b/neo/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/neo/game/GameEdit.h b/neo/game/GameEdit.h index 4e63f67e..bbc31ce5 100644 --- a/neo/game/GameEdit.h +++ b/neo/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/neo/game/Game_local.cpp b/neo/game/Game_local.cpp index 3df910a7..011d06ce 100644 --- a/neo/game/Game_local.cpp +++ b/neo/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/neo/game/Game_local.h b/neo/game/Game_local.h index 72e10566..1f724434 100644 --- a/neo/game/Game_local.h +++ b/neo/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/neo/game/Game_network.cpp b/neo/game/Game_network.cpp index 28c448ed..aaaa96e4 100644 --- a/neo/game/Game_network.cpp +++ b/neo/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/neo/game/IK.cpp b/neo/game/IK.cpp index 740accb5..6bd54d6b 100644 --- a/neo/game/IK.cpp +++ b/neo/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/neo/game/IK.h b/neo/game/IK.h index 2e71b813..a2a9f837 100644 --- a/neo/game/IK.h +++ b/neo/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/neo/game/Item.cpp b/neo/game/Item.cpp index c5ca9173..9ed3682b 100644 --- a/neo/game/Item.cpp +++ b/neo/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/neo/game/Item.h b/neo/game/Item.h index ac9e2092..acf7c0c9 100644 --- a/neo/game/Item.h +++ b/neo/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/neo/game/Light.cpp b/neo/game/Light.cpp index c5a4cdf2..b1b3a792 100644 --- a/neo/game/Light.cpp +++ b/neo/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/neo/game/Light.h b/neo/game/Light.h index 123c8f2f..851bf02f 100644 --- a/neo/game/Light.h +++ b/neo/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/neo/game/Misc.cpp b/neo/game/Misc.cpp index 0736877f..9e6ec736 100644 --- a/neo/game/Misc.cpp +++ b/neo/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/neo/game/Misc.h b/neo/game/Misc.h index 1fda06f4..89a4235e 100644 --- a/neo/game/Misc.h +++ b/neo/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/neo/game/Moveable.cpp b/neo/game/Moveable.cpp index a49468e3..a0517ffd 100644 --- a/neo/game/Moveable.cpp +++ b/neo/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/neo/game/Moveable.h b/neo/game/Moveable.h index 71b96781..21f0092a 100644 --- a/neo/game/Moveable.h +++ b/neo/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/neo/game/Mover.cpp b/neo/game/Mover.cpp index 739b86f4..9f1a8199 100644 --- a/neo/game/Mover.cpp +++ b/neo/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/neo/game/Mover.h b/neo/game/Mover.h index f72af1c2..7b955987 100644 --- a/neo/game/Mover.h +++ b/neo/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/neo/game/MultiplayerGame.cpp b/neo/game/MultiplayerGame.cpp index d4468d39..c21df329 100644 --- a/neo/game/MultiplayerGame.cpp +++ b/neo/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/neo/game/MultiplayerGame.h b/neo/game/MultiplayerGame.h index 5275ab3b..15fc2eb6 100644 --- a/neo/game/MultiplayerGame.h +++ b/neo/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/neo/game/Player.cpp b/neo/game/Player.cpp index 85ef5bbe..0ed61a5c 100644 --- a/neo/game/Player.cpp +++ b/neo/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/neo/game/Player.h b/neo/game/Player.h index 5e0e19d6..b411a0c0 100644 --- a/neo/game/Player.h +++ b/neo/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/neo/game/PlayerIcon.cpp b/neo/game/PlayerIcon.cpp index 33bfa453..9f590a1a 100644 --- a/neo/game/PlayerIcon.cpp +++ b/neo/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/neo/game/PlayerView.cpp b/neo/game/PlayerView.cpp index 93643392..149b8292 100644 --- a/neo/game/PlayerView.cpp +++ b/neo/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/neo/game/PlayerView.h b/neo/game/PlayerView.h index bb7c9b01..bc904588 100644 --- a/neo/game/PlayerView.h +++ b/neo/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/neo/game/Projectile.cpp b/neo/game/Projectile.cpp index 21cb65ab..1ac8820d 100644 --- a/neo/game/Projectile.cpp +++ b/neo/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/neo/game/Projectile.h b/neo/game/Projectile.h index ed68c437..3ada8a3d 100644 --- a/neo/game/Projectile.h +++ b/neo/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/neo/game/Pvs.cpp b/neo/game/Pvs.cpp index f8bd5d04..e76c86d4 100644 --- a/neo/game/Pvs.cpp +++ b/neo/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/neo/game/Pvs.h b/neo/game/Pvs.h index 46f004d9..6063c2f2 100644 --- a/neo/game/Pvs.h +++ b/neo/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/neo/game/SecurityCamera.cpp b/neo/game/SecurityCamera.cpp index 44df1aab..c16405ac 100644 --- a/neo/game/SecurityCamera.cpp +++ b/neo/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/neo/game/SecurityCamera.h b/neo/game/SecurityCamera.h index 02600df6..6e54dfd1 100644 --- a/neo/game/SecurityCamera.h +++ b/neo/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/neo/game/SmokeParticles.cpp b/neo/game/SmokeParticles.cpp index 4c26b1ae..e63307d4 100644 --- a/neo/game/SmokeParticles.cpp +++ b/neo/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/neo/game/SmokeParticles.h b/neo/game/SmokeParticles.h index 4fcda97a..7fafb8a2 100644 --- a/neo/game/SmokeParticles.h +++ b/neo/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/neo/game/Sound.cpp b/neo/game/Sound.cpp index 949324dc..d5a1f3e5 100644 --- a/neo/game/Sound.cpp +++ b/neo/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/neo/game/Sound.h b/neo/game/Sound.h index 55d84973..7992f22e 100644 --- a/neo/game/Sound.h +++ b/neo/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/neo/game/Target.cpp b/neo/game/Target.cpp index eea47d76..8c64bb1a 100644 --- a/neo/game/Target.cpp +++ b/neo/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/neo/game/Target.h b/neo/game/Target.h index 9131c2f4..a0d2fc75 100644 --- a/neo/game/Target.h +++ b/neo/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/neo/game/Trigger.cpp b/neo/game/Trigger.cpp index df7cacc0..212b2b07 100644 --- a/neo/game/Trigger.cpp +++ b/neo/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/neo/game/Trigger.h b/neo/game/Trigger.h index 9f20952a..74d503e3 100644 --- a/neo/game/Trigger.h +++ b/neo/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/neo/game/Weapon.cpp b/neo/game/Weapon.cpp index 40f6daa7..45b6d6a3 100644 --- a/neo/game/Weapon.cpp +++ b/neo/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/neo/game/Weapon.h b/neo/game/Weapon.h index c214f144..4f8b3744 100644 --- a/neo/game/Weapon.h +++ b/neo/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/neo/game/WorldSpawn.cpp b/neo/game/WorldSpawn.cpp index 9e2ce5d3..1f97aad9 100644 --- a/neo/game/WorldSpawn.cpp +++ b/neo/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/neo/game/WorldSpawn.h b/neo/game/WorldSpawn.h index bf882439..b8bb4e02 100644 --- a/neo/game/WorldSpawn.h +++ b/neo/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/neo/game/ai/AAS.cpp b/neo/game/ai/AAS.cpp index 9fd1ac88..10ab9c25 100644 --- a/neo/game/ai/AAS.cpp +++ b/neo/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/neo/game/ai/AAS.h b/neo/game/ai/AAS.h index 8f272b46..08ab9c09 100644 --- a/neo/game/ai/AAS.h +++ b/neo/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/neo/game/ai/AAS_debug.cpp b/neo/game/ai/AAS_debug.cpp index b3b4175c..ad9d8c6c 100644 --- a/neo/game/ai/AAS_debug.cpp +++ b/neo/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/neo/game/ai/AAS_local.h b/neo/game/ai/AAS_local.h index 5b9af242..6d32c2ed 100644 --- a/neo/game/ai/AAS_local.h +++ b/neo/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/neo/game/ai/AAS_pathing.cpp b/neo/game/ai/AAS_pathing.cpp index a47929fb..916b5b6f 100644 --- a/neo/game/ai/AAS_pathing.cpp +++ b/neo/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/neo/game/ai/AAS_routing.cpp b/neo/game/ai/AAS_routing.cpp index 2cb71048..eafd01e3 100644 --- a/neo/game/ai/AAS_routing.cpp +++ b/neo/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/neo/game/ai/AI.cpp b/neo/game/ai/AI.cpp index 85749466..cc99b87b 100644 --- a/neo/game/ai/AI.cpp +++ b/neo/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/neo/game/ai/AI.h b/neo/game/ai/AI.h index aeb4f373..b038ba41 100644 --- a/neo/game/ai/AI.h +++ b/neo/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/neo/game/ai/AI_Vagary.cpp b/neo/game/ai/AI_Vagary.cpp index 24c7a861..6d8463b4 100644 --- a/neo/game/ai/AI_Vagary.cpp +++ b/neo/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/neo/game/ai/AI_events.cpp b/neo/game/ai/AI_events.cpp index 97ad247b..04d66870 100644 --- a/neo/game/ai/AI_events.cpp +++ b/neo/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/neo/game/ai/AI_pathing.cpp b/neo/game/ai/AI_pathing.cpp index 308e6128..314928ea 100644 --- a/neo/game/ai/AI_pathing.cpp +++ b/neo/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/neo/game/anim/Anim.cpp b/neo/game/anim/Anim.cpp index 1dc2a949..a9f6252d 100644 --- a/neo/game/anim/Anim.cpp +++ b/neo/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/neo/game/anim/Anim.h b/neo/game/anim/Anim.h index b58d44fa..dcba8531 100644 --- a/neo/game/anim/Anim.h +++ b/neo/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/neo/game/anim/Anim_Blend.cpp b/neo/game/anim/Anim_Blend.cpp index db336587..2bcd4521 100644 --- a/neo/game/anim/Anim_Blend.cpp +++ b/neo/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/neo/game/anim/Anim_Import.cpp b/neo/game/anim/Anim_Import.cpp index 6a7bf3b9..0aaf3e28 100644 --- a/neo/game/anim/Anim_Import.cpp +++ b/neo/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/neo/game/anim/Anim_Testmodel.cpp b/neo/game/anim/Anim_Testmodel.cpp index b1c863f7..eea46e4b 100644 --- a/neo/game/anim/Anim_Testmodel.cpp +++ b/neo/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/neo/game/anim/Anim_Testmodel.h b/neo/game/anim/Anim_Testmodel.h index e63a7c49..398b7b59 100644 --- a/neo/game/anim/Anim_Testmodel.h +++ b/neo/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/neo/game/gamesys/Class.cpp b/neo/game/gamesys/Class.cpp index f03e100e..9c577636 100644 --- a/neo/game/gamesys/Class.cpp +++ b/neo/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/neo/game/gamesys/Class.h b/neo/game/gamesys/Class.h index 853d1f94..99040feb 100644 --- a/neo/game/gamesys/Class.h +++ b/neo/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/neo/game/gamesys/DebugGraph.cpp b/neo/game/gamesys/DebugGraph.cpp index f79c6274..4f98662f 100644 --- a/neo/game/gamesys/DebugGraph.cpp +++ b/neo/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/neo/game/gamesys/DebugGraph.h b/neo/game/gamesys/DebugGraph.h index 0729d498..17602480 100644 --- a/neo/game/gamesys/DebugGraph.h +++ b/neo/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/neo/game/gamesys/Event.cpp b/neo/game/gamesys/Event.cpp index cd46f361..24b1c41e 100644 --- a/neo/game/gamesys/Event.cpp +++ b/neo/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/neo/game/gamesys/Event.h b/neo/game/gamesys/Event.h index 4e2c517a..c90c0674 100644 --- a/neo/game/gamesys/Event.h +++ b/neo/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/neo/game/gamesys/SaveGame.cpp b/neo/game/gamesys/SaveGame.cpp index 432f19fc..e0b70c9d 100644 --- a/neo/game/gamesys/SaveGame.cpp +++ b/neo/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/neo/game/gamesys/SaveGame.h b/neo/game/gamesys/SaveGame.h index 7b3be8e6..4b0927f4 100644 --- a/neo/game/gamesys/SaveGame.h +++ b/neo/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/neo/game/gamesys/SysCmds.cpp b/neo/game/gamesys/SysCmds.cpp index bab152a9..9645b8d5 100644 --- a/neo/game/gamesys/SysCmds.cpp +++ b/neo/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/neo/game/gamesys/SysCvar.cpp b/neo/game/gamesys/SysCvar.cpp index 59618141..e1467dd8 100644 --- a/neo/game/gamesys/SysCvar.cpp +++ b/neo/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/neo/game/gamesys/SysCvar.h b/neo/game/gamesys/SysCvar.h index bcecd1db..da8e26ee 100644 --- a/neo/game/gamesys/SysCvar.h +++ b/neo/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/neo/game/gamesys/TypeInfo.cpp b/neo/game/gamesys/TypeInfo.cpp index 9e711923..6ed9b640 100644 --- a/neo/game/gamesys/TypeInfo.cpp +++ b/neo/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/neo/game/gamesys/TypeInfo.h b/neo/game/gamesys/TypeInfo.h index cd47bfda..b9efa2db 100644 --- a/neo/game/gamesys/TypeInfo.h +++ b/neo/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/neo/game/physics/Clip.cpp b/neo/game/physics/Clip.cpp index e6a30fe0..c6c5c912 100644 --- a/neo/game/physics/Clip.cpp +++ b/neo/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/neo/game/physics/Clip.h b/neo/game/physics/Clip.h index 1d79c84a..e6f0c205 100644 --- a/neo/game/physics/Clip.h +++ b/neo/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/neo/game/physics/Force.cpp b/neo/game/physics/Force.cpp index a835a555..874bdd04 100644 --- a/neo/game/physics/Force.cpp +++ b/neo/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/neo/game/physics/Force.h b/neo/game/physics/Force.h index ff6f4481..582225e6 100644 --- a/neo/game/physics/Force.h +++ b/neo/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/neo/game/physics/Force_Constant.cpp b/neo/game/physics/Force_Constant.cpp index 2b15096c..d62bc348 100644 --- a/neo/game/physics/Force_Constant.cpp +++ b/neo/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/neo/game/physics/Force_Constant.h b/neo/game/physics/Force_Constant.h index 0466b3a0..e62df35c 100644 --- a/neo/game/physics/Force_Constant.h +++ b/neo/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/neo/game/physics/Force_Drag.cpp b/neo/game/physics/Force_Drag.cpp index ee41c7f7..f8682a11 100644 --- a/neo/game/physics/Force_Drag.cpp +++ b/neo/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/neo/game/physics/Force_Drag.h b/neo/game/physics/Force_Drag.h index 97465ae3..4010845b 100644 --- a/neo/game/physics/Force_Drag.h +++ b/neo/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/neo/game/physics/Force_Field.cpp b/neo/game/physics/Force_Field.cpp index 8db70222..8c02b120 100644 --- a/neo/game/physics/Force_Field.cpp +++ b/neo/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/neo/game/physics/Force_Field.h b/neo/game/physics/Force_Field.h index e3bfc837..ea963ac1 100644 --- a/neo/game/physics/Force_Field.h +++ b/neo/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/neo/game/physics/Force_Spring.cpp b/neo/game/physics/Force_Spring.cpp index 93a6d19b..c805b7a9 100644 --- a/neo/game/physics/Force_Spring.cpp +++ b/neo/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/neo/game/physics/Force_Spring.h b/neo/game/physics/Force_Spring.h index 06db7063..2a890b2c 100644 --- a/neo/game/physics/Force_Spring.h +++ b/neo/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/neo/game/physics/Physics.cpp b/neo/game/physics/Physics.cpp index bb487047..86e35d46 100644 --- a/neo/game/physics/Physics.cpp +++ b/neo/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/neo/game/physics/Physics.h b/neo/game/physics/Physics.h index 3d70adb9..545c6ee2 100644 --- a/neo/game/physics/Physics.h +++ b/neo/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/neo/game/physics/Physics_AF.cpp b/neo/game/physics/Physics_AF.cpp index 77766df3..4c1a559c 100644 --- a/neo/game/physics/Physics_AF.cpp +++ b/neo/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/neo/game/physics/Physics_AF.h b/neo/game/physics/Physics_AF.h index 4d712b1f..90b57c96 100644 --- a/neo/game/physics/Physics_AF.h +++ b/neo/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/neo/game/physics/Physics_Actor.cpp b/neo/game/physics/Physics_Actor.cpp index 52372725..85a45a7f 100644 --- a/neo/game/physics/Physics_Actor.cpp +++ b/neo/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/neo/game/physics/Physics_Actor.h b/neo/game/physics/Physics_Actor.h index 0e4fec1a..e50ae17e 100644 --- a/neo/game/physics/Physics_Actor.h +++ b/neo/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/neo/game/physics/Physics_Base.cpp b/neo/game/physics/Physics_Base.cpp index ee421c77..41b455b5 100644 --- a/neo/game/physics/Physics_Base.cpp +++ b/neo/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/neo/game/physics/Physics_Base.h b/neo/game/physics/Physics_Base.h index a0ac05b1..0d739342 100644 --- a/neo/game/physics/Physics_Base.h +++ b/neo/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/neo/game/physics/Physics_Monster.cpp b/neo/game/physics/Physics_Monster.cpp index c5b919c2..1e48b7f9 100644 --- a/neo/game/physics/Physics_Monster.cpp +++ b/neo/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/neo/game/physics/Physics_Monster.h b/neo/game/physics/Physics_Monster.h index 54923242..0df59dd8 100644 --- a/neo/game/physics/Physics_Monster.h +++ b/neo/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/neo/game/physics/Physics_Parametric.cpp b/neo/game/physics/Physics_Parametric.cpp index 2208b94d..c502ba53 100644 --- a/neo/game/physics/Physics_Parametric.cpp +++ b/neo/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/neo/game/physics/Physics_Parametric.h b/neo/game/physics/Physics_Parametric.h index 3cbd6a5c..ad4745b1 100644 --- a/neo/game/physics/Physics_Parametric.h +++ b/neo/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/neo/game/physics/Physics_Player.cpp b/neo/game/physics/Physics_Player.cpp index f7a2d1ec..6a74c5e4 100644 --- a/neo/game/physics/Physics_Player.cpp +++ b/neo/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/neo/game/physics/Physics_Player.h b/neo/game/physics/Physics_Player.h index f3aa8521..40d52e7e 100644 --- a/neo/game/physics/Physics_Player.h +++ b/neo/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/neo/game/physics/Physics_RigidBody.cpp b/neo/game/physics/Physics_RigidBody.cpp index aaefd041..8d0436f2 100644 --- a/neo/game/physics/Physics_RigidBody.cpp +++ b/neo/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/neo/game/physics/Physics_RigidBody.h b/neo/game/physics/Physics_RigidBody.h index 1e9874d1..d211ebea 100644 --- a/neo/game/physics/Physics_RigidBody.h +++ b/neo/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/neo/game/physics/Physics_Static.cpp b/neo/game/physics/Physics_Static.cpp index 4ff07e2c..cf9f0cfb 100644 --- a/neo/game/physics/Physics_Static.cpp +++ b/neo/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/neo/game/physics/Physics_Static.h b/neo/game/physics/Physics_Static.h index e8002e15..bb589513 100644 --- a/neo/game/physics/Physics_Static.h +++ b/neo/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/neo/game/physics/Physics_StaticMulti.cpp b/neo/game/physics/Physics_StaticMulti.cpp index df2c293e..287d901c 100644 --- a/neo/game/physics/Physics_StaticMulti.cpp +++ b/neo/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/neo/game/physics/Physics_StaticMulti.h b/neo/game/physics/Physics_StaticMulti.h index a6055f92..0cd94ed2 100644 --- a/neo/game/physics/Physics_StaticMulti.h +++ b/neo/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/neo/game/physics/Push.cpp b/neo/game/physics/Push.cpp index 44c4220a..0b986130 100644 --- a/neo/game/physics/Push.cpp +++ b/neo/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/neo/game/physics/Push.h b/neo/game/physics/Push.h index b122d016..0cb7406a 100644 --- a/neo/game/physics/Push.h +++ b/neo/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/neo/game/script/Script_Compiler.cpp b/neo/game/script/Script_Compiler.cpp index df900e27..d698be24 100644 --- a/neo/game/script/Script_Compiler.cpp +++ b/neo/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/neo/game/script/Script_Compiler.h b/neo/game/script/Script_Compiler.h index fdcfe427..be9fb68d 100644 --- a/neo/game/script/Script_Compiler.h +++ b/neo/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/neo/game/script/Script_Interpreter.cpp b/neo/game/script/Script_Interpreter.cpp index c7de466a..b6d044cf 100644 --- a/neo/game/script/Script_Interpreter.cpp +++ b/neo/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/neo/game/script/Script_Interpreter.h b/neo/game/script/Script_Interpreter.h index b8525710..e7ec0f64 100644 --- a/neo/game/script/Script_Interpreter.h +++ b/neo/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/neo/game/script/Script_Program.cpp b/neo/game/script/Script_Program.cpp index 465c58b0..bfcd719e 100644 --- a/neo/game/script/Script_Program.cpp +++ b/neo/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/neo/game/script/Script_Program.h b/neo/game/script/Script_Program.h index 937f1f0e..59756770 100644 --- a/neo/game/script/Script_Program.h +++ b/neo/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/neo/game/script/Script_Thread.cpp b/neo/game/script/Script_Thread.cpp index 9b59685e..58daa5d9 100644 --- a/neo/game/script/Script_Thread.cpp +++ b/neo/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/neo/game/script/Script_Thread.h b/neo/game/script/Script_Thread.h index 232f6cc4..fe24943f 100644 --- a/neo/game/script/Script_Thread.h +++ b/neo/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/neo/idlib/Base64.cpp b/neo/idlib/Base64.cpp index ce024b84..85d4639e 100644 --- a/neo/idlib/Base64.cpp +++ b/neo/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/neo/idlib/Base64.h b/neo/idlib/Base64.h index 632d0119..22849130 100644 --- a/neo/idlib/Base64.h +++ b/neo/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/neo/idlib/BitMsg.cpp b/neo/idlib/BitMsg.cpp index ed8072c1..27be80d0 100644 --- a/neo/idlib/BitMsg.cpp +++ b/neo/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/neo/idlib/BitMsg.h b/neo/idlib/BitMsg.h index ad727fe1..82edfa42 100644 --- a/neo/idlib/BitMsg.h +++ b/neo/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/neo/idlib/CmdArgs.cpp b/neo/idlib/CmdArgs.cpp index 34d28894..f8629861 100644 --- a/neo/idlib/CmdArgs.cpp +++ b/neo/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/neo/idlib/Dict.cpp b/neo/idlib/Dict.cpp index 9c98566d..b1039ccc 100644 --- a/neo/idlib/Dict.cpp +++ b/neo/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/neo/idlib/Dict.h b/neo/idlib/Dict.h index 29b9dd33..94d68d64 100644 --- a/neo/idlib/Dict.h +++ b/neo/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/neo/idlib/Heap.cpp b/neo/idlib/Heap.cpp index 611a3857..a76fb4ac 100644 --- a/neo/idlib/Heap.cpp +++ b/neo/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/neo/idlib/Heap.h b/neo/idlib/Heap.h index f7bda34e..6cc27eb0 100644 --- a/neo/idlib/Heap.h +++ b/neo/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/neo/idlib/LangDict.cpp b/neo/idlib/LangDict.cpp index 426d9096..63b477ae 100644 --- a/neo/idlib/LangDict.cpp +++ b/neo/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/neo/idlib/LangDict.h b/neo/idlib/LangDict.h index a1cd1f5a..200a96dd 100644 --- a/neo/idlib/LangDict.h +++ b/neo/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/neo/idlib/Lexer.cpp b/neo/idlib/Lexer.cpp index 9bdef6a1..4629a58e 100644 --- a/neo/idlib/Lexer.cpp +++ b/neo/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/neo/idlib/Lexer.h b/neo/idlib/Lexer.h index 8fd7daee..09d7da49 100644 --- a/neo/idlib/Lexer.h +++ b/neo/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/neo/idlib/Lib.cpp b/neo/idlib/Lib.cpp index 9487b5a5..a790c563 100644 --- a/neo/idlib/Lib.cpp +++ b/neo/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/neo/idlib/Lib.h b/neo/idlib/Lib.h index 44607f4f..ce7ecefe 100644 --- a/neo/idlib/Lib.h +++ b/neo/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/neo/idlib/MapFile.cpp b/neo/idlib/MapFile.cpp index 639322a1..afbfa1d3 100644 --- a/neo/idlib/MapFile.cpp +++ b/neo/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/neo/idlib/MapFile.h b/neo/idlib/MapFile.h index ba5d3577..fb93339e 100644 --- a/neo/idlib/MapFile.h +++ b/neo/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/neo/idlib/Parser.cpp b/neo/idlib/Parser.cpp index 8bc23cbc..199ac7fa 100644 --- a/neo/idlib/Parser.cpp +++ b/neo/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/neo/idlib/Parser.h b/neo/idlib/Parser.h index 6843b053..a8c821ab 100644 --- a/neo/idlib/Parser.h +++ b/neo/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/neo/idlib/Str.cpp b/neo/idlib/Str.cpp index bc54504c..034fbe90 100644 --- a/neo/idlib/Str.cpp +++ b/neo/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/neo/idlib/Str.h b/neo/idlib/Str.h index 21160d50..9b2d1030 100644 --- a/neo/idlib/Str.h +++ b/neo/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/neo/idlib/Timer.cpp b/neo/idlib/Timer.cpp index 51a3fe03..55bc2984 100644 --- a/neo/idlib/Timer.cpp +++ b/neo/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/neo/idlib/Timer.h b/neo/idlib/Timer.h index 39110c67..24c5b1ce 100644 --- a/neo/idlib/Timer.h +++ b/neo/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/neo/idlib/Token.cpp b/neo/idlib/Token.cpp index 73fd1630..51fe5b60 100644 --- a/neo/idlib/Token.cpp +++ b/neo/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/neo/idlib/Token.h b/neo/idlib/Token.h index af6df0c3..b80d471a 100644 --- a/neo/idlib/Token.h +++ b/neo/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/neo/idlib/bv/Bounds.cpp b/neo/idlib/bv/Bounds.cpp index 10207ce4..c28b6a1e 100644 --- a/neo/idlib/bv/Bounds.cpp +++ b/neo/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/neo/idlib/bv/Bounds.h b/neo/idlib/bv/Bounds.h index 5fb97cc1..7e79b8ad 100644 --- a/neo/idlib/bv/Bounds.h +++ b/neo/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/neo/idlib/bv/Box.cpp b/neo/idlib/bv/Box.cpp index 28acecf7..75be26df 100644 --- a/neo/idlib/bv/Box.cpp +++ b/neo/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/neo/idlib/bv/Box.h b/neo/idlib/bv/Box.h index 2d8e3cb8..fd5f70d8 100644 --- a/neo/idlib/bv/Box.h +++ b/neo/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/neo/idlib/bv/Frustum.cpp b/neo/idlib/bv/Frustum.cpp index 5a76bab9..c50641a3 100644 --- a/neo/idlib/bv/Frustum.cpp +++ b/neo/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/neo/idlib/bv/Frustum.h b/neo/idlib/bv/Frustum.h index 73403683..f7443edd 100644 --- a/neo/idlib/bv/Frustum.h +++ b/neo/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/neo/idlib/bv/Sphere.cpp b/neo/idlib/bv/Sphere.cpp index f06d813c..335997e1 100644 --- a/neo/idlib/bv/Sphere.cpp +++ b/neo/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/neo/idlib/bv/Sphere.h b/neo/idlib/bv/Sphere.h index a5e2e5f7..e4bfeab8 100644 --- a/neo/idlib/bv/Sphere.h +++ b/neo/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/neo/idlib/containers/HashIndex.cpp b/neo/idlib/containers/HashIndex.cpp index 1bfb38bb..53fc2918 100644 --- a/neo/idlib/containers/HashIndex.cpp +++ b/neo/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/neo/idlib/containers/HashIndex.h b/neo/idlib/containers/HashIndex.h index 6385074f..d01c2b83 100644 --- a/neo/idlib/containers/HashIndex.h +++ b/neo/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/neo/idlib/containers/HashTable.h b/neo/idlib/containers/HashTable.h index aab3d1ab..289b9ab4 100644 --- a/neo/idlib/containers/HashTable.h +++ b/neo/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/neo/idlib/containers/Hierarchy.h b/neo/idlib/containers/Hierarchy.h index 79143aa1..df1d5137 100644 --- a/neo/idlib/containers/Hierarchy.h +++ b/neo/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/neo/idlib/containers/PlaneSet.h b/neo/idlib/containers/PlaneSet.h index bd5912fd..c631640e 100644 --- a/neo/idlib/containers/PlaneSet.h +++ b/neo/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/neo/idlib/containers/StrList.h b/neo/idlib/containers/StrList.h index 1a2916d8..8333e167 100644 --- a/neo/idlib/containers/StrList.h +++ b/neo/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/neo/idlib/containers/StrPool.h b/neo/idlib/containers/StrPool.h index 104bf8c4..196493db 100644 --- a/neo/idlib/containers/StrPool.h +++ b/neo/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/neo/idlib/containers/VectorSet.h b/neo/idlib/containers/VectorSet.h index 81fe6253..baba1163 100644 --- a/neo/idlib/containers/VectorSet.h +++ b/neo/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/neo/idlib/geometry/DrawVert.cpp b/neo/idlib/geometry/DrawVert.cpp index cd14b22b..07cce89c 100644 --- a/neo/idlib/geometry/DrawVert.cpp +++ b/neo/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/neo/idlib/geometry/DrawVert.h b/neo/idlib/geometry/DrawVert.h index b33c6601..d454430b 100644 --- a/neo/idlib/geometry/DrawVert.h +++ b/neo/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/neo/idlib/geometry/JointTransform.cpp b/neo/idlib/geometry/JointTransform.cpp index fe8badd9..3dea0f1a 100644 --- a/neo/idlib/geometry/JointTransform.cpp +++ b/neo/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/neo/idlib/geometry/JointTransform.h b/neo/idlib/geometry/JointTransform.h index ceaa1c8a..3eaa7760 100644 --- a/neo/idlib/geometry/JointTransform.h +++ b/neo/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/neo/idlib/geometry/Surface.cpp b/neo/idlib/geometry/Surface.cpp index d3b19fcd..369601b6 100644 --- a/neo/idlib/geometry/Surface.cpp +++ b/neo/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/neo/idlib/geometry/Surface.h b/neo/idlib/geometry/Surface.h index 847c67e1..983bce27 100644 --- a/neo/idlib/geometry/Surface.h +++ b/neo/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/neo/idlib/geometry/Surface_Patch.cpp b/neo/idlib/geometry/Surface_Patch.cpp index 06413d1a..6f6f7443 100644 --- a/neo/idlib/geometry/Surface_Patch.cpp +++ b/neo/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/neo/idlib/geometry/Surface_Patch.h b/neo/idlib/geometry/Surface_Patch.h index dae0e5b6..e16b906b 100644 --- a/neo/idlib/geometry/Surface_Patch.h +++ b/neo/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/neo/idlib/geometry/Surface_Polytope.cpp b/neo/idlib/geometry/Surface_Polytope.cpp index 3fc91d6e..b80598c5 100644 --- a/neo/idlib/geometry/Surface_Polytope.cpp +++ b/neo/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/neo/idlib/geometry/Surface_Polytope.h b/neo/idlib/geometry/Surface_Polytope.h index be1336a6..ea74dba6 100644 --- a/neo/idlib/geometry/Surface_Polytope.h +++ b/neo/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/neo/idlib/geometry/Surface_SweptSpline.cpp b/neo/idlib/geometry/Surface_SweptSpline.cpp index c004ad16..1132aa69 100644 --- a/neo/idlib/geometry/Surface_SweptSpline.cpp +++ b/neo/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/neo/idlib/geometry/Surface_SweptSpline.h b/neo/idlib/geometry/Surface_SweptSpline.h index 3ccb1315..627a6fa2 100644 --- a/neo/idlib/geometry/Surface_SweptSpline.h +++ b/neo/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/neo/idlib/geometry/TraceModel.cpp b/neo/idlib/geometry/TraceModel.cpp index 2bd7d6b7..b1a88ff2 100644 --- a/neo/idlib/geometry/TraceModel.cpp +++ b/neo/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/neo/idlib/geometry/TraceModel.h b/neo/idlib/geometry/TraceModel.h index bd7ada30..5882648a 100644 --- a/neo/idlib/geometry/TraceModel.h +++ b/neo/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/neo/idlib/geometry/Winding.cpp b/neo/idlib/geometry/Winding.cpp index 09f3454e..5f384232 100644 --- a/neo/idlib/geometry/Winding.cpp +++ b/neo/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/neo/idlib/geometry/Winding.h b/neo/idlib/geometry/Winding.h index 7636e350..788b6d48 100644 --- a/neo/idlib/geometry/Winding.h +++ b/neo/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/neo/idlib/geometry/Winding2D.cpp b/neo/idlib/geometry/Winding2D.cpp index baa6617f..3106d10d 100644 --- a/neo/idlib/geometry/Winding2D.cpp +++ b/neo/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/neo/idlib/geometry/Winding2D.h b/neo/idlib/geometry/Winding2D.h index 6a27e195..0f326169 100644 --- a/neo/idlib/geometry/Winding2D.h +++ b/neo/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/neo/idlib/hashing/CRC32.cpp b/neo/idlib/hashing/CRC32.cpp index fd3f3b6a..b4b9fd6e 100644 --- a/neo/idlib/hashing/CRC32.cpp +++ b/neo/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/neo/idlib/hashing/MD4.cpp b/neo/idlib/hashing/MD4.cpp index cba08bb1..dc761961 100644 --- a/neo/idlib/hashing/MD4.cpp +++ b/neo/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/neo/idlib/hashing/MD5.cpp b/neo/idlib/hashing/MD5.cpp index 71e4214d..f2d503f1 100644 --- a/neo/idlib/hashing/MD5.cpp +++ b/neo/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/neo/idlib/math/Angles.cpp b/neo/idlib/math/Angles.cpp index f7ee4462..6f463577 100644 --- a/neo/idlib/math/Angles.cpp +++ b/neo/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/neo/idlib/math/Angles.h b/neo/idlib/math/Angles.h index 51c93124..99ed880b 100644 --- a/neo/idlib/math/Angles.h +++ b/neo/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/neo/idlib/math/Complex.cpp b/neo/idlib/math/Complex.cpp index dfb74c40..3c630265 100644 --- a/neo/idlib/math/Complex.cpp +++ b/neo/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/neo/idlib/math/Complex.h b/neo/idlib/math/Complex.h index d4ef2eea..10919ffb 100644 --- a/neo/idlib/math/Complex.h +++ b/neo/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/neo/idlib/math/Curve.h b/neo/idlib/math/Curve.h index bbda8623..c8f99797 100644 --- a/neo/idlib/math/Curve.h +++ b/neo/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/neo/idlib/math/Extrapolate.h b/neo/idlib/math/Extrapolate.h index 1c8ec1a6..f486de92 100644 --- a/neo/idlib/math/Extrapolate.h +++ b/neo/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/neo/idlib/math/Interpolate.h b/neo/idlib/math/Interpolate.h index 2659dd88..4ac18050 100644 --- a/neo/idlib/math/Interpolate.h +++ b/neo/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/neo/idlib/math/Lcp.cpp b/neo/idlib/math/Lcp.cpp index f41dbbc9..13ad7566 100644 --- a/neo/idlib/math/Lcp.cpp +++ b/neo/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/neo/idlib/math/Lcp.h b/neo/idlib/math/Lcp.h index e800fae0..b5787ad1 100644 --- a/neo/idlib/math/Lcp.h +++ b/neo/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/neo/idlib/math/Math.cpp b/neo/idlib/math/Math.cpp index 3745259f..1fdad2de 100644 --- a/neo/idlib/math/Math.cpp +++ b/neo/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/neo/idlib/math/Math.h b/neo/idlib/math/Math.h index be7ada0d..4aa22c67 100644 --- a/neo/idlib/math/Math.h +++ b/neo/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/neo/idlib/math/Matrix.cpp b/neo/idlib/math/Matrix.cpp index f723ee99..f83e0619 100644 --- a/neo/idlib/math/Matrix.cpp +++ b/neo/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/neo/idlib/math/Matrix.h b/neo/idlib/math/Matrix.h index 71361f38..9b267eac 100644 --- a/neo/idlib/math/Matrix.h +++ b/neo/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/neo/idlib/math/Ode.cpp b/neo/idlib/math/Ode.cpp index 1ce6db37..2397adcb 100644 --- a/neo/idlib/math/Ode.cpp +++ b/neo/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/neo/idlib/math/Plane.cpp b/neo/idlib/math/Plane.cpp index 7336053e..fc4a940d 100644 --- a/neo/idlib/math/Plane.cpp +++ b/neo/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/neo/idlib/math/Plane.h b/neo/idlib/math/Plane.h index 075687c4..d64f35da 100644 --- a/neo/idlib/math/Plane.h +++ b/neo/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/neo/idlib/math/Pluecker.cpp b/neo/idlib/math/Pluecker.cpp index de916982..ff9294f2 100644 --- a/neo/idlib/math/Pluecker.cpp +++ b/neo/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/neo/idlib/math/Pluecker.h b/neo/idlib/math/Pluecker.h index bc8b66b9..73a52636 100644 --- a/neo/idlib/math/Pluecker.h +++ b/neo/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/neo/idlib/math/Polynomial.cpp b/neo/idlib/math/Polynomial.cpp index d539dd10..7a955424 100644 --- a/neo/idlib/math/Polynomial.cpp +++ b/neo/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/neo/idlib/math/Polynomial.h b/neo/idlib/math/Polynomial.h index 2ceac0c0..840d098d 100644 --- a/neo/idlib/math/Polynomial.h +++ b/neo/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/neo/idlib/math/Quat.cpp b/neo/idlib/math/Quat.cpp index af2885e3..84758dd7 100644 --- a/neo/idlib/math/Quat.cpp +++ b/neo/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/neo/idlib/math/Quat.h b/neo/idlib/math/Quat.h index 1bc03605..bdd10ca2 100644 --- a/neo/idlib/math/Quat.h +++ b/neo/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/neo/idlib/math/Random.h b/neo/idlib/math/Random.h index a908cf08..1640901d 100644 --- a/neo/idlib/math/Random.h +++ b/neo/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/neo/idlib/math/Rotation.cpp b/neo/idlib/math/Rotation.cpp index 606b8cdc..3248a94e 100644 --- a/neo/idlib/math/Rotation.cpp +++ b/neo/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/neo/idlib/math/Rotation.h b/neo/idlib/math/Rotation.h index 6250643e..6972bdfc 100644 --- a/neo/idlib/math/Rotation.h +++ b/neo/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/neo/idlib/math/Simd.cpp b/neo/idlib/math/Simd.cpp index 75e86abe..b540e44d 100644 --- a/neo/idlib/math/Simd.cpp +++ b/neo/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/neo/idlib/math/Simd.h b/neo/idlib/math/Simd.h index 2039229f..97e4c443 100644 --- a/neo/idlib/math/Simd.h +++ b/neo/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/neo/idlib/math/Simd_3DNow.cpp b/neo/idlib/math/Simd_3DNow.cpp index f64bf79b..fc877f99 100644 --- a/neo/idlib/math/Simd_3DNow.cpp +++ b/neo/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/neo/idlib/math/Simd_3DNow.h b/neo/idlib/math/Simd_3DNow.h index 52f5e795..73708fcd 100644 --- a/neo/idlib/math/Simd_3DNow.h +++ b/neo/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/neo/idlib/math/Simd_AltiVec.cpp b/neo/idlib/math/Simd_AltiVec.cpp index 4b894f35..96ac930a 100644 --- a/neo/idlib/math/Simd_AltiVec.cpp +++ b/neo/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/neo/idlib/math/Simd_AltiVec.h b/neo/idlib/math/Simd_AltiVec.h index 351ca6c8..903caac6 100644 --- a/neo/idlib/math/Simd_AltiVec.h +++ b/neo/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/neo/idlib/math/Simd_Generic.cpp b/neo/idlib/math/Simd_Generic.cpp index f238a773..f4d0fd54 100644 --- a/neo/idlib/math/Simd_Generic.cpp +++ b/neo/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/neo/idlib/math/Simd_Generic.h b/neo/idlib/math/Simd_Generic.h index 6af6b262..a9a46322 100644 --- a/neo/idlib/math/Simd_Generic.h +++ b/neo/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/neo/idlib/math/Simd_MMX.cpp b/neo/idlib/math/Simd_MMX.cpp index 37bb917e..806bb186 100644 --- a/neo/idlib/math/Simd_MMX.cpp +++ b/neo/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/neo/idlib/math/Simd_MMX.h b/neo/idlib/math/Simd_MMX.h index 83fce249..115e6cc8 100644 --- a/neo/idlib/math/Simd_MMX.h +++ b/neo/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/neo/idlib/math/Simd_SSE.cpp b/neo/idlib/math/Simd_SSE.cpp index 2cf61a07..e3dbc32b 100644 --- a/neo/idlib/math/Simd_SSE.cpp +++ b/neo/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/neo/idlib/math/Simd_SSE.h b/neo/idlib/math/Simd_SSE.h index 906f8615..e9deef1e 100644 --- a/neo/idlib/math/Simd_SSE.h +++ b/neo/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/neo/idlib/math/Simd_SSE2.cpp b/neo/idlib/math/Simd_SSE2.cpp index 21a69caf..2c4e5b76 100644 --- a/neo/idlib/math/Simd_SSE2.cpp +++ b/neo/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/neo/idlib/math/Simd_SSE2.h b/neo/idlib/math/Simd_SSE2.h index 91ff3f46..34992cc2 100644 --- a/neo/idlib/math/Simd_SSE2.h +++ b/neo/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/neo/idlib/math/Simd_SSE3.cpp b/neo/idlib/math/Simd_SSE3.cpp index 92533b16..cbcbf42c 100644 --- a/neo/idlib/math/Simd_SSE3.cpp +++ b/neo/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/neo/idlib/math/Simd_SSE3.h b/neo/idlib/math/Simd_SSE3.h index 3ec8fbbc..623574d9 100644 --- a/neo/idlib/math/Simd_SSE3.h +++ b/neo/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/neo/idlib/math/Vector.cpp b/neo/idlib/math/Vector.cpp index 552bed22..a863ec73 100644 --- a/neo/idlib/math/Vector.cpp +++ b/neo/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/neo/idlib/math/Vector.h b/neo/idlib/math/Vector.h index 1590188a..d00949f6 100644 --- a/neo/idlib/math/Vector.h +++ b/neo/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/neo/idlib/precompiled.h b/neo/idlib/precompiled.h index 05bb87f2..6dde9926 100644 --- a/neo/idlib/precompiled.h +++ b/neo/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/neo/renderer/Cinematic.cpp b/neo/renderer/Cinematic.cpp index 11298d47..15a274b7 100644 --- a/neo/renderer/Cinematic.cpp +++ b/neo/renderer/Cinematic.cpp @@ -26,12 +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 -#include "tr_local.h" +#include "framework/FileSystem.h" +#include "renderer/tr_local.h" +#include "sound/sound.h" + +#include "renderer/Cinematic.h" #define CIN_system 1 #define CIN_loop 2 diff --git a/neo/renderer/GuiModel.cpp b/neo/renderer/GuiModel.cpp index 8248815e..08fdb2cf 100644 --- a/neo/renderer/GuiModel.cpp +++ b/neo/renderer/GuiModel.cpp @@ -26,11 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "tr_local.h" +#include "sys/platform.h" +#include "framework/DemoFile.h" +#include "renderer/tr_local.h" +#include "renderer/VertexCache.h" +#include "renderer/GuiModel.h" /* ================ diff --git a/neo/renderer/GuiModel.h b/neo/renderer/GuiModel.h index 1ff36890..f85e8889 100644 --- a/neo/renderer/GuiModel.h +++ b/neo/renderer/GuiModel.h @@ -26,6 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ +#include "idlib/containers/List.h" +#include "idlib/geometry/DrawVert.h" +#include "renderer/Model.h" + +class idDemoFile; typedef struct { const idMaterial *material; diff --git a/neo/renderer/Image.h b/neo/renderer/Image.h index db089b07..18dcb9a5 100644 --- a/neo/renderer/Image.h +++ b/neo/renderer/Image.h @@ -26,6 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ +#ifndef __IMAGE_H__ +#define __IMAGE_H__ + +#include "idlib/containers/List.h" +#include "framework/FileSystem.h" +#include "renderer/Material.h" +#include "renderer/qgl.h" + /* ==================================================================== @@ -493,3 +501,5 @@ IMAGEPROGRAM void R_LoadImageProgram( const char *name, byte **pic, int *width, int *height, ID_TIME_T *timestamp, textureDepth_t *depth = NULL ); const char *R_ParsePastImageProgram( idLexer &src ); + +#endif diff --git a/neo/renderer/Image_files.cpp b/neo/renderer/Image_files.cpp index 561ab3e5..8fac1efc 100644 --- a/neo/renderer/Image_files.cpp +++ b/neo/renderer/Image_files.cpp @@ -26,12 +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 -#include "tr_local.h" +#include "renderer/tr_local.h" + +#include "renderer/Image.h" /* diff --git a/neo/renderer/Image_init.cpp b/neo/renderer/Image_init.cpp index 69e4200c..824a488a 100644 --- a/neo/renderer/Image_init.cpp +++ b/neo/renderer/Image_init.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/async/AsyncNetwork.h" +#include "framework/Session.h" +#include "renderer/tr_local.h" -#include "tr_local.h" +#include "renderer/Image.h" const char *imageFilter[] = { "GL_LINEAR_MIPMAP_NEAREST", diff --git a/neo/renderer/Image_load.cpp b/neo/renderer/Image_load.cpp index 3d0a3838..e95d2c94 100644 --- a/neo/renderer/Image_load.cpp +++ b/neo/renderer/Image_load.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 "idlib/hashing/MD4.h" +#include "renderer/tr_local.h" -#include "tr_local.h" +#include "renderer/Image.h" /* PROBLEM: compressed textures may break the zero clamp rule! diff --git a/neo/renderer/Image_process.cpp b/neo/renderer/Image_process.cpp index 4a468e23..920aad18 100644 --- a/neo/renderer/Image_process.cpp +++ b/neo/renderer/Image_process.cpp @@ -25,10 +25,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "tr_local.h" +#include "sys/platform.h" +#include "renderer/tr_local.h" + +#include "renderer/Image.h" /* ================ diff --git a/neo/renderer/Image_program.cpp b/neo/renderer/Image_program.cpp index b3b6d247..e7ec7eeb 100644 --- a/neo/renderer/Image_program.cpp +++ b/neo/renderer/Image_program.cpp @@ -26,6 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ +#include "sys/platform.h" +#include "renderer/tr_local.h" + +#include "renderer/Image.h" + /* all uncompressed @@ -48,17 +53,6 @@ Manager ->Print ->Reload( bool force ) -*/ - -#include "../idlib/precompiled.h" -#pragma hdrstop - -// tr_imageprogram.c - -#include "tr_local.h" - -/* - Anywhere that an image name is used (diffusemaps, bumpmaps, specularmaps, lights, etc), an imageProgram can be specified. diff --git a/neo/renderer/Interaction.cpp b/neo/renderer/Interaction.cpp index a14327ea..6f215d8c 100644 --- a/neo/renderer/Interaction.cpp +++ b/neo/renderer/Interaction.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/tr_local.h" +#include "renderer/RenderWorld_local.h" +#include "renderer/VertexCache.h" -#include "tr_local.h" +#include "renderer/Interaction.h" /* =========================================================================== diff --git a/neo/renderer/Interaction.h b/neo/renderer/Interaction.h index 6396fe7f..f83a3a96 100644 --- a/neo/renderer/Interaction.h +++ b/neo/renderer/Interaction.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __INTERACTION_H__ #define __INTERACTION_H__ +#include "idlib/bv/Frustum.h" +#include "renderer/Model.h" +#include "renderer/tr_local.h" + /* =============================================================================== diff --git a/neo/renderer/Material.cpp b/neo/renderer/Material.cpp index 39aac766..c9fb89c1 100644 --- a/neo/renderer/Material.cpp +++ b/neo/renderer/Material.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/math/Interpolate.h" +#include "renderer/Cinematic.h" +#include "renderer/tr_local.h" +#include "ui/Window.h" +#include "ui/UserInterface.h" +#include "sound/sound.h" -#include "tr_local.h" +#include "renderer/Material.h" /* diff --git a/neo/renderer/Material.h b/neo/renderer/Material.h index 71ee936f..ab450f85 100644 --- a/neo/renderer/Material.h +++ b/neo/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/neo/renderer/MegaTexture.cpp b/neo/renderer/MegaTexture.cpp index 382d168b..38a5e916 100644 --- a/neo/renderer/MegaTexture.cpp +++ b/neo/renderer/MegaTexture.cpp @@ -25,10 +25,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "tr_local.h" +#include "sys/platform.h" +#include "framework/Session.h" +#include "renderer/tr_local.h" + +#include "renderer/MegaTexture.h" idCVar idMegaTexture::r_megaTextureLevel( "r_megaTextureLevel", "0", CVAR_RENDERER | CVAR_INTEGER, "draw only a specific level" ); idCVar idMegaTexture::r_showMegaTexture( "r_showMegaTexture", "0", CVAR_RENDERER | CVAR_BOOL, "display all the level images" ); diff --git a/neo/renderer/MegaTexture.h b/neo/renderer/MegaTexture.h index f25aaab3..0365acba 100644 --- a/neo/renderer/MegaTexture.h +++ b/neo/renderer/MegaTexture.h @@ -26,6 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ +#ifndef __MEGATEXTURE_H__ +#define __MEGATEXTURE_H__ + +#include "renderer/Model.h" + class idTextureTile { public: int x, y; @@ -96,3 +101,5 @@ friend class idTextureLevel; static idCVar r_skipMegaTexture; static idCVar r_terrainScale; }; + +#endif diff --git a/neo/renderer/Model.cpp b/neo/renderer/Model.cpp index 0fa278a5..ad927d2a 100644 --- a/neo/renderer/Model.cpp +++ b/neo/renderer/Model.cpp @@ -26,14 +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/containers/VectorSet.h" +#include "framework/DemoFile.h" +#include "renderer/tr_local.h" +#include "renderer/Model_local.h" +#include "renderer/Model_ase.h" +#include "renderer/Model_lwo.h" +#include "renderer/Model_ma.h" +#include "renderer/VertexCache.h" -#include "tr_local.h" -#include "Model_local.h" -#include "Model_ase.h" -#include "Model_lwo.h" -#include "Model_ma.h" +#include "renderer/Model.h" idCVar idRenderModelStatic::r_mergeModelSurfaces( "r_mergeModelSurfaces", "1", CVAR_BOOL|CVAR_RENDERER, "combine model surfaces with the same material" ); idCVar idRenderModelStatic::r_slopVertex( "r_slopVertex", "0.01", CVAR_RENDERER, "merge xyz coordinates this far apart" ); diff --git a/neo/renderer/Model.h b/neo/renderer/Model.h index da6aa272..79ff89c4 100644 --- a/neo/renderer/Model.h +++ b/neo/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/neo/renderer/ModelDecal.cpp b/neo/renderer/ModelDecal.cpp index ae8bfb54..d0cdd9dd 100644 --- a/neo/renderer/ModelDecal.cpp +++ b/neo/renderer/ModelDecal.cpp @@ -26,11 +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/VertexCache.h" +#include "renderer/tr_local.h" -#include "tr_local.h" -#include "Model_local.h" +#include "renderer/Model_local.h" // decalFade filter 5 0.1 // polygonOffset diff --git a/neo/renderer/ModelDecal.h b/neo/renderer/ModelDecal.h index 3228ee2e..a7498e83 100644 --- a/neo/renderer/ModelDecal.h +++ b/neo/renderer/ModelDecal.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MODELDECAL_H__ #define __MODELDECAL_H__ +#include "idlib/geometry/DrawVert.h" +#include "idlib/geometry/Winding.h" + /* =============================================================================== diff --git a/neo/renderer/ModelManager.cpp b/neo/renderer/ModelManager.cpp index 0ac1562c..f8b45fc0 100644 --- a/neo/renderer/ModelManager.cpp +++ b/neo/renderer/ModelManager.cpp @@ -26,12 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "Model_local.h" -#include "tr_local.h" // just for R_FreeWorldInteractions and R_CreateWorldInteractions +#include "sys/platform.h" +#include "framework/CVarSystem.h" +#include "framework/Session.h" +#include "renderer/RenderWorld.h" +#include "renderer/Model_local.h" +#include "renderer/tr_local.h" // just for R_FreeWorldInteractions and R_CreateWorldInteractions +#include "renderer/ModelManager.h" class idRenderModelManagerLocal : public idRenderModelManager { public: diff --git a/neo/renderer/ModelManager.h b/neo/renderer/ModelManager.h index 2b61f438..deb078d0 100644 --- a/neo/renderer/ModelManager.h +++ b/neo/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/neo/renderer/ModelOverlay.cpp b/neo/renderer/ModelOverlay.cpp index eb24e96a..2868e24a 100644 --- a/neo/renderer/ModelOverlay.cpp +++ b/neo/renderer/ModelOverlay.cpp @@ -26,12 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "Model_local.h" -#include "tr_local.h" +#include "sys/platform.h" +#include "renderer/tr_local.h" +#include "renderer/Model_local.h" +#include "renderer/ModelOverlay.h" /* ==================== diff --git a/neo/renderer/Model_ase.cpp b/neo/renderer/Model_ase.cpp index 41e36635..ac74dea2 100644 --- a/neo/renderer/Model_ase.cpp +++ b/neo/renderer/Model_ase.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 "framework/FileSystem.h" -#include "Model_ase.h" +#include "renderer/Model_ase.h" /* ====================================================================== diff --git a/neo/renderer/Model_ase.h b/neo/renderer/Model_ase.h index 8d4b6ddf..a9e3abc5 100644 --- a/neo/renderer/Model_ase.h +++ b/neo/renderer/Model_ase.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MODEL_ASE_H__ #define __MODEL_ASE_H__ +#include "idlib/containers/List.h" +#include "idlib/math/Vector.h" + /* =============================================================================== diff --git a/neo/renderer/Model_beam.cpp b/neo/renderer/Model_beam.cpp index 86890613..a56dc332 100644 --- a/neo/renderer/Model_beam.cpp +++ b/neo/renderer/Model_beam.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 "renderer/tr_local.h" -#include "tr_local.h" -#include "Model_local.h" +#include "renderer/Model_local.h" /* diff --git a/neo/renderer/Model_liquid.cpp b/neo/renderer/Model_liquid.cpp index bdea9932..e5d3daf2 100644 --- a/neo/renderer/Model_liquid.cpp +++ b/neo/renderer/Model_liquid.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 "renderer/tr_local.h" -#include "tr_local.h" -#include "Model_local.h" +#include "renderer/Model_local.h" #define LIQUID_MAX_SKIP_FRAMES 5 #define LIQUID_MAX_TYPES 3 diff --git a/neo/renderer/Model_local.h b/neo/renderer/Model_local.h index c3cfd9b9..72a0ecda 100644 --- a/neo/renderer/Model_local.h +++ b/neo/renderer/Model_local.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MODEL_LOCAL_H__ #define __MODEL_LOCAL_H__ +#include "idlib/geometry/JointTransform.h" +#include "renderer/Model.h" + /* =============================================================================== diff --git a/neo/renderer/Model_lwo.cpp b/neo/renderer/Model_lwo.cpp index 4bb72f7f..816d7802 100644 --- a/neo/renderer/Model_lwo.cpp +++ b/neo/renderer/Model_lwo.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/FileSystem.h" -#include "Model_lwo.h" +#include "renderer/Model_lwo.h" /* ====================================================================== diff --git a/neo/renderer/Model_ma.cpp b/neo/renderer/Model_ma.cpp index 5f93c96f..703fcde4 100644 --- a/neo/renderer/Model_ma.cpp +++ b/neo/renderer/Model_ma.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/Parser.h" +#include "framework/Common.h" +#include "framework/FileSystem.h" +#include "framework/Session.h" -#include "Model_ma.h" +#include "renderer/Model_ma.h" /* ====================================================================== diff --git a/neo/renderer/Model_ma.h b/neo/renderer/Model_ma.h index ebb577ac..5883823c 100644 --- a/neo/renderer/Model_ma.h +++ b/neo/renderer/Model_ma.h @@ -29,6 +29,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MODEL_MA_H__ #define __MODEL_MA_H__ +#include "idlib/containers/List.h" +#include "idlib/containers/HashTable.h" +#include "idlib/math/Vector.h" + /* =============================================================================== diff --git a/neo/renderer/Model_md3.cpp b/neo/renderer/Model_md3.cpp index e541f3cb..91336c27 100644 --- a/neo/renderer/Model_md3.cpp +++ b/neo/renderer/Model_md3.cpp @@ -25,12 +25,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "tr_local.h" -#include "Model_local.h" -#include "Model_md3.h" +#include "sys/platform.h" +#include "renderer/tr_local.h" +#include "renderer/Model_local.h" + +#include "renderer/Model_md3.h" /*********************************************************************** diff --git a/neo/renderer/Model_md5.cpp b/neo/renderer/Model_md5.cpp index 8d8e28f9..59e8b314 100644 --- a/neo/renderer/Model_md5.cpp +++ b/neo/renderer/Model_md5.cpp @@ -26,15 +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/Session.h" +#include "renderer/tr_local.h" -#include "tr_local.h" -#include "Model_local.h" +#include "renderer/Model_local.h" static const char *MD5_SnapshotName = "_MD5_Snapshot_"; - /*********************************************************************** idMD5Mesh diff --git a/neo/renderer/Model_prt.cpp b/neo/renderer/Model_prt.cpp index 307cbb0d..812b75f5 100644 --- a/neo/renderer/Model_prt.cpp +++ b/neo/renderer/Model_prt.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 "renderer/tr_local.h" -#include "tr_local.h" -#include "Model_local.h" +#include "renderer/Model_local.h" static const char *parametricParticle_SnapshotName = "_ParametricParticle_Snapshot_"; diff --git a/neo/renderer/Model_sprite.cpp b/neo/renderer/Model_sprite.cpp index e562d841..4433027f 100644 --- a/neo/renderer/Model_sprite.cpp +++ b/neo/renderer/Model_sprite.cpp @@ -26,12 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "tr_local.h" -#include "Model_local.h" +#include "sys/platform.h" +#include "renderer/tr_local.h" +#include "renderer/Model_local.h" /* diff --git a/neo/renderer/RenderEntity.cpp b/neo/renderer/RenderEntity.cpp index 822dbfc8..a37de664 100644 --- a/neo/renderer/RenderEntity.cpp +++ b/neo/renderer/RenderEntity.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 "tr_local.h" +#include "renderer/tr_local.h" idRenderEntityLocal::idRenderEntityLocal() { memset( &parms, 0, sizeof( parms ) ); diff --git a/neo/renderer/RenderSystem.cpp b/neo/renderer/RenderSystem.cpp index 6578489f..226e96fb 100644 --- a/neo/renderer/RenderSystem.cpp +++ b/neo/renderer/RenderSystem.cpp @@ -25,10 +25,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/containers/List.h" +#include "framework/EventLoop.h" +#include "framework/Session.h" +#include "framework/DemoFile.h" +#include "renderer/ModelManager.h" +#include "renderer/Material.h" +#include "renderer/GuiModel.h" +#include "renderer/VertexCache.h" +#include "renderer/RenderWorld_local.h" -#include "tr_local.h" +#include "renderer/tr_local.h" idRenderSystemLocal tr; idRenderSystem *renderSystem = &tr; diff --git a/neo/renderer/RenderSystem.h b/neo/renderer/RenderSystem.h index 806734c5..79609b55 100644 --- a/neo/renderer/RenderSystem.h +++ b/neo/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/neo/renderer/RenderSystem_init.cpp b/neo/renderer/RenderSystem_init.cpp index ad4bfca4..b0c99948 100644 --- a/neo/renderer/RenderSystem_init.cpp +++ b/neo/renderer/RenderSystem_init.cpp @@ -26,14 +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/Licensee.h" +#include "framework/Console.h" +#include "framework/Session.h" +#include "renderer/VertexCache.h" +#include "renderer/ModelManager.h" +#include "renderer/RenderWorld_local.h" +#include "renderer/GuiModel.h" +#include "sound/sound.h" +#include "ui/UserInterface.h" -#include "tr_local.h" +#include "renderer/tr_local.h" // Vista OpenGL wrapper check #ifdef _WIN32 -#include "../sys/win32/win_local.h" +#include "sys/win32/win_local.h" #endif // functions that are not called every frame diff --git a/neo/renderer/RenderWorld.cpp b/neo/renderer/RenderWorld.cpp index 2f9d2658..227c96d2 100644 --- a/neo/renderer/RenderWorld.cpp +++ b/neo/renderer/RenderWorld.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 "framework/Session.h" +#include "framework/DeclSkin.h" +#include "renderer/GuiModel.h" +#include "renderer/RenderWorld_local.h" -#include "tr_local.h" +#include "renderer/tr_local.h" /* =================== diff --git a/neo/renderer/RenderWorld.h b/neo/renderer/RenderWorld.h index 8507d293..462774e2 100644 --- a/neo/renderer/RenderWorld.h +++ b/neo/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/neo/renderer/RenderWorld_demo.cpp b/neo/renderer/RenderWorld_demo.cpp index d449c4c0..1af44a25 100644 --- a/neo/renderer/RenderWorld_demo.cpp +++ b/neo/renderer/RenderWorld_demo.cpp @@ -25,10 +25,20 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "tr_local.h" +#include "sys/platform.h" +#include "idlib/geometry/JointTransform.h" +#include "framework/DeclSkin.h" +#include "framework/DemoFile.h" +#include "framework/EventLoop.h" +#include "framework/Session.h" +#include "renderer/GuiModel.h" +#include "renderer/ModelManager.h" +#include "renderer/RenderWorld_local.h" +#include "ui/UserInterface.h" +#include "sound/sound.h" + +#include "renderer/tr_local.h" //#define WRITE_GUIS diff --git a/neo/renderer/RenderWorld_load.cpp b/neo/renderer/RenderWorld_load.cpp index ba2137bf..f1605d77 100644 --- a/neo/renderer/RenderWorld_load.cpp +++ b/neo/renderer/RenderWorld_load.cpp @@ -26,11 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "tr_local.h" +#include "sys/platform.h" +#include "framework/Session.h" +#include "renderer/ModelManager.h" +#include "renderer/RenderWorld_local.h" +#include "renderer/tr_local.h" /* ================ diff --git a/neo/renderer/RenderWorld_local.h b/neo/renderer/RenderWorld_local.h index 6960f6e2..0a129c5f 100644 --- a/neo/renderer/RenderWorld_local.h +++ b/neo/renderer/RenderWorld_local.h @@ -29,10 +29,15 @@ If you have questions concerning this license or the applicable additional terms #ifndef __RENDERWORLDLOCAL_H__ #define __RENDERWORLDLOCAL_H__ +#include "idlib/geometry/Winding.h" +#include "renderer/RenderWorld.h" +#include "renderer/tr_local.h" + +class idRenderLightLocal; + // assume any lightDef or entityDef index above this is an internal error const int LUDICROUS_INDEX = 10000; - typedef struct portal_s { int intoArea; // area this portal leads to idWinding * w; // winding points have counter clockwise ordering seen this area diff --git a/neo/renderer/RenderWorld_portals.cpp b/neo/renderer/RenderWorld_portals.cpp index 6ce6aafc..1fbba78d 100644 --- a/neo/renderer/RenderWorld_portals.cpp +++ b/neo/renderer/RenderWorld_portals.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/DemoFile.h" +#include "framework/Session.h" +#include "renderer/RenderWorld_local.h" -#include "tr_local.h" +#include "renderer/tr_local.h" /* diff --git a/neo/renderer/VertexCache.cpp b/neo/renderer/VertexCache.cpp index ea59e660..ec0184e5 100644 --- a/neo/renderer/VertexCache.cpp +++ b/neo/renderer/VertexCache.cpp @@ -26,11 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "tr_local.h" +#include "sys/platform.h" +#include "framework/Common.h" +#include "renderer/tr_local.h" +#include "renderer/VertexCache.h" static const int FRAME_MEMORY_BYTES = 0x200000; static const int EXPAND_HEADERS = 1024; diff --git a/neo/renderer/VertexCache.h b/neo/renderer/VertexCache.h index 9341a747..a1d0a0d5 100644 --- a/neo/renderer/VertexCache.h +++ b/neo/renderer/VertexCache.h @@ -26,6 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ +#include "framework/CVarSystem.h" +#include "renderer/qgl.h" + // vertex cache calls should only be made by the front end const int NUM_VERTEX_FRAMES = 2; diff --git a/neo/renderer/draw_arb.cpp b/neo/renderer/draw_arb.cpp index 1a4a24a1..72415040 100644 --- a/neo/renderer/draw_arb.cpp +++ b/neo/renderer/draw_arb.cpp @@ -25,10 +25,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "tr_local.h" +#include "sys/platform.h" +#include "renderer/VertexCache.h" + +#include "renderer/tr_local.h" /* diff --git a/neo/renderer/draw_arb2.cpp b/neo/renderer/draw_arb2.cpp index 640111dd..11e94448 100644 --- a/neo/renderer/draw_arb2.cpp +++ b/neo/renderer/draw_arb2.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 "renderer/VertexCache.h" -#include "tr_local.h" +#include "renderer/tr_local.h" /* ========================================================================================= diff --git a/neo/renderer/draw_common.cpp b/neo/renderer/draw_common.cpp index ad3a7566..9c61c436 100644 --- a/neo/renderer/draw_common.cpp +++ b/neo/renderer/draw_common.cpp @@ -25,10 +25,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "tr_local.h" +#include "sys/platform.h" +#include "renderer/VertexCache.h" + +#include "renderer/tr_local.h" /* ===================== diff --git a/neo/renderer/draw_exp.cpp b/neo/renderer/draw_exp.cpp index 499daa39..c4099a86 100644 --- a/neo/renderer/draw_exp.cpp +++ b/neo/renderer/draw_exp.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 "sys/win32/win_local.h" -#include "tr_local.h" -#include "../sys/win32/win_local.h" +#include "renderer/tr_local.h" /* diff --git a/neo/renderer/draw_nv10.cpp b/neo/renderer/draw_nv10.cpp index 90c3532d..7032193c 100644 --- a/neo/renderer/draw_nv10.cpp +++ b/neo/renderer/draw_nv10.cpp @@ -25,11 +25,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "tr_local.h" +#include "sys/platform.h" +#include "renderer/VertexCache.h" +#include "renderer/tr_local.h" /* ================== diff --git a/neo/renderer/draw_nv20.cpp b/neo/renderer/draw_nv20.cpp index d3661e2e..134f6a8f 100644 --- a/neo/renderer/draw_nv20.cpp +++ b/neo/renderer/draw_nv20.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 "renderer/VertexCache.h" -#include "tr_local.h" +#include "renderer/tr_local.h" typedef enum { FPROG_BUMP_AND_LIGHT, diff --git a/neo/renderer/draw_r200.cpp b/neo/renderer/draw_r200.cpp index cdfb090e..5c5b5f92 100644 --- a/neo/renderer/draw_r200.cpp +++ b/neo/renderer/draw_r200.cpp @@ -25,10 +25,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "tr_local.h" +#include "sys/platform.h" +#include "renderer/VertexCache.h" + +#include "renderer/tr_local.h" /* diff --git a/neo/renderer/tr_backend.cpp b/neo/renderer/tr_backend.cpp index fb4a39ba..e354eb5c 100644 --- a/neo/renderer/tr_backend.cpp +++ b/neo/renderer/tr_backend.cpp @@ -25,16 +25,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "tr_local.h" +#include "sys/platform.h" +#include "renderer/tr_local.h" frameData_t *frameData; backEndState_t backEnd; - /* ====================== RB_SetDefaultGLState diff --git a/neo/renderer/tr_deform.cpp b/neo/renderer/tr_deform.cpp index acdc11a5..9fc31fd7 100644 --- a/neo/renderer/tr_deform.cpp +++ b/neo/renderer/tr_deform.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 "idlib/containers/BinSearch.h" +#include "renderer/VertexCache.h" -#include "tr_local.h" +#include "renderer/tr_local.h" /* diff --git a/neo/renderer/tr_font.cpp b/neo/renderer/tr_font.cpp index 14442aff..f841b5b9 100644 --- a/neo/renderer/tr_font.cpp +++ b/neo/renderer/tr_font.cpp @@ -26,11 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ +#include "sys/platform.h" -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "tr_local.h" +#include "renderer/tr_local.h" #define FILESIZE_fontInfo_t (20548) diff --git a/neo/renderer/tr_guisurf.cpp b/neo/renderer/tr_guisurf.cpp index 8381c38a..a90cbde1 100644 --- a/neo/renderer/tr_guisurf.cpp +++ b/neo/renderer/tr_guisurf.cpp @@ -25,10 +25,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "tr_local.h" +#include "sys/platform.h" +#include "renderer/GuiModel.h" +#include "ui/UserInterface.h" + +#include "renderer/tr_local.h" /* ========================================================================================== diff --git a/neo/renderer/tr_light.cpp b/neo/renderer/tr_light.cpp index d926e716..0a193ba3 100644 --- a/neo/renderer/tr_light.cpp +++ b/neo/renderer/tr_light.cpp @@ -26,14 +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/Interpolate.h" +#include "framework/Game.h" +#include "renderer/VertexCache.h" +#include "renderer/RenderWorld_local.h" +#include "ui/Window.h" -#include "tr_local.h" +#include "renderer/tr_local.h" static const float CHECK_BOUNDS_EPSILON = 1.0f; - /* =========================================================================================== diff --git a/neo/renderer/tr_lightrun.cpp b/neo/renderer/tr_lightrun.cpp index e59e2c87..10bb371d 100644 --- a/neo/renderer/tr_lightrun.cpp +++ b/neo/renderer/tr_lightrun.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 "framework/Session.h" +#include "renderer/ModelManager.h" +#include "renderer/RenderWorld_local.h" +#include "ui/UserInterface.h" -#include "tr_local.h" +#include "renderer/tr_local.h" /* diff --git a/neo/renderer/tr_local.h b/neo/renderer/tr_local.h index 77aa73fe..1c6e3b89 100644 --- a/neo/renderer/tr_local.h +++ b/neo/renderer/tr_local.h @@ -29,8 +29,15 @@ If you have questions concerning this license or the applicable additional terms #ifndef __TR_LOCAL_H__ #define __TR_LOCAL_H__ -#include "Image.h" -#include "MegaTexture.h" +class idScreenRect; // yay for include recursion + +#include "renderer/Image.h" +#include "renderer/Interaction.h" +#include "renderer/MegaTexture.h" +#include "renderer/ModelDecal.h" +#include "renderer/ModelOverlay.h" +#include "renderer/RenderSystem.h" +#include "renderer/RenderWorld.h" class idRenderWorldLocal; @@ -93,11 +100,6 @@ SURFACES ============================================================================== */ -#include "ModelDecal.h" -#include "ModelOverlay.h" -#include "Interaction.h" - - // drawSurf_t structures command the back end to render surfaces // a given srfTriangles_t may be used with multiple viewEntity_t, // as when viewed in a subview or multiple viewport render, or @@ -1680,8 +1682,4 @@ idScreenRect R_CalcIntersectionScissor( const idRenderLightLocal * lightDef, //============================================= -#include "RenderWorld_local.h" -#include "GuiModel.h" -#include "VertexCache.h" - #endif /* !__TR_LOCAL_H__ */ diff --git a/neo/renderer/tr_main.cpp b/neo/renderer/tr_main.cpp index d5795674..7012e329 100644 --- a/neo/renderer/tr_main.cpp +++ b/neo/renderer/tr_main.cpp @@ -26,10 +26,6 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "tr_local.h" #ifdef __ppc__ #include #endif @@ -37,6 +33,12 @@ If you have questions concerning this license or the applicable additional terms #include #endif +#include "sys/platform.h" +#include "framework/Session.h" +#include "renderer/RenderWorld_local.h" + +#include "renderer/tr_local.h" + //==================================================================== /* diff --git a/neo/renderer/tr_orderIndexes.cpp b/neo/renderer/tr_orderIndexes.cpp index bba412c9..4fe42217 100644 --- a/neo/renderer/tr_orderIndexes.cpp +++ b/neo/renderer/tr_orderIndexes.cpp @@ -25,11 +25,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "tr_local.h" +#include "sys/platform.h" +#include "renderer/tr_local.h" /* =============== diff --git a/neo/renderer/tr_polytope.cpp b/neo/renderer/tr_polytope.cpp index 8b606188..18067f6b 100644 --- a/neo/renderer/tr_polytope.cpp +++ b/neo/renderer/tr_polytope.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 "tr_local.h" +#include "renderer/tr_local.h" #define MAX_POLYTOPE_PLANES 6 diff --git a/neo/renderer/tr_render.cpp b/neo/renderer/tr_render.cpp index 33b6e727..7b0c4f74 100644 --- a/neo/renderer/tr_render.cpp +++ b/neo/renderer/tr_render.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/VertexCache.h" +#include "renderer/Cinematic.h" -#include "tr_local.h" +#include "renderer/tr_local.h" /* diff --git a/neo/renderer/tr_rendertools.cpp b/neo/renderer/tr_rendertools.cpp index 7bf961f3..e027b421 100644 --- a/neo/renderer/tr_rendertools.cpp +++ b/neo/renderer/tr_rendertools.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/simplex.h" // line font definition +#include "renderer/VertexCache.h" +#include "renderer/Cinematic.h" +#include "renderer/RenderWorld_local.h" -#include "tr_local.h" -#include "simplex.h" // line font definition +#include "renderer/tr_local.h" #define MAX_DEBUG_LINES 16384 diff --git a/neo/renderer/tr_shadowbounds.cpp b/neo/renderer/tr_shadowbounds.cpp index 8b33b9aa..8a6ce296 100644 --- a/neo/renderer/tr_shadowbounds.cpp +++ b/neo/renderer/tr_shadowbounds.cpp @@ -25,12 +25,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "tr_local.h" +#include "sys/platform.h" +#include "renderer/RenderWorld_local.h" +#include "renderer/tr_local.h" // Compute conservative shadow bounds as the intersection // of the object's bounds' shadow volume and the light's bounds. diff --git a/neo/renderer/tr_stencilshadow.cpp b/neo/renderer/tr_stencilshadow.cpp index fd386658..9b4278f7 100644 --- a/neo/renderer/tr_stencilshadow.cpp +++ b/neo/renderer/tr_stencilshadow.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 "tr_local.h" +#include "renderer/tr_local.h" // tr_stencilShadow.c -- creaton of stencil shadow volumes diff --git a/neo/renderer/tr_subview.cpp b/neo/renderer/tr_subview.cpp index 403b97fd..58c789a2 100644 --- a/neo/renderer/tr_subview.cpp +++ b/neo/renderer/tr_subview.cpp @@ -26,11 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "tr_local.h" +#include "sys/platform.h" +#include "renderer/tr_local.h" typedef struct { idVec3 origin; diff --git a/neo/renderer/tr_trace.cpp b/neo/renderer/tr_trace.cpp index 63442225..4ca998dd 100644 --- a/neo/renderer/tr_trace.cpp +++ b/neo/renderer/tr_trace.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 "tr_local.h" +#include "renderer/tr_local.h" //#define TEST_TRACE diff --git a/neo/renderer/tr_trisurf.cpp b/neo/renderer/tr_trisurf.cpp index eb4024c4..d9b17401 100644 --- a/neo/renderer/tr_trisurf.cpp +++ b/neo/renderer/tr_trisurf.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 "renderer/VertexCache.h" -#include "tr_local.h" +#include "renderer/tr_local.h" /* ============================================================================== diff --git a/neo/renderer/tr_turboshadow.cpp b/neo/renderer/tr_turboshadow.cpp index f7327342..ab70e768 100644 --- a/neo/renderer/tr_turboshadow.cpp +++ b/neo/renderer/tr_turboshadow.cpp @@ -26,15 +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 "tr_local.h" +#include "renderer/tr_local.h" int c_turboUsedVerts; int c_turboUnusedVerts; - /* ===================== R_CreateVertexProgramTurboShadowVolume diff --git a/neo/sound/efxlib.h b/neo/sound/efxlib.h index a6331a84..1b0ff7e0 100644 --- a/neo/sound/efxlib.h +++ b/neo/sound/efxlib.h @@ -8,8 +8,11 @@ #include #endif - - +#include "idlib/containers/List.h" +#include "idlib/Str.h" +#include "idlib/Lexer.h" +#include "idlib/Heap.h" +#include "sound/sound.h" /////////////////////////////////////////////////////////// // Class definitions. diff --git a/neo/sound/snd_cache.cpp b/neo/sound/snd_cache.cpp index 2c246571..83cf3a81 100644 --- a/neo/sound/snd_cache.cpp +++ b/neo/sound/snd_cache.cpp @@ -25,10 +25,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "snd_local.h" +#include "sys/platform.h" +#include "framework/FileSystem.h" + +#include "sound/snd_local.h" #define USE_SOUND_CACHE_ALLOCATOR @@ -38,7 +39,6 @@ static idDynamicBlockAlloc soundCacheAllocator; static idDynamicAlloc soundCacheAllocator; #endif - /* =================== idSoundCache::idSoundCache() diff --git a/neo/sound/snd_decoder.cpp b/neo/sound/snd_decoder.cpp index 2d857f90..f7040ad4 100644 --- a/neo/sound/snd_decoder.cpp +++ b/neo/sound/snd_decoder.cpp @@ -26,14 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - #define OV_EXCLUDE_STATIC_CALLBACKS #include #include -#include "snd_local.h" +#include "sys/platform.h" +#include "framework/FileSystem.h" + +#include "sound/snd_local.h" /* =================================================================================== diff --git a/neo/sound/snd_efxfile.cpp b/neo/sound/snd_efxfile.cpp index 01387814..1132e61a 100644 --- a/neo/sound/snd_efxfile.cpp +++ b/neo/sound/snd_efxfile.cpp @@ -25,10 +25,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "snd_local.h" +#include "sys/platform.h" + +#include "sound/snd_local.h" /* =============== diff --git a/neo/sound/snd_emitter.cpp b/neo/sound/snd_emitter.cpp index a6050258..cf2167b2 100644 --- a/neo/sound/snd_emitter.cpp +++ b/neo/sound/snd_emitter.cpp @@ -26,11 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "snd_local.h" +#include "sys/platform.h" +#include "framework/Session.h" +#include "renderer/RenderWorld.h" +#include "sound/snd_local.h" /* =================== diff --git a/neo/sound/snd_local.h b/neo/sound/snd_local.h index b567b49c..8e8605eb 100644 --- a/neo/sound/snd_local.h +++ b/neo/sound/snd_local.h @@ -44,7 +44,10 @@ If you have questions concerning this license or the applicable additional terms #include #define ID_ALCHAR #endif -#include "efxlib.h" + +#include "framework/UsercmdGen.h" +#include "sound/efxlib.h" +#include "sound/sound.h" // demo sound commands typedef enum { diff --git a/neo/sound/snd_shader.cpp b/neo/sound/snd_shader.cpp index 2384f8a0..80707c24 100644 --- a/neo/sound/snd_shader.cpp +++ b/neo/sound/snd_shader.cpp @@ -26,11 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "snd_local.h" +#include "sys/platform.h" +#include "framework/FileSystem.h" +#include "sound/snd_local.h" /* =============== diff --git a/neo/sound/snd_system.cpp b/neo/sound/snd_system.cpp index cee1747b..4d06be72 100644 --- a/neo/sound/snd_system.cpp +++ b/neo/sound/snd_system.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 "snd_local.h" +#include "sound/snd_local.h" #ifdef ID_DEDICATED idCVar idSoundSystemLocal::s_noSound( "s_noSound", "1", CVAR_SOUND | CVAR_BOOL | CVAR_ROM, "" ); diff --git a/neo/sound/snd_wavefile.cpp b/neo/sound/snd_wavefile.cpp index c644d6ac..4013a983 100644 --- a/neo/sound/snd_wavefile.cpp +++ b/neo/sound/snd_wavefile.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/FileSystem.h" -#include "snd_local.h" +#include "sound/snd_local.h" //----------------------------------------------------------------------------- // Name: idWaveFile::idWaveFile() diff --git a/neo/sound/snd_world.cpp b/neo/sound/snd_world.cpp index ba5c07f2..f8e2fb96 100644 --- a/neo/sound/snd_world.cpp +++ b/neo/sound/snd_world.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/FileSystem.h" +#include "framework/Session.h" +#include "renderer/RenderWorld.h" -#include "snd_local.h" +#include "sound/snd_local.h" /* ================== diff --git a/neo/sound/sound.h b/neo/sound/sound.h index 6f670d94..d94e3611 100644 --- a/neo/sound/sound.h +++ b/neo/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/neo/sys/linux/dedicated.cpp b/neo/sys/linux/dedicated.cpp index fac3c273..66420592 100644 --- a/neo/sys/linux/dedicated.cpp +++ b/neo/sys/linux/dedicated.cpp @@ -25,10 +25,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#include "../../renderer/tr_local.h" -#include "../posix/posix_public.h" -#include "local.h" + +#include "sys/platform.h" +#include "renderer/tr_local.h" +#include "sys/posix/posix_public.h" + +#include "sys/linux/local.h" /* ========== diff --git a/neo/sys/linux/glimp.cpp b/neo/sys/linux/glimp.cpp index d2fc4ea3..78e68bee 100644 --- a/neo/sys/linux/glimp.cpp +++ b/neo/sys/linux/glimp.cpp @@ -25,19 +25,23 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#include "../../renderer/tr_local.h" -#include "local.h" #include #include #include #include +#include extern "C" { # include "libXNVCtrl/NVCtrlLib.h" } +#include "sys/platform.h" +#include "framework/Licensee.h" +#include "renderer/tr_local.h" + +#include "sys/linux/local.h" + idCVar sys_videoRam( "sys_videoRam", "0", CVAR_SYSTEM | CVAR_ARCHIVE | CVAR_INTEGER, "Texture memory on the video card (in megabytes) - 0: autodetect", 0, 512 ); Display *dpy = NULL; diff --git a/neo/sys/linux/input.cpp b/neo/sys/linux/input.cpp index 7c15d5d5..bb403446 100644 --- a/neo/sys/linux/input.cpp +++ b/neo/sys/linux/input.cpp @@ -25,12 +25,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#include "../posix/posix_public.h" -#include "local.h" #include +#include "sys/platform.h" +#include "framework/KeyInput.h" +#include "sys/posix/posix_public.h" + +#include "sys/linux/local.h" + idCVar in_mouse( "in_mouse", "1", CVAR_SYSTEM | CVAR_ARCHIVE, "" ); idCVar in_dgamouse( "in_dgamouse", "1", CVAR_SYSTEM | CVAR_ARCHIVE, "" ); idCVar in_nograb( "in_nograb", "0", CVAR_SYSTEM | CVAR_NOCHEAT, "" ); diff --git a/neo/sys/linux/local.h b/neo/sys/linux/local.h index b99fce6c..a27cceb6 100644 --- a/neo/sys/linux/local.h +++ b/neo/sys/linux/local.h @@ -28,9 +28,7 @@ If you have questions concerning this license or the applicable additional terms #ifndef __LINUX_LOCAL_H__ #define __LINUX_LOCAL_H__ -extern glconfig_t glConfig; - -// glimp.cpp +#include //#define ID_ENABLE_DGA @@ -40,6 +38,9 @@ extern glconfig_t glConfig; #include #include +#include "renderer/RenderSystem.h" +#include "renderer/tr_local.h" + extern Display *dpy; extern Window win; diff --git a/neo/sys/linux/main.cpp b/neo/sys/linux/main.cpp index 1cb4a2c5..8d672fd0 100644 --- a/neo/sys/linux/main.cpp +++ b/neo/sys/linux/main.cpp @@ -25,10 +25,6 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#include "../posix/posix_public.h" -#include "../sys_local.h" -#include "local.h" #include #include @@ -41,6 +37,14 @@ If you have questions concerning this license or the applicable additional terms #include #endif +#include "sys/platform.h" +#include "framework/Licensee.h" +#include "framework/FileSystem.h" +#include "sys/posix/posix_public.h" +#include "sys/sys_local.h" + +#include "sys/linux/local.h" + static idStr basepath; static idStr savepath; diff --git a/neo/sys/osx/DOOMController.mm b/neo/sys/osx/DOOMController.mm index a8e5a1ea..ddbeb0a2 100644 --- a/neo/sys/osx/DOOMController.mm +++ b/neo/sys/osx/DOOMController.mm @@ -27,9 +27,6 @@ If you have questions concerning this license or the applicable additional terms */ // -*- mode: objc -*- -#import "../../idlib/precompiled.h" -#import "DOOMController.h" - #import #import @@ -38,14 +35,20 @@ If you have questions concerning this license or the applicable additional terms #import #import -#import "macosx_common.h" -#import "macosx_local.h" -#import "macosx_sys.h" - #import #import #import +#import "sys/platform.h" +#import "idlib/Str.h" +#import "framework/Licensee.h" +#import "framework/Common.h" +#import "sys/osx/macosx_common.h" +#import "sys/osx/macosx_local.h" +#import "sys/osx/macosx_sys.h" + +#import "DOOMController.h" + #define MAX_KEYS 256 static idStr savepath; diff --git a/neo/sys/osx/PickMonitor.cpp b/neo/sys/osx/PickMonitor.cpp index 8fae33a7..eb920c76 100644 --- a/neo/sys/osx/PickMonitor.cpp +++ b/neo/sys/osx/PickMonitor.cpp @@ -26,8 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#include +#include "sys/platform.h" #include "PickMonitor.h" //==================================================================================== diff --git a/neo/sys/osx/PickMonitor.h b/neo/sys/osx/PickMonitor.h index 2a19219c..8d67da1c 100644 --- a/neo/sys/osx/PickMonitor.h +++ b/neo/sys/osx/PickMonitor.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef PICKMONITOR_H #define PICKMONITOR_H +#include + OSStatus PickMonitor (DisplayIDType *inOutDisplayID, WindowRef parentWindow); Boolean CanUserPickMonitor (void); diff --git a/neo/sys/osx/PreferencesDialog.cpp b/neo/sys/osx/PreferencesDialog.cpp index d25ef98e..430fb31f 100644 --- a/neo/sys/osx/PreferencesDialog.cpp +++ b/neo/sys/osx/PreferencesDialog.cpp @@ -26,13 +26,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#include -#include "PreferencesDialog.h" -#include "PickMonitor.h" #include #include +#include "sys/platform.h" +#include "framework/CVarSystem.h" +#include "sys/osx/PickMonitor.h" + +#include "PreferencesDialog.h" + static idCVar r_stretched( "r_stretched", "0", CVAR_ARCHIVE | CVAR_BOOL, "Used stretched resolution" ); #define kPref_PrefsDialogAlways CFSTR("PrefsDialogAlways") diff --git a/neo/sys/osx/PreferencesDialog.h b/neo/sys/osx/PreferencesDialog.h index dd56ef06..4f96509a 100644 --- a/neo/sys/osx/PreferencesDialog.h +++ b/neo/sys/osx/PreferencesDialog.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef PREFERENCESDIALOG_H #define PREFERENCESDIALOG_H +#include + enum GameDisplayMode { kInactive, @@ -68,5 +70,4 @@ OSStatus RunGameDisplayPreferencesDialog( GameDisplayInfo *outGDInfo, WindowRef inWindow); - #endif // PREFERENCESDIALOG_H diff --git a/neo/sys/osx/macosx_event.mm b/neo/sys/osx/macosx_event.mm index c95a3b20..81910dc0 100644 --- a/neo/sys/osx/macosx_event.mm +++ b/neo/sys/osx/macosx_event.mm @@ -27,11 +27,6 @@ If you have questions concerning this license or the applicable additional terms */ // -*- mode: objc -*- -#import "../../idlib/precompiled.h" - -#import "macosx_local.h" -#import "macosx_sys.h" - #import #import #import @@ -49,7 +44,13 @@ If you have questions concerning this license or the applicable additional terms #import #import #import -#include +#import + +#import "sys/platform.h" +#import "framework/Common.h" +#import "framework/KeyInput.h" +#import "sys/osx/macosx_local.h" +#import "sys/osx/macosx_sys.h" static NSDate *distantPast = NULL; static bool inputActive = false; diff --git a/neo/sys/osx/macosx_glimp.mm b/neo/sys/osx/macosx_glimp.mm index ff04d70c..e292a1ee 100644 --- a/neo/sys/osx/macosx_glimp.mm +++ b/neo/sys/osx/macosx_glimp.mm @@ -27,16 +27,6 @@ If you have questions concerning this license or the applicable additional terms */ // -*- mode: objc -*- -#import "../../idlib/precompiled.h" - -#import "../../renderer/tr_local.h" - -#import "macosx_glimp.h" - -#import "macosx_local.h" -#import "macosx_sys.h" -#import "macosx_display.h" - #import #import @@ -44,6 +34,14 @@ If you have questions concerning this license or the applicable additional terms #import #import +#import "sys/platform.h" +#import "framework/Licensee.h" +#import "renderer/tr_local.h" +#import "sys/osx/macosx_glimp.h" +#import "sys/osx/macosx_local.h" +#import "sys/osx/macosx_sys.h" +#import "sys/osx/macosx_display.h" + static idCVar r_minDisplayRefresh( "r_minDisplayRefresh", "0", CVAR_ARCHIVE | CVAR_INTEGER, "" ); static idCVar r_maxDisplayRefresh( "r_maxDisplayRefresh", "0", CVAR_ARCHIVE | CVAR_INTEGER, "" ); static idCVar r_screen( "r_screen", "-1", CVAR_ARCHIVE | CVAR_INTEGER, "which display to use" ); diff --git a/neo/sys/osx/macosx_guids.cpp b/neo/sys/osx/macosx_guids.cpp index 79304260..78e6bcf3 100644 --- a/neo/sys/osx/macosx_guids.cpp +++ b/neo/sys/osx/macosx_guids.cpp @@ -1,6 +1,5 @@ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" #define INITGUID -#include "../../sound/snd_local.h" +#include "sound/snd_local.h" diff --git a/neo/sys/osx/macosx_local.h b/neo/sys/osx/macosx_local.h index e72ceb27..4806dacc 100644 --- a/neo/sys/osx/macosx_local.h +++ b/neo/sys/osx/macosx_local.h @@ -1,7 +1,7 @@ #include -#include "../sys_public.h" +#include "sys/sys_public.h" void OutputDebugString( const char *text ); diff --git a/neo/sys/osx/macosx_misc.mm b/neo/sys/osx/macosx_misc.mm index a964685a..d46668ed 100644 --- a/neo/sys/osx/macosx_misc.mm +++ b/neo/sys/osx/macosx_misc.mm @@ -29,8 +29,9 @@ If you have questions concerning this license or the applicable additional terms #define GL_GLEXT_LEGACY // AppKit.h include pulls in gl.h already #import #import -#include "../../idlib/precompiled.h" -#include "../sys_local.h" + +#include "sys/platform.h" +#include "sys/sys_local.h" /* ================== diff --git a/neo/sys/osx/macosx_sys.h b/neo/sys/osx/macosx_sys.h index 0968726b..f16eab11 100644 --- a/neo/sys/osx/macosx_sys.h +++ b/neo/sys/osx/macosx_sys.h @@ -1,4 +1,4 @@ -#import "../posix/posix_public.h" +#import "sys/posix/posix_public.h" #import @class NSEvent, NSOpenGLContext, NSWindow; diff --git a/neo/sys/osx/macosx_sys.mm b/neo/sys/osx/macosx_sys.mm index 872fc417..e1268c0c 100644 --- a/neo/sys/osx/macosx_sys.mm +++ b/neo/sys/osx/macosx_sys.mm @@ -27,24 +27,22 @@ If you have questions concerning this license or the applicable additional terms */ // -*- mode: objc -*- -#import "../../idlib/precompiled.h" - -#import "macosx_local.h" -#import "macosx_sys.h" - -#import "macosx_common.h" -#import "dlfcn.h" - #import #import -#import #import #import #import +#import +#import + +#import "sys/platform.h" +#import "sys/osx/macosx_common.h" +#import "sys/osx/macosx_local.h" +#import "sys/osx/macosx_sys.h" #ifdef OMNI_TIMER -#import "macosx_timers.h" +#import "sys/osx/macosx_timers.h" #endif void Sys_Init (void); diff --git a/neo/sys/osx/macosx_utils.mm b/neo/sys/osx/macosx_utils.mm index f714c328..036d82cb 100644 --- a/neo/sys/osx/macosx_utils.mm +++ b/neo/sys/osx/macosx_utils.mm @@ -27,17 +27,13 @@ If you have questions concerning this license or the applicable additional terms */ // -*- mode: objc -*- -#import "../../idlib/precompiled.h" - #import #import #import - -#define CD_MOUNT_NAME "DOOM" - -#include "macosx_local.h" -#include "macosx_sys.h" +#import "sys/platform.h" +#import "sys/osx/macosx_local.h" +#import "sys/osx/macosx_sys.h" //extern "C" void *vm_allocate(unsigned, unsigned*, unsigned, int); //extern "C" void vm_deallocate(unsigned, unsigned*, unsigned); diff --git a/neo/sys/posix/posix_input.cpp b/neo/sys/posix/posix_input.cpp index ec4e5f13..f36bcce5 100644 --- a/neo/sys/posix/posix_input.cpp +++ b/neo/sys/posix/posix_input.cpp @@ -25,8 +25,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#include "posix_public.h" +#include "sys/platform.h" +#include "framework/Common.h" + +#include "sys/posix/posix_public.h" typedef struct poll_keyboard_event_s { diff --git a/neo/sys/posix/posix_main.cpp b/neo/sys/posix/posix_main.cpp index 555528dc..314cbaf2 100644 --- a/neo/sys/posix/posix_main.cpp +++ b/neo/sys/posix/posix_main.cpp @@ -25,8 +25,6 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#include "../sys_local.h" #include #include @@ -42,7 +40,13 @@ If you have questions concerning this license or the applicable additional terms #include #include -#include "posix_public.h" +#include "sys/platform.h" +#include "idlib/containers/StrList.h" +#include "framework/KeyInput.h" +#include "framework/EditField.h" +#include "sys/sys_local.h" + +#include "sys/posix/posix_public.h" #define MAX_OSPATH 256 #define COMMAND_HISTORY 64 diff --git a/neo/sys/posix/posix_net.cpp b/neo/sys/posix/posix_net.cpp index 43b180a5..8d6f4549 100644 --- a/neo/sys/posix/posix_net.cpp +++ b/neo/sys/posix/posix_net.cpp @@ -44,7 +44,12 @@ If you have questions concerning this license or the applicable additional terms #include #endif -#include "../../idlib/precompiled.h" +#include "sys/platform.h" +#include "framework/Common.h" +#include "framework/CVarSystem.h" +#include "sys/sys_public.h" + +#include "sys/posix/posix_public.h" idPort clientPort, serverPort; diff --git a/neo/sys/posix/posix_public.h b/neo/sys/posix/posix_public.h index 01a4c7c1..b50b3e3d 100644 --- a/neo/sys/posix/posix_public.h +++ b/neo/sys/posix/posix_public.h @@ -31,6 +31,8 @@ If you have questions concerning this license or the applicable additional terms #include +#include "sys/sys_public.h" + void Posix_QueEvent( sysEventType_t type, int value, int value2, int ptrLength, void *ptr ); const char* Posix_Cwd( void ); diff --git a/neo/sys/posix/posix_signal.cpp b/neo/sys/posix/posix_signal.cpp index ad038837..6e19e993 100644 --- a/neo/sys/posix/posix_signal.cpp +++ b/neo/sys/posix/posix_signal.cpp @@ -25,13 +25,16 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#include "posix_public.h" #include #include #include +#include "sys/platform.h" +#include "framework/Common.h" + +#include "sys/posix/posix_public.h" + const int siglist[] = { SIGHUP, SIGQUIT, diff --git a/neo/sys/posix/posix_threads.cpp b/neo/sys/posix/posix_threads.cpp index cbc78379..07cd6411 100644 --- a/neo/sys/posix/posix_threads.cpp +++ b/neo/sys/posix/posix_threads.cpp @@ -36,8 +36,10 @@ If you have questions concerning this license or the applicable additional terms #include #include -#include "../../idlib/precompiled.h" -#include "posix_public.h" +#include "sys/platform.h" +#include "framework/Common.h" + +#include "sys/posix/posix_public.h" #if defined(_DEBUG) // #define ID_VERBOSE_PTHREADS diff --git a/neo/sys/stub/openal_stub.cpp b/neo/sys/stub/openal_stub.cpp index acfcf935..c1a17b87 100644 --- a/neo/sys/stub/openal_stub.cpp +++ b/neo/sys/stub/openal_stub.cpp @@ -25,8 +25,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#include "../../sound/snd_local.h" + +#include "sys/platform.h" + +#include "sound/snd_local.h" AL_API ALenum AL_APIENTRY alGetError() { return AL_NO_ERROR; diff --git a/neo/sys/stub/stub_gl.cpp b/neo/sys/stub/stub_gl.cpp index 79fcfd0d..f22c176a 100644 --- a/neo/sys/stub/stub_gl.cpp +++ b/neo/sys/stub/stub_gl.cpp @@ -25,10 +25,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" -#include "../../renderer/tr_local.h" +#include "renderer/tr_local.h" void glAccum(GLenum op, GLfloat value){}; void glAlphaFunc(GLenum func, GLclampf ref){}; diff --git a/neo/sys/stub/sys_stub.cpp b/neo/sys/stub/sys_stub.cpp index 5dba9c0e..e312dcfb 100644 --- a/neo/sys/stub/sys_stub.cpp +++ b/neo/sys/stub/sys_stub.cpp @@ -25,8 +25,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" #include #include diff --git a/neo/sys/stub/util_stub.cpp b/neo/sys/stub/util_stub.cpp index 99e710e8..f100dfb2 100644 --- a/neo/sys/stub/util_stub.cpp +++ b/neo/sys/stub/util_stub.cpp @@ -26,8 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" void EditorPrintConsole(const char *msg) { } diff --git a/neo/sys/sys_local.cpp b/neo/sys/sys_local.cpp index 236391c8..7b8ecd40 100644 --- a/neo/sys/sys_local.cpp +++ b/neo/sys/sys_local.cpp @@ -26,9 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "sys_local.h" +#include "sys/platform.h" +#include "framework/KeyInput.h" + +#include "sys/sys_local.h" const char * sysLanguageNames[] = { "english", "spanish", "italian", "german", "french", "russian", diff --git a/neo/sys/sys_local.h b/neo/sys/sys_local.h index 12275f99..078330c3 100644 --- a/neo/sys/sys_local.h +++ b/neo/sys/sys_local.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SYS_LOCAL__ #define __SYS_LOCAL__ +#include "renderer/RenderSystem.h" +#include "sound/sound.h" + /* ============================================================== diff --git a/neo/sys/win32/rc/CreateResourceIDs.cpp b/neo/sys/win32/rc/CreateResourceIDs.cpp index dc2523e7..66b0bdbb 100644 --- a/neo/sys/win32/rc/CreateResourceIDs.cpp +++ b/neo/sys/win32/rc/CreateResourceIDs.cpp @@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../../idlib/precompiled.h" +#include "sys/platform.h" #pragma hdrstop diff --git a/neo/sys/win32/win_cpu.cpp b/neo/sys/win32/win_cpu.cpp index e3dc40e0..36b0159f 100644 --- a/neo/sys/win32/win_cpu.cpp +++ b/neo/sys/win32/win_cpu.cpp @@ -26,11 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop - -#include "win_local.h" +#include "sys/platform.h" +#include "sys/win32/win_local.h" /* ============================================================== diff --git a/neo/sys/win32/win_gamma.cpp b/neo/sys/win32/win_gamma.cpp index d8095bc5..7ab7e873 100644 --- a/neo/sys/win32/win_gamma.cpp +++ b/neo/sys/win32/win_gamma.cpp @@ -28,9 +28,12 @@ If you have questions concerning this license or the applicable additional terms /* ** WIN_GAMMA.C */ + #include -#include "win_local.h" -#include "../../renderer/tr_local.h" + +#include "renderer/tr_local.h" + +#include "sys/win32/win_local.h" static unsigned short s_oldHardwareGamma[3][256]; diff --git a/neo/sys/win32/win_glimp.cpp b/neo/sys/win32/win_glimp.cpp index 80310c65..edbda0d6 100644 --- a/neo/sys/win32/win_glimp.cpp +++ b/neo/sys/win32/win_glimp.cpp @@ -40,17 +40,17 @@ If you have questions concerning this license or the applicable additional terms ** Note that the GLW_xxx functions are Windows specific GL-subsystem ** related functions that are relevant ONLY to win_glimp.c */ -#include "../../idlib/precompiled.h" -#pragma hdrstop -#include "win_local.h" -#include "rc/AFEditor_resource.h" -#include "rc/doom_resource.h" -#include "../../renderer/tr_local.h" +#include "sys/platform.h" +#include "framework/Licensee.h" +#include "sys/win32/rc/AFEditor_resource.h" +#include "sys/win32/rc/doom_resource.h" +#include "renderer/tr_local.h" + +#include "sys/win32/win_local.h" static void GLW_InitExtensions( void ); - // WGL_ARB_extensions_string PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetExtensionsStringARB; @@ -74,8 +74,6 @@ PFNWGLBINDTEXIMAGEARBPROC wglBindTexImageARB; PFNWGLRELEASETEXIMAGEARBPROC wglReleaseTexImageARB; PFNWGLSETPBUFFERATTRIBARBPROC wglSetPbufferAttribARB; - - /* ARB_pixel_format */ #define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 #define WGL_DRAW_TO_WINDOW_ARB 0x2001 diff --git a/neo/sys/win32/win_input.cpp b/neo/sys/win32/win_input.cpp index 9c02ab76..74a053dd 100644 --- a/neo/sys/win32/win_input.cpp +++ b/neo/sys/win32/win_input.cpp @@ -26,11 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop - -#include "win_local.h" +#include "sys/platform.h" +#include "framework/Common.h" +#include "framework/KeyInput.h" +#include "sys/win32/win_local.h" #define DINPUT_BUFFERSIZE 256 diff --git a/neo/sys/win32/win_local.h b/neo/sys/win32/win_local.h index baa62f9d..df29ba6b 100644 --- a/neo/sys/win32/win_local.h +++ b/neo/sys/win32/win_local.h @@ -29,8 +29,24 @@ If you have questions concerning this license or the applicable additional terms #ifndef __WIN_LOCAL_H__ #define __WIN_LOCAL_H__ -#include -#include "../../renderer/wglext.h" // windows OpenGL extensions +#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" +#endif + +#define WIN32_LEAN_AND_MEAN +#include +#include +#include + +#define DIRECTINPUT_VERSION 0x0800 // was 0x0700 with the old mssdk +#include + +#include + +#include "framework/CVarSystem.h" +#include "renderer/wglext.h" // windows OpenGL extensions +#include "sys/sys_public.h" // WGL_ARB_extensions_string extern PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetExtensionsStringARB; diff --git a/neo/sys/win32/win_main.cpp b/neo/sys/win32/win_main.cpp index 5067efa8..4a814e6a 100644 --- a/neo/sys/win32/win_main.cpp +++ b/neo/sys/win32/win_main.cpp @@ -26,8 +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/CmdArgs.h" +#include "framework/async/AsyncNetwork.h" +#include "framework/Licensee.h" +#include "framework/UsercmdGen.h" +#include "renderer/tr_local.h" +#include "sys/win32/rc/CreateResourceIDs.h" +#include "sys/sys_local.h" + +#include "sys/win32/win_local.h" #include #include @@ -42,11 +50,6 @@ If you have questions concerning this license or the applicable additional terms #include #endif -#include "../sys_local.h" -#include "win_local.h" -#include "rc/CreateResourceIDs.h" -#include "../../renderer/tr_local.h" - idCVar Win32Vars_t::sys_arch( "sys_arch", "", CVAR_SYSTEM | CVAR_INIT, "" ); idCVar Win32Vars_t::sys_cpustring( "sys_cpustring", "detect", CVAR_SYSTEM | CVAR_INIT, "" ); idCVar Win32Vars_t::in_mouse( "in_mouse", "1", CVAR_SYSTEM | CVAR_BOOL, "enable mouse input" ); diff --git a/neo/sys/win32/win_net.cpp b/neo/sys/win32/win_net.cpp index 0b5ccf02..37de6ad0 100644 --- a/neo/sys/win32/win_net.cpp +++ b/neo/sys/win32/win_net.cpp @@ -25,14 +25,15 @@ 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 "sys/win32/win_local.h" #include #include -#include "win_local.h" - static WSADATA winsockdata; static bool winsockInitialized = false; static bool usingSocks = false; diff --git a/neo/sys/win32/win_qgl.cpp b/neo/sys/win32/win_qgl.cpp index 9ae02d7d..d68f680a 100644 --- a/neo/sys/win32/win_qgl.cpp +++ b/neo/sys/win32/win_qgl.cpp @@ -35,13 +35,13 @@ If you have questions concerning this license or the applicable additional terms ** QGL_Init() - loads libraries, assigns function pointers, etc. ** QGL_Shutdown() - unloads libraries, NULLs function pointers */ -#include "../../idlib/precompiled.h" -#pragma hdrstop #include -#include "win_local.h" -#include "../../renderer/tr_local.h" +#include "sys/platform.h" +#include "renderer/tr_local.h" + +#include "sys/win32/win_local.h" int ( WINAPI * qwglChoosePixelFormat )(HDC, CONST PIXELFORMATDESCRIPTOR *); int ( WINAPI * qwglDescribePixelFormat) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR); diff --git a/neo/sys/win32/win_shared.cpp b/neo/sys/win32/win_shared.cpp index d5df2801..09243850 100644 --- a/neo/sys/win32/win_shared.cpp +++ b/neo/sys/win32/win_shared.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 "sys/win32/win_local.h" -#include "win_local.h" #include #include #include diff --git a/neo/sys/win32/win_syscon.cpp b/neo/sys/win32/win_syscon.cpp index 61f3d22d..1ccb0da3 100644 --- a/neo/sys/win32/win_syscon.cpp +++ b/neo/sys/win32/win_syscon.cpp @@ -26,8 +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 "framework/Licensee.h" +#include "framework/Common.h" +#include "framework/KeyInput.h" +#include "framework/EditField.h" +#include "sys/win32/rc/AFEditor_resource.h" +#include "sys/win32/rc/doom_resource.h" + +#include "sys/win32/win_local.h" #include #include @@ -37,10 +44,6 @@ If you have questions concerning this license or the applicable additional terms #include #include -#include "win_local.h" -#include "rc/AFEditor_resource.h" -#include "rc/doom_resource.h" - #define COPY_ID 1 #define QUIT_ID 2 #define CLEAR_ID 3 diff --git a/neo/sys/win32/win_taskkeyhook.cpp b/neo/sys/win32/win_taskkeyhook.cpp index 3f8ad4bc..6b3360f0 100644 --- a/neo/sys/win32/win_taskkeyhook.cpp +++ b/neo/sys/win32/win_taskkeyhook.cpp @@ -26,19 +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 "sys/win32/win_local.h" // // This file implements the low-level keyboard hook that traps the task keys. // -//#define _WIN32_WINNT 0x0500 // for KBDLLHOOKSTRUCT -#include -#include "win_local.h" - -#define DLLEXPORT __declspec(dllexport) - // Magic registry key/value for "Remove Task Manager" policy. LPCTSTR KEY_DisableTaskMgr = "Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\System"; LPCTSTR VAL_DisableTaskMgr = "DisableTaskMgr"; diff --git a/neo/sys/win32/win_wndproc.cpp b/neo/sys/win32/win_wndproc.cpp index f89b81a2..27fbdedd 100644 --- a/neo/sys/win32/win_wndproc.cpp +++ b/neo/sys/win32/win_wndproc.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 "framework/Session.h" +#include "framework/KeyInput.h" +#include "renderer/tr_local.h" -#include "win_local.h" -#include "../../renderer/tr_local.h" +#include "sys/win32/win_local.h" LONG WINAPI MainWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); diff --git a/neo/tools/compilers/aas/AASBuild.cpp b/neo/tools/compilers/aas/AASBuild.cpp index c8efc273..d6244aae 100644 --- a/neo/tools/compilers/aas/AASBuild.cpp +++ b/neo/tools/compilers/aas/AASBuild.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/FileSystem.h" +#include "framework/Game.h" +#include "renderer/RenderWorld.h" -#include "AASBuild_local.h" +#include "tools/compilers/aas/AASBuild_local.h" #define BFL_PATCH 0x1000 diff --git a/neo/tools/compilers/aas/AASBuild_file.cpp b/neo/tools/compilers/aas/AASBuild_file.cpp index ecc350c2..28838098 100644 --- a/neo/tools/compilers/aas/AASBuild_file.cpp +++ b/neo/tools/compilers/aas/AASBuild_file.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 "AASBuild_local.h" +#include "tools/compilers/aas/AASBuild_local.h" #define VERTEX_HASH_BOXSIZE (1<<6) // must be power of 2 #define VERTEX_HASH_SIZE (VERTEX_HASH_BOXSIZE*VERTEX_HASH_BOXSIZE) diff --git a/neo/tools/compilers/aas/AASBuild_gravity.cpp b/neo/tools/compilers/aas/AASBuild_gravity.cpp index 63638ba2..707cbb11 100644 --- a/neo/tools/compilers/aas/AASBuild_gravity.cpp +++ b/neo/tools/compilers/aas/AASBuild_gravity.cpp @@ -26,11 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../../idlib/precompiled.h" -#pragma hdrstop - -#include "AASBuild_local.h" +#include "sys/platform.h" +#include "tools/compilers/aas/AASBuild_local.h" /* ============ diff --git a/neo/tools/compilers/aas/AASBuild_ledge.cpp b/neo/tools/compilers/aas/AASBuild_ledge.cpp index b1aaec52..f4111908 100644 --- a/neo/tools/compilers/aas/AASBuild_ledge.cpp +++ b/neo/tools/compilers/aas/AASBuild_ledge.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 "AASBuild_local.h" +#include "tools/compilers/aas/AASBuild_local.h" #define LEDGE_EPSILON 0.1f diff --git a/neo/tools/compilers/aas/AASBuild_local.h b/neo/tools/compilers/aas/AASBuild_local.h index bc8b2869..f6e92042 100644 --- a/neo/tools/compilers/aas/AASBuild_local.h +++ b/neo/tools/compilers/aas/AASBuild_local.h @@ -29,14 +29,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __AASBUILD_LOCAL_H__ #define __AASBUILD_LOCAL_H__ -#include "AASFile.h" -#include "AASFile_local.h" - -#include "Brush.h" -#include "BrushBSP.h" -#include "AASReach.h" -#include "AASCluster.h" - +#include "tools/compilers/aas/Brush.h" +#include "tools/compilers/aas/BrushBSP.h" +#include "tools/compilers/aas/AASFile.h" +#include "tools/compilers/aas/AASReach.h" +#include "tools/compilers/aas/AASCluster.h" +#include "tools/compilers/aas/AASFile_local.h" //=============================================================== // diff --git a/neo/tools/compilers/aas/AASBuild_merge.cpp b/neo/tools/compilers/aas/AASBuild_merge.cpp index 96cd7fdb..6de5132e 100644 --- a/neo/tools/compilers/aas/AASBuild_merge.cpp +++ b/neo/tools/compilers/aas/AASBuild_merge.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 "AASBuild_local.h" +#include "tools/compilers/aas/AASBuild_local.h" /* ============ diff --git a/neo/tools/compilers/aas/AASCluster.cpp b/neo/tools/compilers/aas/AASCluster.cpp index 2f07374e..0b1d2f3c 100644 --- a/neo/tools/compilers/aas/AASCluster.cpp +++ b/neo/tools/compilers/aas/AASCluster.cpp @@ -26,13 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../../idlib/precompiled.h" -#pragma hdrstop - -#include "AASFile.h" -#include "AASFile_local.h" -#include "AASCluster.h" +#include "sys/platform.h" +#include "tools/compilers/aas/AASFile_local.h" +#include "tools/compilers/aas/AASCluster.h" /* ================ diff --git a/neo/tools/compilers/aas/AASCluster.h b/neo/tools/compilers/aas/AASCluster.h index 4cd7611e..5795d9af 100644 --- a/neo/tools/compilers/aas/AASCluster.h +++ b/neo/tools/compilers/aas/AASCluster.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __AASCLUSTER_H__ #define __AASCLUSTER_H__ +#include "tools/compilers/aas/AASBuild_local.h" + /* =============================================================================== diff --git a/neo/tools/compilers/aas/AASFile.cpp b/neo/tools/compilers/aas/AASFile.cpp index 7cf75de9..e6f2ba13 100644 --- a/neo/tools/compilers/aas/AASFile.cpp +++ b/neo/tools/compilers/aas/AASFile.cpp @@ -26,12 +26,11 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../../idlib/precompiled.h" -#pragma hdrstop - -#include "AASFile.h" -#include "AASFile_local.h" +#include "sys/platform.h" +#include "framework/FileSystem.h" +#include "framework/DeclEntityDef.h" +#include "tools/compilers/aas/AASFile_local.h" /* =============================================================================== diff --git a/neo/tools/compilers/aas/AASFile.h b/neo/tools/compilers/aas/AASFile.h index d066f6e2..9ae001c3 100644 --- a/neo/tools/compilers/aas/AASFile.h +++ b/neo/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/neo/tools/compilers/aas/AASFileManager.cpp b/neo/tools/compilers/aas/AASFileManager.cpp index e66a6d9e..1a894984 100644 --- a/neo/tools/compilers/aas/AASFileManager.cpp +++ b/neo/tools/compilers/aas/AASFileManager.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 "tools/compilers/aas/AASFileManager.h" -#include "AASFile.h" -#include "AASFile_local.h" +#include "tools/compilers/aas/AASFile_local.h" /* =============================================================================== diff --git a/neo/tools/compilers/aas/AASFileManager.h b/neo/tools/compilers/aas/AASFileManager.h index a3abaf82..eb10a5f3 100644 --- a/neo/tools/compilers/aas/AASFileManager.h +++ b/neo/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/neo/tools/compilers/aas/AASFile_local.h b/neo/tools/compilers/aas/AASFile_local.h index 110e60f0..cb91cf5e 100644 --- a/neo/tools/compilers/aas/AASFile_local.h +++ b/neo/tools/compilers/aas/AASFile_local.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __AASFILELOCAL_H__ #define __AASFILELOCAL_H__ +#include "tools/compilers/aas/AASFile.h" + /* =============================================================================== diff --git a/neo/tools/compilers/aas/AASFile_optimize.cpp b/neo/tools/compilers/aas/AASFile_optimize.cpp index 7a25d315..4d282757 100644 --- a/neo/tools/compilers/aas/AASFile_optimize.cpp +++ b/neo/tools/compilers/aas/AASFile_optimize.cpp @@ -26,12 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../../idlib/precompiled.h" -#pragma hdrstop - -#include "AASFile.h" -#include "AASFile_local.h" +#include "sys/platform.h" +#include "tools/compilers/aas/AASFile_local.h" //=============================================================== // diff --git a/neo/tools/compilers/aas/AASFile_sample.cpp b/neo/tools/compilers/aas/AASFile_sample.cpp index 907d383a..3e9275b1 100644 --- a/neo/tools/compilers/aas/AASFile_sample.cpp +++ b/neo/tools/compilers/aas/AASFile_sample.cpp @@ -26,12 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../../idlib/precompiled.h" -#pragma hdrstop - -#include "AASFile.h" -#include "AASFile_local.h" +#include "sys/platform.h" +#include "framework/Common.h" +#include "tools/compilers/aas/AASFile_local.h" //=============================================================== // diff --git a/neo/tools/compilers/aas/AASReach.cpp b/neo/tools/compilers/aas/AASReach.cpp index 5f9cf9c0..7964251d 100644 --- a/neo/tools/compilers/aas/AASReach.cpp +++ b/neo/tools/compilers/aas/AASReach.cpp @@ -26,12 +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 "AASFile.h" -#include "AASFile_local.h" -#include "AASReach.h" +#include "tools/compilers/aas/AASReach.h" #define INSIDEUNITS 2.0f #define INSIDEUNITS_WALKEND 0.5f @@ -40,7 +37,6 @@ If you have questions concerning this license or the applicable additional terms #define INSIDEUNITS_FLYEND 0.5f #define INSIDEUNITS_WATERJUMP 15.0f - /* ================ idAASReach::ReachabilityExists diff --git a/neo/tools/compilers/aas/AASReach.h b/neo/tools/compilers/aas/AASReach.h index 2545f0ca..bcae3b53 100644 --- a/neo/tools/compilers/aas/AASReach.h +++ b/neo/tools/compilers/aas/AASReach.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __AASREACH_H__ #define __AASREACH_H__ +#include "idlib/MapFile.h" +#include "tools/compilers/aas/AASFile_local.h" + /* =============================================================================== diff --git a/neo/tools/compilers/aas/Brush.cpp b/neo/tools/compilers/aas/Brush.cpp index 2c5fbbb4..05cc1b4c 100644 --- a/neo/tools/compilers/aas/Brush.cpp +++ b/neo/tools/compilers/aas/Brush.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 "idlib/MapFile.h" +#include "framework/Common.h" +#include "framework/FileSystem.h" -#include "Brush.h" +#include "tools/compilers/aas/Brush.h" #define BRUSH_EPSILON 0.1f #define BRUSH_PLANE_NORMAL_EPSILON 0.00001f diff --git a/neo/tools/compilers/aas/Brush.h b/neo/tools/compilers/aas/Brush.h index 879b4559..ac1b261e 100644 --- a/neo/tools/compilers/aas/Brush.h +++ b/neo/tools/compilers/aas/Brush.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __BRUSH_H__ #define __BRUSH_H__ +#include "idlib/containers/PlaneSet.h" +#include "idlib/geometry/Winding.h" + /* =============================================================================== diff --git a/neo/tools/compilers/aas/BrushBSP.cpp b/neo/tools/compilers/aas/BrushBSP.cpp index 7cbe1075..f35ac19c 100644 --- a/neo/tools/compilers/aas/BrushBSP.cpp +++ b/neo/tools/compilers/aas/BrushBSP.cpp @@ -26,12 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../../idlib/precompiled.h" -#pragma hdrstop - -#include "Brush.h" -#include "BrushBSP.h" +#include "sys/platform.h" +#include "framework/FileSystem.h" +#include "tools/compilers/aas/BrushBSP.h" #define BSP_GRID_SIZE 512.0f #define SPLITTER_EPSILON 0.1f @@ -43,7 +41,6 @@ If you have questions concerning this license or the applicable additional terms //#define OUPUT_BSP_STATS_PER_GRID_CELL - //=============================================================== // // idBrushBSPPortal diff --git a/neo/tools/compilers/aas/BrushBSP.h b/neo/tools/compilers/aas/BrushBSP.h index c21d1ec7..e45a1158 100644 --- a/neo/tools/compilers/aas/BrushBSP.h +++ b/neo/tools/compilers/aas/BrushBSP.h @@ -29,6 +29,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __BRUSHBSP_H__ #define __BRUSHBSP_H__ +#include "idlib/containers/VectorSet.h" +#include "idlib/containers/StrList.h" +#include "idlib/geometry/Winding.h" +#include "idlib/MapFile.h" +#include "tools/compilers/aas/Brush.h" + /* =============================================================================== diff --git a/neo/tools/compilers/compiler_public.h b/neo/tools/compilers/compiler_public.h index cdb8d30e..945d7bc0 100644 --- a/neo/tools/compilers/compiler_public.h +++ b/neo/tools/compilers/compiler_public.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __COMPILER_PUBLIC_H__ #define __COMPILER_PUBLIC_H__ +#include "idlib/CmdArgs.h" + /* =============================================================================== diff --git a/neo/tools/compilers/dmap/dmap.cpp b/neo/tools/compilers/dmap/dmap.cpp index 916e134a..45f53c1b 100644 --- a/neo/tools/compilers/dmap/dmap.cpp +++ b/neo/tools/compilers/dmap/dmap.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 "tools/compilers/dmap/dmap.h" -#include "dmap.h" +#include "tools/compilers/compiler_public.h" dmapGlobals_t dmapGlobals; diff --git a/neo/tools/compilers/dmap/dmap.h b/neo/tools/compilers/dmap/dmap.h index f8274761..c95459b8 100644 --- a/neo/tools/compilers/dmap/dmap.h +++ b/neo/tools/compilers/dmap/dmap.h @@ -26,8 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../../renderer/tr_local.h" - +#include "idlib/containers/PlaneSet.h" +#include "idlib/MapFile.h" +#include "cm/CollisionModel.h" +#include "renderer/tr_local.h" typedef struct primitive_s { struct primitive_s *next; diff --git a/neo/tools/compilers/dmap/facebsp.cpp b/neo/tools/compilers/dmap/facebsp.cpp index d09e41d6..3e2016a0 100644 --- a/neo/tools/compilers/dmap/facebsp.cpp +++ b/neo/tools/compilers/dmap/facebsp.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 "dmap.h" +#include "tools/compilers/dmap/dmap.h" int c_faceLeafs; diff --git a/neo/tools/compilers/dmap/gldraw.cpp b/neo/tools/compilers/dmap/gldraw.cpp index 383052fa..b9e6c590 100644 --- a/neo/tools/compilers/dmap/gldraw.cpp +++ b/neo/tools/compilers/dmap/gldraw.cpp @@ -26,19 +26,16 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../../idlib/precompiled.h" -#pragma hdrstop - -#include "dmap.h" +#include "sys/platform.h" +#include "tools/compilers/dmap/dmap.h" #ifdef WIN32 -#include +#include "sys/win32/win_local.h" + #include #include //#include -#define WIN_SIZE 1024 - void Draw_ClearWindow( void ) { if ( !dmapGlobals.drawflag ) { diff --git a/neo/tools/compilers/dmap/glfile.cpp b/neo/tools/compilers/dmap/glfile.cpp index b470007a..8f1d4228 100644 --- a/neo/tools/compilers/dmap/glfile.cpp +++ b/neo/tools/compilers/dmap/glfile.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 "dmap.h" +#include "tools/compilers/dmap/dmap.h" int c_glfaces; diff --git a/neo/tools/compilers/dmap/leakfile.cpp b/neo/tools/compilers/dmap/leakfile.cpp index b9d0bb67..a162e8d7 100644 --- a/neo/tools/compilers/dmap/leakfile.cpp +++ b/neo/tools/compilers/dmap/leakfile.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 "dmap.h" +#include "tools/compilers/dmap/dmap.h" /* ============================================================================== diff --git a/neo/tools/compilers/dmap/map.cpp b/neo/tools/compilers/dmap/map.cpp index 3c0b5398..8f48b3de 100644 --- a/neo/tools/compilers/dmap/map.cpp +++ b/neo/tools/compilers/dmap/map.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/Game.h" -#include "dmap.h" +#include "tools/compilers/dmap/dmap.h" /* diff --git a/neo/tools/compilers/dmap/optimize.cpp b/neo/tools/compilers/dmap/optimize.cpp index 07d67440..c0747f5d 100644 --- a/neo/tools/compilers/dmap/optimize.cpp +++ b/neo/tools/compilers/dmap/optimize.cpp @@ -26,17 +26,17 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" //#pragma optimize( "", off ) -#include "dmap.h" #ifdef WIN32 #include #include #endif +#include "tools/compilers/dmap/dmap.h" + /* New vertexes will be created where edges cross. diff --git a/neo/tools/compilers/dmap/output.cpp b/neo/tools/compilers/dmap/output.cpp index 332efe60..7ed6565c 100644 --- a/neo/tools/compilers/dmap/output.cpp +++ b/neo/tools/compilers/dmap/output.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 "dmap.h" +#include "tools/compilers/dmap/dmap.h" //================================================================================= diff --git a/neo/tools/compilers/dmap/portals.cpp b/neo/tools/compilers/dmap/portals.cpp index 82855d86..51dafa4e 100644 --- a/neo/tools/compilers/dmap/portals.cpp +++ b/neo/tools/compilers/dmap/portals.cpp @@ -26,11 +26,9 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../../idlib/precompiled.h" -#pragma hdrstop - -#include "dmap.h" +#include "sys/platform.h" +#include "tools/compilers/dmap/dmap.h" interAreaPortal_t interAreaPortals[MAX_INTER_AREA_PORTALS]; int numInterAreaPortals; diff --git a/neo/tools/compilers/dmap/shadowopt3.cpp b/neo/tools/compilers/dmap/shadowopt3.cpp index 525169fe..c4dcb976 100644 --- a/neo/tools/compilers/dmap/shadowopt3.cpp +++ b/neo/tools/compilers/dmap/shadowopt3.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 "renderer/tr_local.h" -#include "dmap.h" -#include "../../../renderer/tr_local.h" +#include "tools/compilers/dmap/dmap.h" /* diff --git a/neo/tools/compilers/dmap/tritjunction.cpp b/neo/tools/compilers/dmap/tritjunction.cpp index 5983d810..1974aea7 100644 --- a/neo/tools/compilers/dmap/tritjunction.cpp +++ b/neo/tools/compilers/dmap/tritjunction.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 "renderer/ModelManager.h" -#include "dmap.h" +#include "tools/compilers/dmap/dmap.h" /* diff --git a/neo/tools/compilers/dmap/tritools.cpp b/neo/tools/compilers/dmap/tritools.cpp index b5e18bfe..3bd90b14 100644 --- a/neo/tools/compilers/dmap/tritools.cpp +++ b/neo/tools/compilers/dmap/tritools.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 "dmap.h" +#include "tools/compilers/dmap/dmap.h" /* diff --git a/neo/tools/compilers/dmap/ubrush.cpp b/neo/tools/compilers/dmap/ubrush.cpp index e456f659..4bd7a324 100644 --- a/neo/tools/compilers/dmap/ubrush.cpp +++ b/neo/tools/compilers/dmap/ubrush.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 "dmap.h" +#include "tools/compilers/dmap/dmap.h" int c_active_brushes; diff --git a/neo/tools/compilers/dmap/usurface.cpp b/neo/tools/compilers/dmap/usurface.cpp index 587b0bb6..884a4c66 100644 --- a/neo/tools/compilers/dmap/usurface.cpp +++ b/neo/tools/compilers/dmap/usurface.cpp @@ -26,11 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../../idlib/precompiled.h" -#pragma hdrstop - -#include "dmap.h" +#include "sys/platform.h" +#include "renderer/ModelManager.h" +#include "tools/compilers/dmap/dmap.h" #define TEXTURE_OFFSET_EQUAL_EPSILON 0.005 #define TEXTURE_VECTOR_EQUAL_EPSILON 0.001 diff --git a/neo/tools/compilers/renderbump/renderbump.cpp b/neo/tools/compilers/renderbump/renderbump.cpp index 9e865131..ac3992e8 100644 --- a/neo/tools/compilers/renderbump/renderbump.cpp +++ b/neo/tools/compilers/renderbump/renderbump.cpp @@ -26,18 +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 "renderer/ModelManager.h" +#include "renderer/tr_local.h" + +#include "tools/compilers/compiler_public.h" #ifdef WIN32 #include #include #include -#include "../../../sys/win32/win_local.h" +#include "sys/win32/win_local.h" #endif -#include "../../../renderer/tr_local.h" - /* render a normalmap tga file from an ase model for bump mapping diff --git a/neo/tools/compilers/roqvq/NSBitmapImageRep.cpp b/neo/tools/compilers/roqvq/NSBitmapImageRep.cpp index a35668af..a5b5726f 100644 --- a/neo/tools/compilers/roqvq/NSBitmapImageRep.cpp +++ b/neo/tools/compilers/roqvq/NSBitmapImageRep.cpp @@ -25,10 +25,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../../idlib/precompiled.h" -#pragma hdrstop -#include "roq.h" +#include "sys/platform.h" + +#include "tools/compilers/roqvq/roq.h" void R_LoadImage( const char *name, byte **pic, int *width, int *height, ID_TIME_T *timestamp, bool makePowerOf2 ); diff --git a/neo/tools/compilers/roqvq/codec.cpp b/neo/tools/compilers/roqvq/codec.cpp index ccb10565..9174e608 100644 --- a/neo/tools/compilers/roqvq/codec.cpp +++ b/neo/tools/compilers/roqvq/codec.cpp @@ -25,10 +25,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../../idlib/precompiled.h" -#pragma hdrstop -#include "codec.h" +#include "sys/platform.h" +#include "framework/FileSystem.h" +#include "framework/Session.h" + +#include "tools/compilers/roqvq/codec.h" float glimit( const float val ) { if (val<0) return 0; diff --git a/neo/tools/compilers/roqvq/codec.h b/neo/tools/compilers/roqvq/codec.h index d4f9b3ad..b148a4f9 100644 --- a/neo/tools/compilers/roqvq/codec.h +++ b/neo/tools/compilers/roqvq/codec.h @@ -28,6 +28,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __codec_h__ #define __codec_h__ +#include "tools/compilers/roqvq/gdefs.h" +#include "tools/compilers/roqvq/roq.h" +#include "tools/compilers/roqvq/quaddefs.h" + #define MAXERRORMAX 200 #define IPSIZE int const float MOTION_MIN = 1.0f; @@ -38,10 +42,6 @@ const float MIN_SNR = 3.0f; #define VQDATA double -#include "gdefs.h" -#include "roq.h" -#include "quaddefs.h" - class codec { public: codec(); diff --git a/neo/tools/compilers/roqvq/gdefs.h b/neo/tools/compilers/roqvq/gdefs.h index 5b6b3eb2..0d800abd 100644 --- a/neo/tools/compilers/roqvq/gdefs.h +++ b/neo/tools/compilers/roqvq/gdefs.h @@ -34,7 +34,6 @@ If you have questions concerning this license or the applicable additional terms typedef unsigned char byte; typedef unsigned short word; -#pragma once #define dabs(a) (((a)<0) ? -(a) : (a)) #define CLAMP(v,l,h) ((v)<(l) ? (l) : (v)>(h) ? (h) : v) diff --git a/neo/tools/compilers/roqvq/quaddefs.h b/neo/tools/compilers/roqvq/quaddefs.h index 1bb49d13..8d5c8d47 100644 --- a/neo/tools/compilers/roqvq/quaddefs.h +++ b/neo/tools/compilers/roqvq/quaddefs.h @@ -28,8 +28,6 @@ If you have questions concerning this license or the applicable additional terms #ifndef __quaddefs_h__ #define __quaddefs_h__ -#pragma once - #define DEP 0 #define FCC 1 #define CCC 2 diff --git a/neo/tools/compilers/roqvq/roq.cpp b/neo/tools/compilers/roqvq/roq.cpp index 0200b587..1439768c 100644 --- a/neo/tools/compilers/roqvq/roq.cpp +++ b/neo/tools/compilers/roqvq/roq.cpp @@ -25,11 +25,13 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../../idlib/precompiled.h" -#pragma hdrstop -#include "roq.h" -#include "codec.h" +#include "sys/platform.h" +#include "framework/FileSystem.h" +#include "framework/Session.h" + +#include "tools/compilers/roqvq/roq.h" +#include "tools/compilers/roqvq/codec.h" roq *theRoQ; // current roq file diff --git a/neo/tools/compilers/roqvq/roq.h b/neo/tools/compilers/roqvq/roq.h index 927d0dbf..f03a4ee8 100644 --- a/neo/tools/compilers/roqvq/roq.h +++ b/neo/tools/compilers/roqvq/roq.h @@ -28,14 +28,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __roq_h__ #define __roq_h__ -#include "gdefs.h" -#include "roqParam.h" -#include "quaddefs.h" - //#define JPEG_INTERNALS #include -#pragma once +#include "tools/compilers/roqvq/gdefs.h" +#include "tools/compilers/roqvq/roqParam.h" +#include "tools/compilers/roqvq/quaddefs.h" class codec; class roqParam; diff --git a/neo/tools/compilers/roqvq/roqParam.cpp b/neo/tools/compilers/roqvq/roqParam.cpp index 2a1cf098..57ec6d98 100644 --- a/neo/tools/compilers/roqvq/roqParam.cpp +++ b/neo/tools/compilers/roqvq/roqParam.cpp @@ -25,10 +25,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../../idlib/precompiled.h" -#pragma hdrstop -#include "roqParam.h" +#include "sys/platform.h" + +#include "tools/compilers/roqvq/roqParam.h" // // read a parameter file in (true I bloddy well had to do this again) (and yet again to c++) diff --git a/neo/tools/compilers/roqvq/roqParam.h b/neo/tools/compilers/roqvq/roqParam.h index 16ae4592..39d16e2a 100644 --- a/neo/tools/compilers/roqvq/roqParam.h +++ b/neo/tools/compilers/roqvq/roqParam.h @@ -28,8 +28,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __roqParam_h__ #define __roqParam_h__ -#include "gdefs.h" -#pragma once +#include "idlib/containers/StrList.h" +#include "framework/File.h" +#include "tools/compilers/roqvq/gdefs.h" class roqParam { diff --git a/neo/tools/edit_stub.cpp b/neo/tools/edit_stub.cpp index b9901d7f..b5a9d3f5 100644 --- a/neo/tools/edit_stub.cpp +++ b/neo/tools/edit_stub.cpp @@ -26,8 +26,8 @@ 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" void RadiantInit( void ) { common->Printf( "The level editor Radiant only runs on Win32\n" ); } void RadiantShutdown( void ) {} diff --git a/neo/tools/guied/GEWindowWrapper_stub.cpp b/neo/tools/guied/GEWindowWrapper_stub.cpp index 4587bc88..3d928b1c 100644 --- a/neo/tools/guied/GEWindowWrapper_stub.cpp +++ b/neo/tools/guied/GEWindowWrapper_stub.cpp @@ -25,16 +25,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../../idlib/precompiled.h" -#pragma hdrstop +#include "sys/platform.h" -#include "../../ui/EditWindow.h" -#include "../../ui/ListWindow.h" -#include "../../ui/BindWindow.h" -#include "../../ui/RenderWindow.h" -#include "../../ui/ChoiceWindow.h" +#include "ui/EditWindow.h" +#include "ui/ListWindow.h" +#include "ui/BindWindow.h" +#include "ui/RenderWindow.h" +#include "ui/ChoiceWindow.h" -#include "GEWindowWrapper.h" +#include "tools/guied/GEWindowWrapper.h" static rvGEWindowWrapper stub_wrap( NULL, rvGEWindowWrapper::WT_UNKNOWN ); diff --git a/neo/ui/BindWindow.cpp b/neo/ui/BindWindow.cpp index a3e9b8a6..3292be0f 100644 --- a/neo/ui/BindWindow.cpp +++ b/neo/ui/BindWindow.cpp @@ -26,14 +26,14 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "DeviceContext.h" -#include "Window.h" -#include "UserInterfaceLocal.h" -#include "BindWindow.h" +#include "sys/platform.h" +#include "idlib/LangDict.h" +#include "framework/KeyInput.h" +#include "ui/DeviceContext.h" +#include "ui/Window.h" +#include "ui/UserInterfaceLocal.h" +#include "ui/BindWindow.h" void idBindWindow::CommonInit() { bindName = ""; diff --git a/neo/ui/BindWindow.h b/neo/ui/BindWindow.h index 7dd9f035..7c4d1fa8 100644 --- a/neo/ui/BindWindow.h +++ b/neo/ui/BindWindow.h @@ -28,7 +28,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __BINDWINDOW_H #define __BINDWINDOW_H +#include "ui/Window.h" + class idUserInterfaceLocal; + class idBindWindow : public idWindow { public: idBindWindow(idUserInterfaceLocal *gui); diff --git a/neo/ui/ChoiceWindow.cpp b/neo/ui/ChoiceWindow.cpp index 277edc6f..96b5876c 100644 --- a/neo/ui/ChoiceWindow.cpp +++ b/neo/ui/ChoiceWindow.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/LangDict.h" +#include "framework/KeyInput.h" +#include "ui/DeviceContext.h" +#include "ui/Window.h" +#include "ui/UserInterfaceLocal.h" -#include "DeviceContext.h" -#include "Window.h" -#include "UserInterfaceLocal.h" -#include "ChoiceWindow.h" +#include "ui/ChoiceWindow.h" /* ============ diff --git a/neo/ui/ChoiceWindow.h b/neo/ui/ChoiceWindow.h index b18dff16..75f56d73 100644 --- a/neo/ui/ChoiceWindow.h +++ b/neo/ui/ChoiceWindow.h @@ -28,9 +28,11 @@ If you have questions concerning this license or the applicable additional terms #ifndef __CHOICEWINDOW_H #define __CHOICEWINDOW_H -#include "Window.h" +#include "idlib/containers/StrList.h" +#include "ui/Window.h" class idUserInterfaceLocal; + class idChoiceWindow : public idWindow { public: idChoiceWindow(idUserInterfaceLocal *gui); diff --git a/neo/ui/DeviceContext.cpp b/neo/ui/DeviceContext.cpp index a206738d..c5a85391 100644 --- a/neo/ui/DeviceContext.cpp +++ b/neo/ui/DeviceContext.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 "idlib/geometry/DrawVert.h" -#include "DeviceContext.h" +#include "ui/DeviceContext.h" idVec4 idDeviceContext::colorPurple; idVec4 idDeviceContext::colorOrange; diff --git a/neo/ui/DeviceContext.h b/neo/ui/DeviceContext.h index b83c3aca..123d6eba 100644 --- a/neo/ui/DeviceContext.h +++ b/neo/ui/DeviceContext.h @@ -32,7 +32,9 @@ If you have questions concerning this license or the applicable additional terms // device context support for gui stuff // -#include "Rectangle.h" +#include "renderer/Material.h" +#include "renderer/RenderSystem.h" +#include "ui/Rectangle.h" const int VIRTUAL_WIDTH = 640; const int VIRTUAL_HEIGHT = 480; diff --git a/neo/ui/EditWindow.cpp b/neo/ui/EditWindow.cpp index 7551fcb2..35ae0548 100644 --- a/neo/ui/EditWindow.cpp +++ b/neo/ui/EditWindow.cpp @@ -26,15 +26,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "DeviceContext.h" -#include "Window.h" -#include "UserInterfaceLocal.h" -#include "SliderWindow.h" -#include "EditWindow.h" +#include "sys/platform.h" +#include "framework/FileSystem.h" +#include "framework/KeyInput.h" +#include "ui/DeviceContext.h" +#include "ui/Window.h" +#include "ui/UserInterfaceLocal.h" +#include "ui/SliderWindow.h" +#include "ui/EditWindow.h" bool idEditWindow::ParseInternalVar( const char *_name, idParser *src ) { if ( idStr::Icmp( _name, "maxchars" ) == 0) { diff --git a/neo/ui/EditWindow.h b/neo/ui/EditWindow.h index 4c03a01c..1fe33053 100644 --- a/neo/ui/EditWindow.h +++ b/neo/ui/EditWindow.h @@ -29,7 +29,7 @@ If you have questions concerning this license or the applicable additional terms #ifndef __EDITWINDOW_H__ #define __EDITWINDOW_H__ -#include "Window.h" +#include "ui/Window.h" const int MAX_EDITFIELD = 4096; diff --git a/neo/ui/FieldWindow.cpp b/neo/ui/FieldWindow.cpp index 70f33296..2c8b4c66 100644 --- a/neo/ui/FieldWindow.cpp +++ b/neo/ui/FieldWindow.cpp @@ -26,14 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "DeviceContext.h" -#include "Window.h" -#include "UserInterfaceLocal.h" -#include "FieldWindow.h" +#include "sys/platform.h" +#include "ui/DeviceContext.h" +#include "ui/Window.h" +#include "ui/UserInterfaceLocal.h" +#include "ui/FieldWindow.h" void idFieldWindow::CommonInit() { cursorPos = 0; diff --git a/neo/ui/FieldWindow.h b/neo/ui/FieldWindow.h index b92c4799..22dc9b2e 100644 --- a/neo/ui/FieldWindow.h +++ b/neo/ui/FieldWindow.h @@ -28,8 +28,7 @@ If you have questions concerning this license or the applicable additional terms #ifndef __FIELDWINDOW_H #define __FIELDWINDOW_H -#include "Window.h" - +#include "ui/Window.h" class idFieldWindow : public idWindow { public: diff --git a/neo/ui/GameBearShootWindow.cpp b/neo/ui/GameBearShootWindow.cpp index 66e20415..a02f8c1d 100644 --- a/neo/ui/GameBearShootWindow.cpp +++ b/neo/ui/GameBearShootWindow.cpp @@ -25,16 +25,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "../framework/Session_local.h" - -#include "DeviceContext.h" -#include "Window.h" -#include "UserInterfaceLocal.h" -#include "GameBearShootWindow.h" +#include "sys/platform.h" +#include "framework/Session_local.h" +#include "sound/sound.h" +#include "ui/DeviceContext.h" +#include "ui/Window.h" +#include "ui/UserInterfaceLocal.h" +#include "ui/GameBearShootWindow.h" #define BEAR_GRAVITY 240 #define BEAR_SIZE 24.f diff --git a/neo/ui/GameBearShootWindow.h b/neo/ui/GameBearShootWindow.h index faa08ea3..e9d96751 100644 --- a/neo/ui/GameBearShootWindow.h +++ b/neo/ui/GameBearShootWindow.h @@ -28,6 +28,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_BEARSHOOT_WINDOW_H__ #define __GAME_BEARSHOOT_WINDOW_H__ +#include "ui/Window.h" + class idGameBearShootWindow; class BSEntity { diff --git a/neo/ui/GameBustOutWindow.cpp b/neo/ui/GameBustOutWindow.cpp index 9e10d1c3..af6679be 100644 --- a/neo/ui/GameBustOutWindow.cpp +++ b/neo/ui/GameBustOutWindow.cpp @@ -25,16 +25,16 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "../framework/Session_local.h" -#include "../renderer/Image.h" +#include "sys/platform.h" +#include "framework/Session_local.h" +#include "renderer/Image.h" +#include "sound/sound.h" +#include "ui/DeviceContext.h" +#include "ui/Window.h" +#include "ui/UserInterfaceLocal.h" -#include "DeviceContext.h" -#include "Window.h" -#include "UserInterfaceLocal.h" -#include "GameBustOutWindow.h" +#include "ui/GameBustOutWindow.h" #define BALL_RADIUS 12.f #define BALL_SPEED 250.f diff --git a/neo/ui/GameBustOutWindow.h b/neo/ui/GameBustOutWindow.h index a62283bc..04a98141 100644 --- a/neo/ui/GameBustOutWindow.h +++ b/neo/ui/GameBustOutWindow.h @@ -28,6 +28,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_BUSTOUT_WINDOW_H__ #define __GAME_BUSTOUT_WINDOW_H__ +#include "ui/Window.h" + class idGameBustOutWindow; typedef enum { diff --git a/neo/ui/GameSSDWindow.cpp b/neo/ui/GameSSDWindow.cpp index 123f8709..5e1ed4b2 100644 --- a/neo/ui/GameSSDWindow.cpp +++ b/neo/ui/GameSSDWindow.cpp @@ -25,16 +25,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop -#include "../framework/Session_local.h" - -#include "DeviceContext.h" -#include "Window.h" -#include "UserInterfaceLocal.h" -#include "GameSSDWindow.h" +#include "sys/platform.h" +#include "framework/Session_local.h" +#include "sound/sound.h" +#include "ui/DeviceContext.h" +#include "ui/Window.h" +#include "ui/UserInterfaceLocal.h" +#include "ui/GameSSDWindow.h" #define Z_NEAR 100.0f #define Z_FAR 4000.0f diff --git a/neo/ui/GameSSDWindow.h b/neo/ui/GameSSDWindow.h index 63b32378..1404a428 100644 --- a/neo/ui/GameSSDWindow.h +++ b/neo/ui/GameSSDWindow.h @@ -28,6 +28,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAME_SSD_WINDOW_H__ #define __GAME_SSD_WINDOW_H__ +#include "ui/Window.h" + class idGameSSDWindow; class SSDCrossHair { diff --git a/neo/ui/GameWindow.cpp b/neo/ui/GameWindow.cpp index 282d0bd4..0cbe86e7 100644 --- a/neo/ui/GameWindow.cpp +++ b/neo/ui/GameWindow.cpp @@ -26,13 +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 "ui/DeviceContext.h" +#include "ui/Window.h" +#include "ui/UserInterfaceLocal.h" -#include "DeviceContext.h" -#include "Window.h" -#include "UserInterfaceLocal.h" -#include "GameWindow.h" +#include "ui/GameWindow.h" /* ================ diff --git a/neo/ui/GameWindow.h b/neo/ui/GameWindow.h index 5ac340eb..608b7d44 100644 --- a/neo/ui/GameWindow.h +++ b/neo/ui/GameWindow.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GAMEWINDOW_H__ #define __GAMEWINDOW_H__ +#include "ui/Window.h" + class idGameWindowProxy : public idWindow { public: idGameWindowProxy( idDeviceContext *d, idUserInterfaceLocal *gui ); diff --git a/neo/ui/GuiScript.cpp b/neo/ui/GuiScript.cpp index 4eb5fb4c..9545ff66 100644 --- a/neo/ui/GuiScript.cpp +++ b/neo/ui/GuiScript.cpp @@ -26,14 +26,15 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "Window.h" -#include "Winvar.h" -#include "GuiScript.h" -#include "UserInterfaceLocal.h" +#include "sys/platform.h" +#include "idlib/LangDict.h" +#include "framework/Session.h" +#include "sound/sound.h" +#include "ui/Window.h" +#include "ui/Winvar.h" +#include "ui/UserInterfaceLocal.h" +#include "ui/GuiScript.h" /* ========================= diff --git a/neo/ui/GuiScript.h b/neo/ui/GuiScript.h index e948927b..558a9ab5 100644 --- a/neo/ui/GuiScript.h +++ b/neo/ui/GuiScript.h @@ -28,8 +28,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __GUISCRIPT_H #define __GUISCRIPT_H -#include "Window.h" -#include "Winvar.h" +#include "ui/Window.h" +#include "ui/Winvar.h" struct idGSWinVar { idGSWinVar() { diff --git a/neo/ui/ListGUI.cpp b/neo/ui/ListGUI.cpp index bab0c52a..1e1eba5d 100644 --- a/neo/ui/ListGUI.cpp +++ b/neo/ui/ListGUI.cpp @@ -26,10 +26,10 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "ListGUILocal.h" +#include "sys/platform.h" +#include "framework/Common.h" +#include "ui/UserInterface.h" +#include "ui/ListGUILocal.h" /* ==================== diff --git a/neo/ui/ListGUI.h b/neo/ui/ListGUI.h index 044dfe91..db4f3118 100644 --- a/neo/ui/ListGUI.h +++ b/neo/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/neo/ui/ListGUILocal.h b/neo/ui/ListGUILocal.h index 5b1b7d63..d863ab24 100644 --- a/neo/ui/ListGUILocal.h +++ b/neo/ui/ListGUILocal.h @@ -29,6 +29,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __LISTGUILOCAL_H__ #define __LISTGUILOCAL_H__ +#include "idlib/containers/List.h" +#include "ui/ListGUI.h" + /* =============================================================================== diff --git a/neo/ui/ListWindow.cpp b/neo/ui/ListWindow.cpp index d57a12a0..5626f862 100644 --- a/neo/ui/ListWindow.cpp +++ b/neo/ui/ListWindow.cpp @@ -26,16 +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/HashTable.h" +#include "framework/Session_local.h" +#include "ui/DeviceContext.h" +#include "ui/Window.h" +#include "ui/UserInterfaceLocal.h" +#include "ui/SliderWindow.h" -#include "../framework/Session_local.h" - -#include "DeviceContext.h" -#include "Window.h" -#include "UserInterfaceLocal.h" -#include "SliderWindow.h" -#include "ListWindow.h" +#include "ui/ListWindow.h" // Number of pixels above the text that the rect starts static const int pixelOffset = 3; diff --git a/neo/ui/ListWindow.h b/neo/ui/ListWindow.h index 624b13c9..0eaf9a63 100644 --- a/neo/ui/ListWindow.h +++ b/neo/ui/ListWindow.h @@ -28,6 +28,10 @@ If you have questions concerning this license or the applicable additional terms #ifndef __LISTWINDOW_H #define __LISTWINDOW_H +#include "idlib/containers/StrList.h" +#include "idlib/containers/HashTable.h" +#include "ui/Window.h" + class idSliderWindow; enum { diff --git a/neo/ui/MarkerWindow.cpp b/neo/ui/MarkerWindow.cpp index 2ae61ac7..98b4d626 100644 --- a/neo/ui/MarkerWindow.cpp +++ b/neo/ui/MarkerWindow.cpp @@ -26,16 +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 "framework/KeyInput.h" // included for image uploading for player stat graph -#include "../renderer/Image.h" +#include "renderer/Image.h" +#include "ui/DeviceContext.h" +#include "ui/Window.h" +#include "ui/UserInterfaceLocal.h" -#include "DeviceContext.h" -#include "Window.h" -#include "UserInterfaceLocal.h" -#include "MarkerWindow.h" +#include "ui/MarkerWindow.h" class idImage; void idMarkerWindow::CommonInit() { diff --git a/neo/ui/MarkerWindow.h b/neo/ui/MarkerWindow.h index b839e222..606e6286 100644 --- a/neo/ui/MarkerWindow.h +++ b/neo/ui/MarkerWindow.h @@ -28,6 +28,9 @@ If you have questions concerning this license or the applicable additional terms #ifndef __MARKERWINDOW_H #define __MARKERWINDOW_H +#include "framework/Session.h" +#include "ui/Window.h" + class idUserInterfaceLocal; typedef struct { diff --git a/neo/ui/Rectangle.h b/neo/ui/Rectangle.h index 629d46e7..a945361a 100644 --- a/neo/ui/Rectangle.h +++ b/neo/ui/Rectangle.h @@ -27,6 +27,10 @@ If you have questions concerning this license or the applicable additional terms */ #ifndef IDRECTANGLE_H_ #define IDRECTANGLE_H_ + +#include "idlib/containers/List.h" +#include "idlib/math/Vector.h" + // // simple rectangle // diff --git a/neo/ui/RegExp.cpp b/neo/ui/RegExp.cpp index 3d95e551..0a9cb1e6 100644 --- a/neo/ui/RegExp.cpp +++ b/neo/ui/RegExp.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/LangDict.h" +#include "framework/DemoFile.h" +#include "ui/DeviceContext.h" +#include "ui/Window.h" +#include "ui/UserInterfaceLocal.h" -#include "RegExp.h" -#include "DeviceContext.h" -#include "Window.h" -#include "UserInterfaceLocal.h" +#include "ui/RegExp.h" int idRegister::REGCOUNT[NUMTYPES] = {4, 1, 1, 1, 0, 2, 3, 4}; diff --git a/neo/ui/RenderWindow.cpp b/neo/ui/RenderWindow.cpp index 5e9cb277..6ef2a229 100644 --- a/neo/ui/RenderWindow.cpp +++ b/neo/ui/RenderWindow.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/geometry/JointTransform.h" +#include "framework/Game.h" +#include "ui/DeviceContext.h" +#include "ui/Window.h" +#include "ui/UserInterfaceLocal.h" -#include "DeviceContext.h" -#include "Window.h" -#include "UserInterfaceLocal.h" -#include "RenderWindow.h" +#include "ui/RenderWindow.h" idRenderWindow::idRenderWindow(idDeviceContext *d, idUserInterfaceLocal *g) : idWindow(d, g) { dc = d; diff --git a/neo/ui/RenderWindow.h b/neo/ui/RenderWindow.h index bdbd10c0..e4d1d01b 100644 --- a/neo/ui/RenderWindow.h +++ b/neo/ui/RenderWindow.h @@ -28,7 +28,12 @@ If you have questions concerning this license or the applicable additional terms #ifndef __RENDERWINDOW_H #define __RENDERWINDOW_H +#include "renderer/RenderWorld.h" +#include "ui/Window.h" + class idUserInterfaceLocal; +class idMD5Anim; + class idRenderWindow : public idWindow { public: idRenderWindow(idUserInterfaceLocal *gui); diff --git a/neo/ui/SimpleWindow.cpp b/neo/ui/SimpleWindow.cpp index 39447b67..d8884cee 100644 --- a/neo/ui/SimpleWindow.cpp +++ b/neo/ui/SimpleWindow.cpp @@ -26,14 +26,12 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "DeviceContext.h" -#include "Window.h" -#include "UserInterfaceLocal.h" -#include "SimpleWindow.h" +#include "sys/platform.h" +#include "ui/DeviceContext.h" +#include "ui/Window.h" +#include "ui/UserInterfaceLocal.h" +#include "ui/SimpleWindow.h" idSimpleWindow::idSimpleWindow(idWindow *win) { gui = win->GetGui(); diff --git a/neo/ui/SimpleWindow.h b/neo/ui/SimpleWindow.h index 1f8b49e5..0268cc6d 100644 --- a/neo/ui/SimpleWindow.h +++ b/neo/ui/SimpleWindow.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SIMPLEWIN_H__ #define __SIMPLEWIN_H__ +#include "ui/Window.h" + class idUserInterfaceLocal; class idDeviceContext; class idSimpleWindow; diff --git a/neo/ui/SliderWindow.cpp b/neo/ui/SliderWindow.cpp index 9bf1325f..ad1d1f82 100644 --- a/neo/ui/SliderWindow.cpp +++ b/neo/ui/SliderWindow.cpp @@ -26,13 +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/KeyInput.h" +#include "ui/DeviceContext.h" +#include "ui/Window.h" +#include "ui/UserInterfaceLocal.h" -#include "DeviceContext.h" -#include "Window.h" -#include "UserInterfaceLocal.h" -#include "SliderWindow.h" +#include "ui/SliderWindow.h" /* ============ diff --git a/neo/ui/SliderWindow.h b/neo/ui/SliderWindow.h index 6936a8df..b7f2a4b6 100644 --- a/neo/ui/SliderWindow.h +++ b/neo/ui/SliderWindow.h @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __SLIDERWINDOW_H__ #define __SLIDERWINDOW_H__ +#include "ui/Window.h" + class idUserInterfaceLocal; class idSliderWindow : public idWindow { diff --git a/neo/ui/UserInterface.cpp b/neo/ui/UserInterface.cpp index 69b8024a..1c1647c8 100644 --- a/neo/ui/UserInterface.cpp +++ b/neo/ui/UserInterface.cpp @@ -26,13 +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 "framework/FileSystem.h" +#include "framework/DemoFile.h" +#include "framework/KeyInput.h" +#include "ui/ListGUILocal.h" +#include "ui/DeviceContext.h" +#include "ui/Window.h" -#include "ListGUILocal.h" -#include "DeviceContext.h" -#include "Window.h" -#include "UserInterfaceLocal.h" +#include "ui/UserInterfaceLocal.h" extern idCVar r_skipGuiShaders; // 1 = don't render any gui elements on surfaces diff --git a/neo/ui/UserInterface.h b/neo/ui/UserInterface.h index 82aac377..2b5eb0a1 100644 --- a/neo/ui/UserInterface.h +++ b/neo/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" + /* =============================================================================== diff --git a/neo/ui/UserInterfaceLocal.h b/neo/ui/UserInterfaceLocal.h index d6fccbb4..f9df12d0 100644 --- a/neo/ui/UserInterfaceLocal.h +++ b/neo/ui/UserInterfaceLocal.h @@ -26,6 +26,8 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ +#include "ui/UserInterface.h" + class idWindow; class idUserInterfaceLocal : public idUserInterface { diff --git a/neo/ui/Window.cpp b/neo/ui/Window.cpp index d04fd4d5..32423341 100644 --- a/neo/ui/Window.cpp +++ b/neo/ui/Window.cpp @@ -26,28 +26,27 @@ If you have questions concerning this license or the applicable additional terms =========================================================================== */ -#include "../idlib/precompiled.h" -#pragma hdrstop - -#include "DeviceContext.h" -#include "Window.h" -#include "UserInterfaceLocal.h" -#include "EditWindow.h" -#include "ChoiceWindow.h" -#include "SliderWindow.h" -#include "BindWindow.h" -#include "ListWindow.h" -#include "RenderWindow.h" -#include "MarkerWindow.h" -#include "FieldWindow.h" - -#include "GameSSDWindow.h" -#include "GameBearShootWindow.h" -#include "GameBustOutWindow.h" - -// +#include "sys/platform.h" +#include "idlib/containers/HashTable.h" +#include "framework/UsercmdGen.h" +#include "framework/KeyInput.h" +#include "ui/DeviceContext.h" +#include "ui/UserInterfaceLocal.h" +#include "ui/EditWindow.h" +#include "ui/ChoiceWindow.h" +#include "ui/SliderWindow.h" +#include "ui/BindWindow.h" +#include "ui/ListWindow.h" +#include "ui/RenderWindow.h" +#include "ui/MarkerWindow.h" +#include "ui/FieldWindow.h" +#include "ui/GameSSDWindow.h" +#include "ui/GameBearShootWindow.h" +#include "ui/GameBustOutWindow.h" // gui editor is more integrated into the window now -#include "../tools/guied/GEWindowWrapper.h" +#include "tools/guied/GEWindowWrapper.h" + +#include "ui/Window.h" bool idWindow::registerIsTemporary[MAX_EXPRESSION_REGISTERS]; // statics to assist during parsing //float idWindow::shaderRegisters[MAX_EXPRESSION_REGISTERS]; diff --git a/neo/ui/Window.h b/neo/ui/Window.h index de02df35..2d2af631 100644 --- a/neo/ui/Window.h +++ b/neo/ui/Window.h @@ -29,12 +29,13 @@ If you have questions concerning this license or the applicable additional terms #ifndef __WINDOW_H__ #define __WINDOW_H__ -#include "Rectangle.h" -#include "DeviceContext.h" -#include "RegExp.h" -#include "Winvar.h" -#include "GuiScript.h" -#include "SimpleWindow.h" +#include "idlib/math/Interpolate.h" +#include "ui/Rectangle.h" +#include "ui/DeviceContext.h" +#include "ui/RegExp.h" +#include "ui/Winvar.h" +#include "ui/GuiScript.h" +#include "ui/SimpleWindow.h" const int WIN_CHILD = 0x00000001; const int WIN_CAPTION = 0x00000002; @@ -71,6 +72,9 @@ const int SCROLLBAR_SIZE = 16; const int MAX_WINDOW_NAME = 32; const int MAX_LIST_ITEMS = 1024; +const int MAX_EXPRESSION_OPS = 4096; +const int MAX_EXPRESSION_REGISTERS = 4096; + const char DEFAULT_BACKCOLOR[] = "1 1 1 1"; const char DEFAULT_FORECOLOR[] = "0 0 0 1"; const char DEFAULT_BORDERCOLOR[] = "0 0 0 1"; diff --git a/neo/ui/Winvar.cpp b/neo/ui/Winvar.cpp index ddab3898..1d207705 100644 --- a/neo/ui/Winvar.cpp +++ b/neo/ui/Winvar.cpp @@ -26,12 +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 "ui/Window.h" +#include "ui/UserInterfaceLocal.h" -#include "Window.h" -#include "Winvar.h" -#include "UserInterfaceLocal.h" +#include "ui/Winvar.h" const char *VAR_GUIPREFIX = "gui::"; static const int VAR_GUIPREFIX_LEN = strlen(VAR_GUIPREFIX); diff --git a/neo/ui/Winvar.h b/neo/ui/Winvar.h index cf1d3128..8ab296f6 100644 --- a/neo/ui/Winvar.h +++ b/neo/ui/Winvar.h @@ -29,7 +29,8 @@ If you have questions concerning this license or the applicable additional terms #ifndef __WINVAR_H__ #define __WINVAR_H__ -#include "Rectangle.h" +#include "framework/File.h" +#include "ui/Rectangle.h" extern const char *VAR_GUIPREFIX;