Rework includes. Remove some redundant includes

FreeSlave · Nov 8, 2024 · ea20465 · ea20465
1 parent fa4f12b
commit ea20465
Show file tree

Hide file tree

Showing 60 changed files with 134 additions and 176 deletions.
diff --git a/cl_dll/GameStudioModelRenderer.cpp b/cl_dll/GameStudioModelRenderer.cpp
@@ -8,7 +8,6 @@
 #include <cassert>
 #include "hud.h"
 #include "cl_util.h"
-#include "const.h"
 #include "com_model.h"
 #include "studio.h"
 #include "entity_state.h"

diff --git a/cl_dll/GameStudioModelRenderer_Sample.cpp b/cl_dll/GameStudioModelRenderer_Sample.cpp
@@ -8,7 +8,6 @@
 #include <assert.h>
 #include "hud.h"
 #include "cl_util.h"
-#include "const.h"
 #include "com_model.h"
 #include "studio.h"
 #include "entity_state.h"

diff --git a/cl_dll/StudioModelRenderer.cpp b/cl_dll/StudioModelRenderer.cpp
@@ -10,7 +10,6 @@
 
 #include "hud.h"
 #include "cl_util.h"
-#include "const.h"
 #include "com_model.h"
 #include "studio.h"
 #include "entity_state.h"

diff --git a/cl_dll/cl_fx.h b/cl_dll/cl_fx.h
@@ -2,9 +2,9 @@
 #ifndef CL_FX_H
 #define CL_FX_H
 
-#include "cl_dll.h"
 #include "com_model.h"
 #include "fx_types.h"
+#include "vector.h"
 
 void LoadDefaultSprites();
 

diff --git a/cl_dll/cl_util.h b/cl_dll/cl_util.h
@@ -17,6 +17,7 @@
 //
 #if !defined(CL_UTIL_H)
 #define CL_UTIL_H
+#include "cl_dll.h"
 #include "exportdef.h"
 #include "cvardef.h"
 #include "color_utils.h"

diff --git a/cl_dll/com_weapons.cpp b/cl_dll/com_weapons.cpp
@@ -19,8 +19,6 @@
 #include "hud.h"
 #include "cl_util.h"
 #include "com_weapons.h"
-
-#include "const.h"
 #include "entity_state.h"
 #include "r_efx.h"
 

diff --git a/cl_dll/entity.cpp b/cl_dll/entity.cpp
@@ -11,7 +11,6 @@
 
 #include "hud.h"
 #include "cl_util.h"
-#include "const.h"
 #include "entity_types.h"
 #include "studio_event.h" // def. of mstudioevent_t
 #include "r_efx.h"

diff --git a/cl_dll/ev_common.cpp b/cl_dll/ev_common.cpp
@@ -16,7 +16,6 @@
 
 #include "hud.h"
 #include "cl_util.h"
-#include "const.h"
 #include "entity_state.h"
 #include "cl_entity.h"
 

diff --git a/cl_dll/ev_hldm.cpp b/cl_dll/ev_hldm.cpp
@@ -15,11 +15,9 @@
 
 #include "hud.h"
 #include "cl_util.h"
-#include "const.h"
 #include "entity_state.h"
 #include "cl_entity.h"
 #include "entity_types.h"
-#include "usercmd.h"
 #include "pm_defs.h"
 #include "pm_materials.h"
 

diff --git a/cl_dll/hl/hl_objects.cpp b/cl_dll/hl/hl_objects.cpp
@@ -18,7 +18,6 @@
 #include "../demo.h"
 
 #include "demo_api.h"
-#include "const.h"
 #include "entity_state.h"
 #include "cl_entity.h"
 

diff --git a/cl_dll/in_camera.cpp b/cl_dll/in_camera.cpp
@@ -11,7 +11,6 @@
 #include "kbutton.h"
 #include "cvardef.h"
 #include "usercmd.h"
-#include "const.h"
 #include "camera.h"
 #include "in_defs.h"
 

diff --git a/cl_dll/input.cpp b/cl_dll/input.cpp
@@ -21,7 +21,6 @@ extern "C"
 }
 #include "cvardef.h"
 #include "usercmd.h"
-#include "const.h"
 #include "camera.h"
 #include "in_defs.h"
 //#include "view.h"

diff --git a/cl_dll/input_goldsource.cpp b/cl_dll/input_goldsource.cpp
@@ -18,7 +18,6 @@
 #include "camera.h"
 #include "kbutton.h"
 #include "cvardef.h"
-#include "const.h"
 #include "camera.h"
 #include "in_defs.h"
 #include "keydefs.h"

diff --git a/cl_dll/status_icons.cpp b/cl_dll/status_icons.cpp
@@ -18,7 +18,6 @@
 
 #include "hud.h"
 #include "cl_util.h"
