RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: client: synchronize sv_cheats state with the server

Browse Source
This commit is contained in:
Alibek Omarov
2025-09-28 22:31:46 +05:00
parent 8b65cd73fc
commit 69204aec07
4 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
engine/client/cl_main.c
View File

@@ -174,6 +174,22 @@ connprotocol_t CL_Protocol( void )
return cls.legacymode;
}
void CL_SetCheatState( qboolean multiplayer, qboolean allow_cheats )
{
if( NET_NetadrType( &cls.netchan.remote_address ) == NA_LOOPBACK )
return;
if( allow_cheats )
{
Cvar_FullSet( "sv_cheats", "1", FCVAR_READ_ONLY | FCVAR_SERVER );
}
else
{
Cvar_FullSet( "sv_cheats", "0", FCVAR_READ_ONLY | FCVAR_SERVER );
Cvar_SetCheatState();
}
}
/*
===============
CL_CheckClientState
@@ -1072,13 +1088,9 @@ static void CL_SendConnectPacket( connprotocol_t proto, int challenge )
input_devices = IN_CollectInputDevices();
IN_LockInputDevices( adrtype != NA_LOOPBACK ? true : false );
// GoldSrc doesn't need sv_cheats set to 0, it's handled by svc_goldsrc_sendextrainfo
// it also doesn't need useragent string
// GoldSrc doesn't need useragent string
if( adrtype != NA_LOOPBACK && proto != PROTO_GOLDSRC )
{
Cvar_SetCheatState();
Cvar_FullSet( "sv_cheats", "0", FCVAR_READ_ONLY | FCVAR_SERVER );
Info_SetValueForKeyf( protinfo, "d", sizeof( protinfo ), "%d", input_devices );
Info_SetValueForKey( protinfo, "v", XASH_VERSION, sizeof( protinfo ) );
Info_SetValueForKeyf( protinfo, "b", sizeof( protinfo ), "%d", Q_buildnum( ));
@@ -2338,16 +2350,24 @@ static void CL_ClientConnect( connprotocol_t proto, const char *c, netadr_t from
if( Q_strcmp( c, S2C_GOLDSRC_CONNECTION ))
{
Con_DPrintf( S_ERROR "GoldSrc client connect expected but wasn't received, ignored\n");
CL_Disconnect_f();
return;
}
if( Cmd_Argc() > 4 )
cls.build_num = Q_atoi( Cmd_Argv( 4 ));
cls.build_num = Q_atoi( Cmd_Argv( 4 ));
cls.allow_cheats = false; // set by svc_goldsrc_sendextrainfo
}
else if( !Q_strcmp( c, S2C_GOLDSRC_CONNECTION ))
else
{
Con_DPrintf( S_ERROR "GoldSrc client connect received but wasn't expected, ignored\n");
return;
if( Q_strcmp( c, S2C_CONNECTION ))
{
Con_DPrintf( S_ERROR "Xash3D client connect expected but wasn't received, ignored\n");
CL_Disconnect_f();
return;
}
cls.build_num = 0; // not used in Xash3D protocols
cls.allow_cheats = Q_atoi( Info_ValueForKey( Cmd_Argv( 1 ), "cheats" ));
}
CL_Reconnect( true );
@@ -2753,11 +2773,7 @@ static void CL_ReadPackets( void )
CL_ReadNetMessage();
CL_ApplyAddAngle();
#if 0
// keep cheat cvars are unchanged
if( cl.maxclients > 1 && cls.state == ca_active && !host_developer.value )
Cvar_SetCheatState();
#endif
// hot precache and downloading resources
if( cls.signon == SIGNONS && cl.lastresourcecheck < host.realtime )
{

4
engine/client/cl_parse.c
View File

@@ -1003,6 +1003,10 @@ void CL_ParseServerData( sizebuf_t *msg, connprotocol_t proto )
}
else Cvar_DirectSet( &r_decals, NULL );
// for GoldSrc, it's handled by svc_goldsrc_sendextrainfo
if( proto != PROTO_GOLDSRC )
CL_SetCheatState( cl.maxclients > 1, cls.allow_cheats );
// set the background state
if( cls.demoplayback && ( cls.demonum != -1 ))
cl.background = true;

11
engine/client/cl_parse_gs.c
View File

@@ -31,15 +31,8 @@ static void CL_ParseExtraInfo( sizebuf_t *msg )
if( COM_CheckStringEmpty( clientfallback ))
Con_Reportf( S_ERROR "%s: TODO: add fallback directory %s!\n", __func__, clientfallback );
if( MSG_ReadByte( msg ))
{
Cvar_FullSet( "sv_cheats", "1", FCVAR_READ_ONLY | FCVAR_SERVER );
}
else
{
Cvar_SetCheatState();
Cvar_FullSet( "sv_cheats", "0", FCVAR_READ_ONLY | FCVAR_SERVER );
}
cls.allow_cheats = MSG_ReadByte( msg ) ? true : false;
CL_SetCheatState( cl.maxclients > 1, cls.allow_cheats );
}
static void CL_ParseNewMovevars( sizebuf_t *msg )

5
engine/client/client.h
View File

@@ -640,6 +640,10 @@ typedef struct
// server's build number (might be zero)
int build_num;
uint8_t steamid[8];
// whether server allows cheats or not
// set differently depending on protocol and extensions
qboolean allow_cheats;
} client_static_t;
#ifdef __cplusplus
@@ -763,6 +767,7 @@ void CL_UpdateFrameLerp( void );
int CL_IsDevOverviewMode( void );
void CL_SignonReply( connprotocol_t proto );
void CL_ClearState( void );
void CL_SetCheatState( qboolean multiplayer, qboolean allow_cheats );
//
// cl_demo.c