From b5f1fbeca6a05fa3afdcf6baeacefbaa42ed1a8e Mon Sep 17 00:00:00 2001 From: Denis Pauk Date: Sun, 15 Dec 2024 01:27:55 +0200 Subject: [PATCH] game: remove unused remote_vieworigin --- src/client/cl_parse.c | 7 ------- src/common/header/common.h | 1 - src/common/header/shared.h | 4 ---- src/game/g_misc.c | 10 ++++++++-- src/server/sv_entities.c | 15 --------------- 5 files changed, 8 insertions(+), 29 deletions(-) diff --git a/src/client/cl_parse.c b/src/client/cl_parse.c index f94cbeb52..1e7dbe124 100644 --- a/src/client/cl_parse.c +++ b/src/client/cl_parse.c @@ -761,13 +761,6 @@ CL_ParsePlayerstate(frame_t *oldframe, frame_t *newframe) state->maxs[2] = MSG_ReadFloat(&net_message); } - if (flags & PS_REMOTE_VIEWORIGIN) - { - state->remote_vieworigin[0] = MSG_ReadShort(&net_message); - state->remote_vieworigin[1] = MSG_ReadShort(&net_message); - state->remote_vieworigin[2] = MSG_ReadShort(&net_message); - } - /* parse stats */ MSG_ReadData(&net_message, (byte*)&state->stats[0], sizeof(state->stats)); } diff --git a/src/common/header/common.h b/src/common/header/common.h index 7f9a65b07..f33fb162c 100644 --- a/src/common/header/common.h +++ b/src/common/header/common.h @@ -274,7 +274,6 @@ enum clc_ops_e #define PS_WEAPONFRAME (1 << 13) #define PS_RDFLAGS (1 << 14) -#define PS_REMOTE_VIEWORIGIN (1 << 16) #define PS_MINSMAXS (1 << 18) /*============================================== */ diff --git a/src/common/header/shared.h b/src/common/header/shared.h index 11699e2f4..656466f3d 100644 --- a/src/common/header/shared.h +++ b/src/common/header/shared.h @@ -1571,10 +1571,6 @@ typedef struct short stats[MAX_STATS]; /* fast status bar updates */ - /* For remote camera views */ - - vec3_t remote_vieworigin; - // Deltas added to the player model's client determined angles. vec3_t offsetangles; diff --git a/src/game/g_misc.c b/src/game/g_misc.c index 8e10d7047..82e1c2fac 100644 --- a/src/game/g_misc.c +++ b/src/game/g_misc.c @@ -2088,6 +2088,7 @@ void misc_remote_camera_think(edict_t *Self) VectorCopy(Self->enemy->s.origin,Self->s.origin); } +#if 0 // Update the position on client(s). if(Self->spawnflags&1) @@ -2125,6 +2126,7 @@ void misc_remote_camera_think(edict_t *Self) } } } +#endif } // ******************************************************************************************** @@ -2276,9 +2278,10 @@ void Use_misc_remote_camera(edict_t *Self,edict_t *Other,edict_t *Activator) int i; Self->enemy=NULL; - +#if 0 for(i=0;i<3;i++) Self->activator->client->ps.remote_vieworigin[i]=Self->s.origin[i]; +#endif } else { @@ -2295,9 +2298,10 @@ void Use_misc_remote_camera(edict_t *Self,edict_t *Other,edict_t *Activator) if(!cl_ent->inuse) continue; - +#if 0 for(j=0;j<3;j++) cl_ent->client->ps.remote_vieworigin[j]=Self->s.origin[j]; +#endif } } } @@ -2314,6 +2318,7 @@ void Use_misc_remote_camera(edict_t *Self,edict_t *Other,edict_t *Activator) VectorCopy(Self->enemy->s.origin,Self->s.origin); } +#if 0 // Update the position on client(s). if(Self->spawnflags&1) @@ -2351,6 +2356,7 @@ void Use_misc_remote_camera(edict_t *Self,edict_t *Other,edict_t *Activator) } } } +#endif } } // ******************************************************************************************** diff --git a/src/server/sv_entities.c b/src/server/sv_entities.c index d9b602faa..34d2aadf4 100644 --- a/src/server/sv_entities.c +++ b/src/server/sv_entities.c @@ -262,14 +262,6 @@ SV_WritePlayerstateToClient(client_frame_t *from, client_frame_t *to, pflags |= PS_WEAPONFRAME; } - if (ps->remote_vieworigin[0] != ops->remote_vieworigin[0] || - ps->remote_vieworigin[1] != ops->remote_vieworigin[1] || - ps->remote_vieworigin[2] != ops->remote_vieworigin[2]) - { - - pflags |= PS_REMOTE_VIEWORIGIN; - } - if (ps->mins[0] != ops->mins[0] || ps->mins[1] != ops->mins[1] || ps->mins[2] != ops->mins[2] || ps->maxs[0] != ops->maxs[0] || ps->maxs[1] != ops->maxs[1] || ps->maxs[2] != ops->maxs[2]) { @@ -404,13 +396,6 @@ SV_WritePlayerstateToClient(client_frame_t *from, client_frame_t *to, MSG_WriteFloat(msg, ps->maxs[2]); } - if (pflags & PS_REMOTE_VIEWORIGIN) - { - MSG_WriteShort(msg, ps->remote_vieworigin[0]); - MSG_WriteShort(msg, ps->remote_vieworigin[1]); - MSG_WriteShort(msg, ps->remote_vieworigin[2]); - } - /* send stats */ MSG_WriteData(msg, (byte *)&ps->stats[0], sizeof(ps->stats)); }