diff --git a/README.md b/README.md index 5aad5345..7b8e24b4 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ To check: * [ ] MAX_MODELS/MAX_SOUND define hardcode, * [ ] no action on button press, * [x] soft,gl3,vk render has incorrect angles (used same angle in all renders). + * [ ] correctly implement misc_remote_camera. Minimal file set from Loki release: ``` diff --git a/src/client/cl_parse.c b/src/client/cl_parse.c index 6b969546..f94cbeb5 100644 --- a/src/client/cl_parse.c +++ b/src/client/cl_parse.c @@ -768,13 +768,6 @@ CL_ParsePlayerstate(frame_t *oldframe, frame_t *newframe) state->remote_vieworigin[2] = MSG_ReadShort(&net_message); } - if (flags & PS_REMOTE_VIEWANGLES) - { - state->remote_viewangles[0] = MSG_ReadShort(&net_message); - state->remote_viewangles[1] = MSG_ReadShort(&net_message); - state->remote_viewangles[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 2ca782f7..7f9a65b0 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_VIEWANGLES (1 << 15) #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 e4042174..11699e2f 100644 --- a/src/common/header/shared.h +++ b/src/common/header/shared.h @@ -1573,8 +1573,7 @@ typedef struct /* For remote camera views */ - vec3_t remote_vieworigin, - remote_viewangles; + vec3_t remote_vieworigin; // Deltas added to the player model's client determined angles. diff --git a/src/game/g_misc.c b/src/game/g_misc.c index 3a27743d..8e10d704 100644 --- a/src/game/g_misc.c +++ b/src/game/g_misc.c @@ -2143,7 +2143,7 @@ void misc_remote_camera_think(edict_t *Self) Self->s.angles[PITCH]=-Self->s.angles[PITCH]; // Update the angles on client(s). - +#if 0 if(Self->spawnflags&1) { // Just for the activator. @@ -2179,6 +2179,7 @@ void misc_remote_camera_think(edict_t *Self) } } } +#endif } // Think again or remove myself? @@ -2363,7 +2364,7 @@ void Use_misc_remote_camera(edict_t *Self,edict_t *Other,edict_t *Activator) Self->s.angles[PITCH]=-Self->s.angles[PITCH]; // Update the angles on client(s). - +#if 0 if(Self->spawnflags&1) { // Just for the activator. @@ -2399,6 +2400,7 @@ void Use_misc_remote_camera(edict_t *Self,edict_t *Other,edict_t *Activator) } } } +#endif // ******************************************************************************************** // Setup next think stuff. diff --git a/src/server/sv_entities.c b/src/server/sv_entities.c index f90e9876..d9b602fa 100644 --- a/src/server/sv_entities.c +++ b/src/server/sv_entities.c @@ -270,13 +270,6 @@ SV_WritePlayerstateToClient(client_frame_t *from, client_frame_t *to, pflags |= PS_REMOTE_VIEWORIGIN; } - if (ps->remote_viewangles[0] != ops->remote_viewangles[0] || - ps->remote_viewangles[1] != ops->remote_viewangles[1] || - ps->remote_viewangles[2] != ops->remote_viewangles[2]) { - - pflags |= PS_REMOTE_VIEWANGLES; - } - 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]) { @@ -418,13 +411,6 @@ SV_WritePlayerstateToClient(client_frame_t *from, client_frame_t *to, MSG_WriteShort(msg, ps->remote_vieworigin[2]); } - if (pflags & PS_REMOTE_VIEWANGLES) - { - MSG_WriteShort(msg, ps->remote_viewangles[0]); - MSG_WriteShort(msg, ps->remote_viewangles[1]); - MSG_WriteShort(msg, ps->remote_viewangles[2]); - } - /* send stats */ MSG_WriteData(msg, (byte *)&ps->stats[0], sizeof(ps->stats)); }