client: use FilteredClientCmd for DRC_CMD_STUFFTEXT

Velaron · Feb 14, 2025 · 48fea16 · 48fea16
1 parent 3886124
commit 48fea16
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/cl_dll/cl_util.h b/cl_dll/cl_util.h
@@ -83,6 +83,7 @@ inline struct cvar_s *CVAR_CREATE( const char *cv, const char *val, const int fl
 #define GetScreenInfo (*gEngfuncs.pfnGetScreenInfo)
 #define ServerCmd (*gEngfuncs.pfnServerCmd)
 #define ClientCmd (*gEngfuncs.pfnClientCmd)
+#define FilteredClientCmd (*gEngfuncs.pfnFilteredClientCmd)
 #define AngleVectors (*gEngfuncs.pfnAngleVectors)
 #define Com_RandomLong (*gEngfuncs.pfnRandomLong)
 #define Com_RandomFloat (*gEngfuncs.pfnRandomFloat)

diff --git a/cl_dll/hud_spectator.cpp b/cl_dll/hud_spectator.cpp
@@ -690,7 +690,7 @@ void CHudSpectator::DirectorMessage( int iSize, void *pbuf )
 							break;*/
 
 	case DRC_CMD_STUFFTEXT:
-		ClientCmd( reader.ReadString() );
+		FilteredClientCmd( reader.ReadString() );
 		break;
 	default			:	gEngfuncs.Con_DPrintf("CHudSpectator::DirectorMessage: unknown command %i.\n", cmd );
 	}

diff --git a/engine/APIProxy.h b/engine/APIProxy.h
@@ -353,6 +353,7 @@ typedef void						(*pfnEngSrc_pfnFillRGBABlend_t )			( int x, int y, int width,
 typedef int						(*pfnEngSrc_pfnGetAppID_t)			( void );
 typedef cmdalias_t*				(*pfnEngSrc_pfnGetAliases_t)		( void );
 typedef void					(*pfnEngSrc_pfnVguiWrap2_GetMouseDelta_t) ( int *x, int *y );
+typedef int							(*pfnEngSrc_pfnFilteredClientCmd_t) 	( char *szCmdString );
 
 // Pointers to the exported engine functions themselves
 typedef struct cl_enginefuncs_s
@@ -491,6 +492,7 @@ typedef struct cl_enginefuncs_s
 	pfnEngSrc_pfnGetAppID_t					pfnGetAppID;
 	pfnEngSrc_pfnGetAliases_t				pfnGetAliasList;
 	pfnEngSrc_pfnVguiWrap2_GetMouseDelta_t pfnVguiWrap2_GetMouseDelta;
+	pfnEngSrc_pfnFilteredClientCmd_t		pfnFilteredClientCmd;
 } cl_enginefunc_t;
 
 // Function type declarations for engine destination functions
@@ -610,6 +612,7 @@ typedef void	(*pfnEngDst_pfnFillRGBABlend_t )				( int *, int *, int *, int *, i
 typedef void	(*pfnEngDst_pfnGetAppID_t )				( void );
 typedef void	(*pfnEngDst_pfnGetAliases_t )				( void );
 typedef void	(*pfnEngDst_pfnVguiWrap2_GetMouseDelta_t) ( int *x, int *y );
+typedef void	(*pfnEngDst_pfnFilteredClientCmd_t )	( char ** );
 
 
 // Pointers to the engine destination functions
@@ -737,6 +740,7 @@ typedef struct
 	pfnEngDst_pfnGetAppID_t							pfnGetAppID;
 	pfnEngDst_pfnGetAliases_t				pfnGetAliasList;
 	pfnEngDst_pfnVguiWrap2_GetMouseDelta_t	pfnVguiWrap2_GetMouseDelta;
+	pfnEngDst_pfnFilteredClientCmd_t		pfnFilteredClientCmd;
 } cl_enginefunc_dst_t;
 
 

diff --git a/engine/cdll_int.h b/engine/cdll_int.h
@@ -193,6 +193,7 @@ extern module_t	g_module;
 #define RecEnghudHookUserMsg(a, b)			(g_engdstAddrs.pfnHookUserMsg(&a, &b))
 #define RecEnghudServerCmd(a)				(g_engdstAddrs.pfnServerCmd(&a))
 #define RecEnghudClientCmd(a)				(g_engdstAddrs.pfnClientCmd(&a))
+#define RecEnghudFilteredClientCmd(a)		(g_engdstAddrs.pfnFilteredClientCmd(&a))
 #define RecEngPrimeMusicStream(a, b)	(g_engdstAddrs.pfnPrimeMusicStream(&a, &b))
 #define RecEnghudGetPlayerInfo(a, b)		(g_engdstAddrs.pfnGetPlayerInfo(&a, &b))
 #define RecEnghudPlaySoundByName(a, b)		(g_engdstAddrs.pfnPlaySoundByName(&a, &b))
@@ -410,6 +411,7 @@ extern void NullDst(void);
 	(pfnEngDst_pfnGetAppID_t)						NullDst, \
 	(pfnEngDst_pfnGetAliases_t)						NullDst, \
 	(pfnEngDst_pfnVguiWrap2_GetMouseDelta_t)		NullDst, \
+	(pfnEngDst_pfnFilteredClientCmd_t)				NullDst, \
 };
 
 // Use this to init a cldll_func_dst structure to point to NullDst