yquake2/rogue
0
0
Fork 0
mirror of https://github.com/yquake2/rogue.git synced 2024-11-14 00:21:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup g_chase.c and add sanity checks

Browse source
This commit is contained in:
Yamagi Burmeister 2013-05-01 10:28:42 +02:00
parent 8a89578a2d
commit 7dc2b023e9
1 changed files with 121 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

151
src/g_chase.c
View file

@ -1,6 +1,15 @@
/*
* =======================================================================
*
* Chase cam. Only used in multiplayer mode.
*
* =======================================================================
*/
#include "header/local.h"
void UpdateChaseCam(edict_t *ent)
void
UpdateChaseCam(edict_t *ent)
{
vec3_t o, ownerv, goal;
edict_t *targ;
@ -8,13 +17,21 @@ void UpdateChaseCam(edict_t *ent)
trace_t trace;
int i;
vec3_t angles;
// is our chase target gone?
if (!ent->client->chase_target->inuse
|| ent->client->chase_target->client->resp.spectator) {
if (!ent)
{
return;
}
/* is our chase target gone? */
if (!ent->client->chase_target->inuse ||
ent->client->chase_target->client->resp.spectator)
{
edict_t *old = ent->client->chase_target;
ChaseNext(ent);
if (ent->client->chase_target == old) {
if (ent->client->chase_target == old)
{
ent->client->chase_target = NULL;
ent->client->ps.pmove.pm_flags &= ~PMF_NO_PREDICTION;
return;
@ -27,18 +44,26 @@ void UpdateChaseCam(edict_t *ent)
ownerv[2] += targ->viewheight;
VectorCopy(targ->client->v_angle, angles);
if (angles[PITCH] > 56)
{
angles[PITCH] = 56;
AngleVectors (angles, forward, right, NULL);
}
AngleVectors(angles, forward, right, NULL);
VectorNormalize(forward);
VectorMA(ownerv, -30, forward, o);
if (o[2] < targ->s.origin[2] + 20)
{
o[2] = targ->s.origin[2] + 20;
}
// jump animation lifts
/* jump animation lifts */
if (!targ->groundentity)
{
o[2] += 16;
}
trace = gi.trace(ownerv, vec3_origin, vec3_origin, o, targ, MASK_SOLID);
@ -46,11 +71,13 @@ void UpdateChaseCam(edict_t *ent)
VectorMA(goal, 2, forward, goal);
// pad for floors and ceilings
/* pad for floors and ceilings */
VectorCopy(goal, o);
o[2] += 6;
trace = gi.trace(goal, vec3_origin, vec3_origin, o, targ, MASK_SOLID);
if (trace.fraction < 1) {
if (trace.fraction < 1)
{
VectorCopy(trace.endpos, goal);
goal[2] -= 6;
}
@ -58,25 +85,38 @@ void UpdateChaseCam(edict_t *ent)
VectorCopy(goal, o);
o[2] -= 6;
trace = gi.trace(goal, vec3_origin, vec3_origin, o, targ, MASK_SOLID);
if (trace.fraction < 1) {
if (trace.fraction < 1)
{
VectorCopy(trace.endpos, goal);
goal[2] += 6;
}
if (targ->deadflag)
{
ent->client->ps.pmove.pm_type = PM_DEAD;
}
else
{
ent->client->ps.pmove.pm_type = PM_FREEZE;
}
VectorCopy(goal, ent->s.origin);
for (i=0 ; i<3 ; i++)
ent->client->ps.pmove.delta_angles[i] = ANGLE2SHORT(targ->client->v_angle[i] - ent->client->resp.cmd_angles[i]);
if (targ->deadflag) {
for (i = 0; i < 3; i++)
{
ent->client->ps.pmove.delta_angles[i] = ANGLE2SHORT(
targ->client->v_angle[i] - ent->client->resp.cmd_angles[i]);
}
if (targ->deadflag)
{
ent->client->ps.viewangles[ROLL] = 40;
ent->client->ps.viewangles[PITCH] = -15;
ent->client->ps.viewangles[YAW] = targ->client->killer_yaw;
} else {
}
else
{
VectorCopy(targ->client->v_angle, ent->client->ps.viewangles);
VectorCopy(targ->client->v_angle, ent->client->v_angle);
}
@ -86,68 +126,119 @@ void UpdateChaseCam(edict_t *ent)
gi.linkentity(ent);
}
void ChaseNext(edict_t *ent)
void
ChaseNext(edict_t *ent)
{
int i;
edict_t *e;
if (!ent->client->chase_target)
if (!ent)
{
return;
}
if (!ent->client->chase_target)
{
return;
}
i = ent->client->chase_target - g_edicts;
do {
do
{
i++;
if (i > maxclients->value)
{
i = 1;
}
e = g_edicts + i;
if (!e->inuse)
{
continue;
}
if (!e->client->resp.spectator)
{
break;
} while (e != ent->client->chase_target);
}
}
while (e != ent->client->chase_target);
ent->client->chase_target = e;
ent->client->update_chase = true;
}
void ChasePrev(edict_t *ent)
void
ChasePrev(edict_t *ent)
{
int i;
edict_t *e;
if (!ent->client->chase_target)
if (!ent)
{
return;
}
if (!ent->client->chase_target)
{
return;
}
i = ent->client->chase_target - g_edicts;
do {
do
{
i--;
if (i < 1)
{
i = maxclients->value;
}
e = g_edicts + i;
if (!e->inuse)
{
continue;
}
if (!e->client->resp.spectator)
{
break;
} while (e != ent->client->chase_target);
}
}
while (e != ent->client->chase_target);
ent->client->chase_target = e;
ent->client->update_chase = true;
}
void GetChaseTarget(edict_t *ent)
void
GetChaseTarget(edict_t *ent)
{
int i;
edict_t *other;
for (i = 1; i <= maxclients->value; i++) {
if (!ent)
{
return;
}
for (i = 1; i <= maxclients->value; i++)
{
other = g_edicts + i;
if (other->inuse && !other->client->resp.spectator) {
if (other->inuse && !other->client->resp.spectator)
{
ent->client->chase_target = other;
ent->client->update_chase = true;
UpdateChaseCam(ent);
return;
}
}
gi.centerprintf(ent, "No other players to chase.");
}