-#include "const.h"
 #include "entity_state.h"
 #include "cl_entity.h"
 #include "parsemsg.h"

diff --git a/cl_dll/studio_util.cpp b/cl_dll/studio_util.cpp
@@ -7,7 +7,6 @@
 
 #include "hud.h"
 #include "cl_util.h"
-#include "const.h"
 #include "com_model.h"
 #include "studio_util.h"
 

diff --git a/cl_dll/tri.cpp b/cl_dll/tri.cpp
@@ -15,7 +15,6 @@
 
 // Triangle rendering apis are in gEngfuncs.pTriAPI
 
-#include "const.h"
 #include "entity_state.h"
 #include "cl_entity.h"
 #include "triangleapi.h"

diff --git a/cl_dll/vgui_ClassMenu.cpp b/cl_dll/vgui_ClassMenu.cpp
@@ -24,8 +24,6 @@
 #include "camera.h"
 #include "kbutton.h"
 #include "cvardef.h"
-#include "usercmd.h"
-#include "const.h"
 #include "camera.h"
 #include "in_defs.h"
 #include "parsemsg.h"

diff --git a/cl_dll/vgui_CustomObjects.cpp b/cl_dll/vgui_CustomObjects.cpp
@@ -23,8 +23,6 @@
 #include "camera.h"
 #include "kbutton.h"
 #include "cvardef.h"
-#include "usercmd.h"
-#include "const.h"
 #include "camera.h"
 #include "in_defs.h"
 #include "parsemsg.h"

diff --git a/cl_dll/vgui_MOTDWindow.cpp b/cl_dll/vgui_MOTDWindow.cpp
@@ -26,7 +26,6 @@
 #include "cl_util.h"
 #include "camera.h"
 #include "kbutton.h"
-#include "const.h"
 
 #include "vgui_int.h"
 #include "vgui_TeamFortressViewport.h"

diff --git a/cl_dll/vgui_ScorePanel.cpp b/cl_dll/vgui_ScorePanel.cpp
@@ -21,7 +21,6 @@
 
 #include "hud.h"
 #include "cl_util.h"
-#include "const.h"
 #include "entity_state.h"
 #include "cl_entity.h"
 #include "vgui_TeamFortressViewport.h"

diff --git a/cl_dll/vgui_SpectatorPanel.cpp b/cl_dll/vgui_SpectatorPanel.cpp
@@ -11,7 +11,6 @@
 
 #include "hud.h"
 #include "cl_util.h"
-#include "const.h"
 #include "entity_state.h"
 #include "cl_entity.h"
 #include "pm_shared.h"

diff --git a/cl_dll/vgui_TeamFortressViewport.cpp b/cl_dll/vgui_TeamFortressViewport.cpp
@@ -39,8 +39,6 @@
 #include "camera.h"
 #include "kbutton.h"
 #include "cvardef.h"
-#include "usercmd.h"
-#include "const.h"
 #include "camera.h"
 #include "in_defs.h"
 #include "parsemsg.h"

diff --git a/cl_dll/vgui_int.cpp b/cl_dll/vgui_int.cpp
@@ -17,8 +17,6 @@
 #include "camera.h"
 #include "kbutton.h"
 #include "cvardef.h"
-#include "usercmd.h"
-#include "const.h"
 #include "camera.h"
 #include "in_defs.h"
 #include "vgui_TeamFortressViewport.h"

diff --git a/cl_dll/view.cpp b/cl_dll/view.cpp
@@ -10,8 +10,6 @@
 #include "hud.h"
 #include "cl_util.h"
 #include "cvardef.h"
-#include "usercmd.h"
-#include "const.h"
 
 #include "entity_state.h"
 #include "cl_entity.h"

diff --git a/common/beamdef.h b/common/beamdef.h
@@ -16,6 +16,8 @@
 #if !defined(BEAMDEF_H)
 #define BEAMDEF_H
 
+#include "vector.h"
+
 #define FBEAM_STARTENTITY		0x00000001
 #define FBEAM_ENDENTITY		0x00000002
 #define FBEAM_FADEIN		0x00000004

diff --git a/common/cl_entity.h b/common/cl_entity.h
@@ -16,6 +16,15 @@
 #if !defined(CL_ENTITY_H)
 #define CL_ENTITY_H
 
