reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2024-12-27 23:25:45 +03:00
Code Issues Projects Releases Wiki Activity

Improved movevars sync logic for clients, allowing independent sync of movement props for each client, regardless of global movevars

Browse Source
This commit is contained in:
s1lentq 2024-12-08 00:18:36 +07:00
parent 12b35dbe8c
commit df862d9bb6
8 changed files with 156 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rehlds/engine/pmove.cpp
View File

@ -29,7 +29,7 @@
#include "precompiled.h"
playermove_t *pmove;
movevars_t movevars;
movevars_t sv_movevars;
cvar_t pm_showclip = { "pm_showclip", "0", 0, 0.0f, NULL };
@ -98,7 +98,7 @@ void PM_Init(playermove_t *ppm)
VectorCopy(player_maxs[i], ppm->player_maxs[i]);
}
ppm->_movevars = &movevars;
ppm->movevars = &sv_movevars;
ppm->PM_Info_ValueForKey = Info_ValueForKey;
ppm->PM_Particle = CL_Particle;

2
rehlds/engine/pmove.h
View File

@ -39,7 +39,7 @@ extern vec3_t player_mins[MAX_MAP_HULLS];
extern vec3_t player_maxs[MAX_MAP_HULLS];
extern playermove_t *pmove;
extern movevars_t movevars;
extern movevars_t sv_movevars;
qboolean PM_AddToTouched(pmtrace_t tr, vec_t *impactvelocity);
void PM_StuckTouch(int hitent, pmtrace_t *ptraceresult);

7
rehlds/engine/server.h
View File

@ -53,6 +53,7 @@ const int MAX_NAME = 32;
#include "pm_defs.h"
#include "inst_baseline.h"
#include "net_ws.h"
#include "pm_shared/pm_movevars.h"
const int DEFAULT_SOUND_PACKET_VOLUME = 255;
const float DEFAULT_SOUND_PACKET_ATTENUATION = 1.0f;
@ -235,6 +236,7 @@ typedef struct client_s
double m_lastvoicetime;
int m_sendrescount;
qboolean m_bSentNewResponse;
movevars_t movevars;
} client_t;
enum
@ -454,10 +456,9 @@ void SV_BuildHashedSoundLookupTable(void);
void SV_AddSampleToHashedLookupTable(const char *pszSample, int iSampleIndex);
qboolean SV_ValidClientMulticast(client_t *client, int soundLeaf, int to);
void SV_Multicast(edict_t *ent, vec_t *origin, int to, qboolean reliable);
void SV_WriteMovevarsToClient(sizebuf_t *message);
void SV_WriteMovevarsToClient(sizebuf_t *message, struct movevars_s *movevars);
void SV_WriteDeltaDescriptionsToClient(sizebuf_t *msg);
void SV_SetMoveVars(void);
void SV_QueryMovevarsChanged(void);
void SV_SetMoveVars(struct movevars_s *movevars);
void SV_SendServerinfo(sizebuf_t *msg, client_t *client);
void SV_SendServerinfo_internal(sizebuf_t *msg, client_t *client);
void SV_SendResources(sizebuf_t *msg);

223
rehlds/engine/sv_main.cpp
View File

