Rework g_chase.c again

src/game/baseq2/g_chase.c

@@ -1,25 +1,33 @@
 /*
-Copyright (C) 1997-2001 Id Software, Inc.
+ * Copyright (C) 1997-2001 Id Software, Inc.
-
+ *
-This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or modify
-modify it under the terms of the GNU General Public License
+ * it under the terms of the GNU General Public License as published by
-as published by the Free Software Foundation; either version 2
+ * the Free Software Foundation; either version 2 of the License, or (at
-of the License, or (at your option) any later version.
+ * your option) any later version.
-
+ *
-This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful, but
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
+ *
-See the GNU General Public License for more details.
+ * See the GNU General Public License for more details.
-
+ *
-You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+ * along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
+ * 02111-1307, USA.
+ *
+ * =======================================================================
+ *
+ * Chase cam.
+ *
+ * =======================================================================
  */
+
 #include "g_local.h"
 
-void UpdateChaseCam(edict_t *ent)
+void
+UpdateChaseCam(edict_t *ent)
 {
 	vec3_t o, ownerv, goal;
 	edict_t *targ;
@@ -29,12 +37,15 @@ void UpdateChaseCam(edict_t *ent)
 	vec3_t oldgoal;
 	vec3_t angles;
 
-	// is our chase target gone?
+	/* is our chase target gone? */
-	if (!ent->client->chase_target->inuse
+	if (!ent->client->chase_target->inuse ||
-		|| ent->client->chase_target->client->resp.spectator) {
+		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;
@@ -49,18 +60,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);
 	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);
 
@@ -68,11 +87,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;
 	}
@@ -80,25 +101,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);
 	}
@@ -108,68 +142,105 @@ 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)
+	{
 		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)
+	{
 		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++) {
+	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.");
 }