+#include "com_model.h"
+#include "common_types.h"
+#include "vector.h"
+
+typedef struct
+{
+	unsigned	r, g, b, a;
+} colorVec;
+
 typedef struct efrag_s
 {
 	struct mleaf_s	*leaf;

diff --git a/common/com_model.h b/common/com_model.h
@@ -9,6 +9,9 @@
 #if !defined( COM_MODEL_H )
 #define COM_MODEL_H
 
+#include "common_types.h"
+#include "vector.h"
+
 #define STUDIO_RENDER 1
 #define STUDIO_EVENTS 2
 

diff --git a/common/common_types.h b/common/common_types.h
@@ -2,6 +2,8 @@
 #ifndef COMMON_TYPES_H
 #define COMMON_TYPES_H
 
+typedef int qboolean;
+
 typedef unsigned char	byte;
 
 typedef struct

diff --git a/common/const.h b/common/const.h
@@ -17,6 +17,9 @@
 #define CONST_H
 
 #include "common_types.h"
+#include "vector.h"
+#include "const_render.h"
+#include "const_sound.h"
 
 //
 // Constants shared by the engine and dlls
@@ -623,42 +626,6 @@
 #define CONTENT_LAVA		-5
 #define CONTENT_SKY			-6
 
-// channels
-#define CHAN_AUTO			0
-#define CHAN_WEAPON			1
-#define CHAN_VOICE			2
-#define CHAN_ITEM			3
-#define CHAN_BODY			4
-#define CHAN_STREAM			5	// allocate stream channel from the static or dynamic area
-#define CHAN_STATIC			6	// allocate channel from the static area 
-#define CHAN_NETWORKVOICE_BASE		7	// voice data coming across the network
-#define CHAN_NETWORKVOICE_END		500	// network voice data reserves slots (CHAN_NETWORKVOICE_BASE through CHAN_NETWORKVOICE_END).
-#define CHAN_BOT			501	// channel used for bot chatter.
-
-// attenuation values
-#define ATTN_NONE			0
-#define ATTN_NORM			0.8f
-#define ATTN_IDLE			2.0f
-#define ATTN_STATIC			1.25f
-
-// pitch values
-#define PITCH_NORM			100	// non-pitch shifted
-#define PITCH_LOW			95	// other values are possible - 0-255, where 255 is very high
-#define PITCH_HIGH			120
-
-// volume values
-#define VOL_NORM			1.0f
-
-// plats
-#define PLAT_LOW_TRIGGER		1
-
-// Trains
-#define SF_TRAIN_WAIT_RETRIGGER	1
-#define SF_TRAIN_SETORIGIN	2
-#define SF_TRAIN_START_ON		4	// Train is initially moving
-#define SF_TRAIN_PASSABLE		8	// Train is not solid -- used SF_TRAIN_SETORIGINefine SF_TRAIN_RESPECT_ORIGIN		32
-#define SF_TRAIN_NO_DAMAGE		64
-
 // buttons
 #define IN_ATTACK			(1<<0)
 #define IN_JUMP			(1<<1)
@@ -703,61 +670,9 @@
 #define TE_BOUNCE_SHELL		1
 #define TE_BOUNCE_SHOTSHELL		2
 
-// Rendering constants
-enum 
-{	
-	kRenderNormal,		// src
-	kRenderTransColor,		// c*a+dest*(1-a)
-	kRenderTransTexture,	// src*a+dest*(1-a)
-	kRenderGlow,		// src*a+dest -- No Z buffer checks
-	kRenderTransAlpha,		// src*srca+dest*(1-srca)
-	kRenderTransAdd,		// src*a+dest
-	kRenderWorldGlow		// Same as kRenderGlow but not fixed size in screen space
-};
-
-enum 
-{	
-	kRenderFxNone = 0, 
-	kRenderFxPulseSlow, 
-	kRenderFxPulseFast, 
-	kRenderFxPulseSlowWide, 
-	kRenderFxPulseFastWide, 
-	kRenderFxFadeSlow, 
-	kRenderFxFadeFast, 
-	kRenderFxSolidSlow, 
-	kRenderFxSolidFast, 	   
-	kRenderFxStrobeSlow, 
-	kRenderFxStrobeFast, 
-	kRenderFxStrobeFaster, 
-	kRenderFxFlickerSlow, 
-	kRenderFxFlickerFast,
-	kRenderFxNoDissipation,
-	kRenderFxDistort,			// Distort/scale/translate flicker
-	kRenderFxHologram,			// kRenderFxDistort + distance fade
-	kRenderFxDeadPlayer,		// kRenderAmt is the player index
-	kRenderFxExplode,			// Scale up really big!
-	kRenderFxGlowShell,			// Glowing Shell
-	kRenderFxClampMinScale,		// Keep this sprite from getting very small (SPRITES only!)
-	kRenderFxLightMultiplier	//CTM !!!CZERO added to tell the studiorender that the value in iuser2 is a lightmultiplier
-};
-
 typedef unsigned int		func_t;
 typedef int		string_t;
 
-#undef true
-#undef false
-
-#if !__cplusplus
-typedef enum { false, true }	qboolean;
-#else 
-typedef int qboolean;
-#endif
-
-typedef struct
-{
-	unsigned	r, g, b, a;
-} colorVec;
-
 typedef struct link_s
 {
 	struct link_s	*prev, *next;