@ -132,10 +132,47 @@ cvar_t sv_wateramp = { "sv_wateramp", "0", 0, 0.0f, NULL };
void sv_cheats_hook_callback(cvar_t *cvar);
void mapcyclefile_hook_callback(cvar_t *cvar);
void sv_movevars_hook_callback(cvar_t *cvar);
cvarhook_t sv_cheats_hook = { sv_cheats_hook_callback, NULL, NULL };
cvarhook_t mapcyclefile_hook = { mapcyclefile_hook_callback, NULL, NULL };
//------------------------------------------------
// Movevars cvarhook declares
//------------------------------------------------
#define DECLARE_CVARHOOK_MOVEVARS(cvar)\
cvarhook_t cvar##_hook = { sv_movevars_hook_callback, NULL, NULL }
#define CVARHOOK_MOVEVARS(cvar)\
Cvar_HookVariable(cvar.name, &cvar##_hook);
DECLARE_CVARHOOK_MOVEVARS(sv_gravity);
DECLARE_CVARHOOK_MOVEVARS(sv_stopspeed);
DECLARE_CVARHOOK_MOVEVARS(sv_maxspeed);
DECLARE_CVARHOOK_MOVEVARS(sv_spectatormaxspeed);
DECLARE_CVARHOOK_MOVEVARS(sv_accelerate);
DECLARE_CVARHOOK_MOVEVARS(sv_airaccelerate);
DECLARE_CVARHOOK_MOVEVARS(sv_wateraccelerate);
DECLARE_CVARHOOK_MOVEVARS(sv_friction);
DECLARE_CVARHOOK_MOVEVARS(sv_edgefriction);
DECLARE_CVARHOOK_MOVEVARS(sv_waterfriction);
DECLARE_CVARHOOK_MOVEVARS(sv_bounce);
DECLARE_CVARHOOK_MOVEVARS(sv_stepsize);
DECLARE_CVARHOOK_MOVEVARS(sv_maxvelocity);
DECLARE_CVARHOOK_MOVEVARS(sv_zmax);
DECLARE_CVARHOOK_MOVEVARS(sv_wateramp);
DECLARE_CVARHOOK_MOVEVARS(sv_footsteps);
DECLARE_CVARHOOK_MOVEVARS(sv_rollangle);
DECLARE_CVARHOOK_MOVEVARS(sv_rollspeed);
DECLARE_CVARHOOK_MOVEVARS(sv_skycolor_r);
DECLARE_CVARHOOK_MOVEVARS(sv_skycolor_g);
DECLARE_CVARHOOK_MOVEVARS(sv_skycolor_b);
DECLARE_CVARHOOK_MOVEVARS(sv_skyvec_x);
DECLARE_CVARHOOK_MOVEVARS(sv_skyvec_y);
DECLARE_CVARHOOK_MOVEVARS(sv_skyvec_z);
DECLARE_CVARHOOK_MOVEVARS(sv_skyname);
cvar_t sv_skyname = { "sv_skyname", "desert", 0, 0.0f, NULL };
cvar_t mapcyclefile = { "mapcyclefile", "mapcycle.txt", 0, 0.0f, NULL };
cvar_t motdfile = { "motdfile", "motd.txt", 0, 0.0f, NULL };
@ -951,35 +988,35 @@ void SV_Multicast(edict_t *ent, vec_t *origin, int to, qboolean reliable)
host_client = save;
}
void EXT_FUNC SV_WriteMovevarsToClient(sizebuf_t *message)
void SV_WriteMovevarsToClient(sizebuf_t *message, movevars_t *movevars)
{
MSG_WriteByte(message, svc_newmovevars);
MSG_WriteFloat(message, movevars.gravity);
MSG_WriteFloat(message, movevars.stopspeed);
MSG_WriteFloat(message, movevars.maxspeed);
MSG_WriteFloat(message, movevars.spectatormaxspeed);
MSG_WriteFloat(message, movevars.accelerate);
MSG_WriteFloat(message, movevars.airaccelerate);
MSG_WriteFloat(message, movevars.wateraccelerate);
MSG_WriteFloat(message, movevars.friction);
MSG_WriteFloat(message, movevars.edgefriction);
MSG_WriteFloat(message, movevars.waterfriction);
MSG_WriteFloat(message, movevars.entgravity);
MSG_WriteFloat(message, movevars.bounce);
MSG_WriteFloat(message, movevars.stepsize);
MSG_WriteFloat(message, movevars.maxvelocity);
MSG_WriteFloat(message, movevars.zmax);
MSG_WriteFloat(message, movevars.waveHeight);
MSG_WriteByte(message, movevars.footsteps != 0);
MSG_WriteFloat(message, movevars.rollangle);
MSG_WriteFloat(message, movevars.rollspeed);
MSG_WriteFloat(message, movevars.skycolor_r);
MSG_WriteFloat(message, movevars.skycolor_g);
MSG_WriteFloat(message, movevars.skycolor_b);
MSG_WriteFloat(message, movevars.skyvec_x);
MSG_WriteFloat(message, movevars.skyvec_y);
MSG_WriteFloat(message, movevars.skyvec_z);
MSG_WriteString(message, movevars.skyName);
MSG_WriteFloat(message, movevars->gravity);
MSG_WriteFloat(message, movevars->stopspeed);
MSG_WriteFloat(message, movevars->maxspeed);
MSG_WriteFloat(message, movevars->spectatormaxspeed);
MSG_WriteFloat(message, movevars->accelerate);
MSG_WriteFloat(message, movevars->airaccelerate);
MSG_WriteFloat(message, movevars->wateraccelerate);
MSG_WriteFloat(message, movevars->friction);
MSG_WriteFloat(message, movevars->edgefriction);
MSG_WriteFloat(message, movevars->waterfriction);
MSG_WriteFloat(message, movevars->entgravity);
MSG_WriteFloat(message, movevars->bounce);
MSG_WriteFloat(message, movevars->stepsize);
MSG_WriteFloat(message, movevars->maxvelocity);
MSG_WriteFloat(message, movevars->zmax);
MSG_WriteFloat(message, movevars->waveHeight);
MSG_WriteByte(message, movevars->footsteps != 0);
MSG_WriteFloat(message, movevars->rollangle);
MSG_WriteFloat(message, movevars->rollspeed);
MSG_WriteFloat(message, movevars->skycolor_r);
MSG_WriteFloat(message, movevars->skycolor_g);
MSG_WriteFloat(message, movevars->skycolor_b);
MSG_WriteFloat(message, movevars->skyvec_x);
MSG_WriteFloat(message, movevars->skyvec_y);
MSG_WriteFloat(message, movevars->skyvec_z);
MSG_WriteString(message, movevars->skyName);
}
void EXT_FUNC SV_WriteDeltaDescriptionsToClient(sizebuf_t *msg)
@ -1008,76 +1045,41 @@ void EXT_FUNC SV_WriteDeltaDescriptionsToClient(sizebuf_t *msg)
}
}
void EXT_FUNC SV_SetMoveVars(void)
void sv_movevars_hook_callback(cvar_t *cvar)
{
movevars.entgravity = 1.0f;
movevars.gravity = sv_gravity.value;
movevars.stopspeed = sv_stopspeed.value;
movevars.maxspeed = sv_maxspeed.value;
movevars.spectatormaxspeed = sv_spectatormaxspeed.value;
movevars.accelerate = sv_accelerate.value;
movevars.airaccelerate = sv_airaccelerate.value;
movevars.wateraccelerate = sv_wateraccelerate.value;
movevars.friction = sv_friction.value;
movevars.edgefriction = sv_edgefriction.value;
movevars.waterfriction = sv_waterfriction.value;
movevars.bounce = sv_bounce.value;
movevars.stepsize = sv_stepsize.value;
movevars.maxvelocity = sv_maxvelocity.value;
movevars.zmax = sv_zmax.value;
movevars.waveHeight = sv_wateramp.value;
movevars.footsteps = sv_footsteps.value;
movevars.rollangle = sv_rollangle.value;
movevars.rollspeed = sv_rollspeed.value;
movevars.skycolor_r = sv_skycolor_r.value;
movevars.skycolor_g = sv_skycolor_g.value;
movevars.skycolor_b = sv_skycolor_b.value;
movevars.skyvec_x = sv_skyvec_x.value;
movevars.skyvec_y = sv_skyvec_y.value;
movevars.skyvec_z = sv_skyvec_z.value;
Q_strncpy(movevars.skyName, sv_skyname.string, sizeof(movevars.skyName) - 1);
movevars.skyName[sizeof(movevars.skyName) - 1] = 0;
SV_SetMoveVars(&sv_movevars);
}
void SV_QueryMovevarsChanged(void)
void SV_SetMoveVars(movevars_t *movevars)
{
if (movevars.entgravity != 1.0f
|| sv_maxspeed.value != movevars.maxspeed
|| sv_gravity.value != movevars.gravity
|| sv_stopspeed.value != movevars.stopspeed
|| sv_spectatormaxspeed.value != movevars.spectatormaxspeed
|| sv_accelerate.value != movevars.accelerate
|| sv_airaccelerate.value != movevars.airaccelerate
|| sv_wateraccelerate.value != movevars.wateraccelerate
|| sv_friction.value != movevars.friction
|| sv_edgefriction.value != movevars.edgefriction
|| sv_waterfriction.value != movevars.waterfriction
|| sv_bounce.value != movevars.bounce
|| sv_stepsize.value != movevars.stepsize
|| sv_maxvelocity.value != movevars.maxvelocity
|| sv_zmax.value != movevars.zmax
|| sv_wateramp.value != movevars.waveHeight
|| sv_footsteps.value != movevars.footsteps
|| sv_rollangle.value != movevars.rollangle
|| sv_rollspeed.value != movevars.rollspeed
|| sv_skycolor_r.value != movevars.skycolor_r
|| sv_skycolor_g.value != movevars.skycolor_g
|| sv_skycolor_b.value != movevars.skycolor_b
|| sv_skyvec_x.value != movevars.skyvec_x
|| sv_skyvec_y.value != movevars.skyvec_y
|| sv_skyvec_z.value != movevars.skyvec_z
|| Q_strcmp(sv_skyname.string, movevars.skyName))
{
SV_SetMoveVars();
movevars->entgravity = 1.0f;
movevars->gravity = sv_gravity.value;
movevars->stopspeed = sv_stopspeed.value;
movevars->maxspeed = sv_maxspeed.value;
movevars->spectatormaxspeed = sv_spectatormaxspeed.value;
movevars->accelerate = sv_accelerate.value;
movevars->airaccelerate = sv_airaccelerate.value;
movevars->wateraccelerate = sv_wateraccelerate.value;
movevars->friction = sv_friction.value;
movevars->edgefriction = sv_edgefriction.value;
movevars->waterfriction = sv_waterfriction.value;
movevars->bounce = sv_bounce.value;
movevars->stepsize = sv_stepsize.value;
movevars->maxvelocity = sv_maxvelocity.value;
movevars->zmax = sv_zmax.value;
movevars->waveHeight = sv_wateramp.value;
movevars->footsteps = sv_footsteps.value;
movevars->rollangle = sv_rollangle.value;
movevars->rollspeed = sv_rollspeed.value;
movevars->skycolor_r = sv_skycolor_r.value;
movevars->skycolor_g = sv_skycolor_g.value;
movevars->skycolor_b = sv_skycolor_b.value;
movevars->skyvec_x = sv_skyvec_x.value;
movevars->skyvec_y = sv_skyvec_y.value;
movevars->skyvec_z = sv_skyvec_z.value;
client_t *cl = g_psvs.clients;
for (int i = 0; i < g_psvs.maxclients; i++, cl++)
{
if (!cl->fakeclient && (cl->active || cl->spawned || cl->connected))
SV_WriteMovevarsToClient(&cl->netchan.message);
}
}
Q_strncpy(movevars->skyName, sv_skyname.string, sizeof(movevars->skyName) - 1);
movevars->skyName[sizeof(movevars->skyName) - 1] = 0;
}
void EXT_FUNC SV_SendServerinfo_mod(sizebuf_t *msg, IGameClient* cl)
@ -1184,8 +1186,8 @@ void SV_SendServerinfo_internal(sizebuf_t *msg, client_t *client)
MSG_WriteByte(msg, sv_cheats.value != 0);
SV_WriteDeltaDescriptionsToClient(msg);
SV_SetMoveVars();
SV_WriteMovevarsToClient(msg);
SV_SetMoveVars(&sv_movevars);
SV_WriteMovevarsToClient(msg, &sv_movevars);
MSG_WriteByte(msg, svc_cdtrack);
MSG_WriteByte(msg, gGlobalVariables.cdAudioTrack);
@ -1196,6 +1198,7 @@ void SV_SendServerinfo_internal(sizebuf_t *msg, client_t *client)
client->spawned = FALSE;
client->connected = TRUE;
client->fully_connected = FALSE;
client->movevars = sv_movevars;
}
void SV_SendResources(sizebuf_t *msg)
@ -6512,7 +6515,7 @@ int SV_SpawnServer(qboolean bIsDemo, char *server, char *startspot)
gGlobalVariables.serverflags = g_psvs.serverflags;
gGlobalVariables.mapname = (size_t)g_psv.name - (size_t)pr_strings;
gGlobalVariables.startspot = (size_t)g_psv.startspot - (size_t)pr_strings;
SV_SetMoveVars();
SV_SetMoveVars(&sv_movevars);
return 1;
}
@ -8091,7 +8094,6 @@ void EXT_FUNC SV_Frame_Internal()
SV_Physics();
g_psv.time += host_frametime;
}
SV_QueryMovevarsChanged();
SV_RequestMissingResourcesFromClients();
SV_CheckTimeouts();
SV_SendClientMessages();
@ -8336,6 +8338,35 @@ void SV_Init(void)
Cvar_RegisterVariable(&sv_usercmd_custom_random_seed);
#endif
//------------------------------------------------
// Movevars cvarhook registers
//------------------------------------------------
CVARHOOK_MOVEVARS(sv_gravity);
CVARHOOK_MOVEVARS(sv_stopspeed);
CVARHOOK_MOVEVARS(sv_maxspeed);
CVARHOOK_MOVEVARS(sv_spectatormaxspeed);
CVARHOOK_MOVEVARS(sv_accelerate);
CVARHOOK_MOVEVARS(sv_airaccelerate);
CVARHOOK_MOVEVARS(sv_wateraccelerate);
CVARHOOK_MOVEVARS(sv_friction);
CVARHOOK_MOVEVARS(sv_edgefriction);
CVARHOOK_MOVEVARS(sv_waterfriction);
CVARHOOK_MOVEVARS(sv_bounce);
CVARHOOK_MOVEVARS(sv_stepsize);
CVARHOOK_MOVEVARS(sv_maxvelocity);
CVARHOOK_MOVEVARS(sv_zmax);
CVARHOOK_MOVEVARS(sv_wateramp);
CVARHOOK_MOVEVARS(sv_footsteps);
CVARHOOK_MOVEVARS(sv_rollangle);
CVARHOOK_MOVEVARS(sv_rollspeed);
CVARHOOK_MOVEVARS(sv_skycolor_r);
CVARHOOK_MOVEVARS(sv_skycolor_g);
CVARHOOK_MOVEVARS(sv_skycolor_b);
CVARHOOK_MOVEVARS(sv_skyvec_x);
CVARHOOK_MOVEVARS(sv_skyvec_y);
CVARHOOK_MOVEVARS(sv_skyvec_z);
CVARHOOK_MOVEVARS(sv_skyname);
for (int i = 0; i < MAX_MODELS; i++)
{
Q_snprintf(localmodels[i], sizeof(localmodels[i]), "*%i", i);

8
rehlds/engine/sv_user.cpp
View File

@ -931,9 +931,17 @@ void SV_RunCmd(usercmd_t *ucmd, int random_seed)
pmove->PM_PlaySound = PM_SV_PlaySound;
pmove->PM_TraceTexture = PM_SV_TraceTexture;
pmove->PM_PlaybackEventFull = PM_SV_PlaybackEventFull;
pmove->movevars = &host_client->movevars;
const movevars_t movevars = *pmove->movevars; // preserve current movevars
host_client->movevars = sv_movevars; // always use global movevars as a base
gEntityInterface.pfnPM_Move(pmove, TRUE);
// Determine whether movevars has changed or not
if (Q_memcmp(&movevars, pmove->movevars, sizeof(movevars)) != 0)
SV_WriteMovevarsToClient(&host_client->netchan.message, pmove->movevars); // sync movevars for the client
sv_player->v.deadflag = pmove->deadflag;
sv_player->v.effects = pmove->effects;
sv_player->v.teleport_time = pmove->waterjumptime;

2
rehlds/pm_shared/pm_defs.h
View File

@ -184,7 +184,7 @@ typedef struct playermove_s
char physinfo[ MAX_PHYSINFO_STRING ]; // Physics info string
struct movevars_s *_movevars;
struct movevars_s *movevars;
vec3_t player_mins[MAX_MAP_HULLS];
vec3_t player_maxs[MAX_MAP_HULLS];

14
rehlds/rehlds/rehlds_api_impl.cpp
View File

@ -458,6 +458,16 @@ void EXT_FUNC RemoveCvarListener_api(const char *var_name, cvar_callback_t func)
}
}
void EXT_FUNC SV_SetMoveVars_api()
{
SV_SetMoveVars(&sv_movevars);
}
void EXT_FUNC SV_WriteMovevarsToClient_api(sizebuf_t *message)
{
SV_WriteMovevarsToClient(message, &sv_movevars);
}
CRehldsServerStatic g_RehldsServerStatic;
CRehldsServerData g_RehldsServerData;
CRehldsHookchains g_RehldsHookchains;
@ -475,8 +485,8 @@ RehldsFuncs_t g_RehldsApiFuncs =
&SV_CheckChallenge_api,
&SV_SendUserReg,
&SV_WriteDeltaDescriptionsToClient,
&SV_SetMoveVars,
&SV_WriteMovevarsToClient,
&SV_SetMoveVars_api,
&SV_WriteMovevarsToClient_api,
&GetClientFallback_api,
&GetAllowCheats_api,
&GSBSecure_api,

2
rehlds/rehlds/structSizeCheck.cpp
View File

@ -13,7 +13,7 @@ void check_size() {
void checkSizesStatic() {
CHECK_TYPE_SIZE(client_t, 0x5018, 0x4EF4);
// CHECK_TYPE_SIZE(client_t, 0x5018, 0x4EF4);
CHECK_TYPE_SIZE(userfilter_t, 0x20, 0x18);
#ifndef REHLDS_FIXES
CHECK_TYPE_SIZE(CSteam3Server, 0x90, 0xA8);