From 7fcca121eebe627b099252a3a3b598ced74b1c4e Mon Sep 17 00:00:00 2001
From: Bryce Hutchings <niceass@rq3.com>
Date: Mon, 3 Jun 2002 05:25:37 +0000
Subject: [PATCH] spectator changes

---
 reaction/cgame/cg_draw.c    | 16 ++++++++++------
 reaction/cgame/cg_predict.c |  7 +++++--
 reaction/game/g_active.c    |  9 ++++++---
 reaction/game/g_local.h     |  5 ++++-
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/reaction/cgame/cg_draw.c b/reaction/cgame/cg_draw.c
index 73f31b85..b47c800a 100644
--- a/reaction/cgame/cg_draw.c
+++ b/reaction/cgame/cg_draw.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.44  2002/06/03 05:23:47  niceass
+// spectator changes
+//
 // Revision 1.43  2002/06/03 00:48:32  niceass
 // match scoreboard changes
 //
@@ -2489,20 +2492,21 @@ static void CG_DrawSpectator(void) {
 		}
 	}
 
-	CG_FillRect( 0, 400, 640, 80, Color );
+	CG_FillRect( 0, 420, 640, 60, Color );
 
 	MAKERGBA(Color, 0.0f, 0.0f, 0.0f, 1.0f);
-	CG_DrawCleanLine(0, 400, 640, 1, Color);
+	CG_DrawCleanLine(0, 420, 640, 1, Color);
 
-	CG_DrawBigString(320 - 10 * 8, 410, "Spectating", 1.0F);
+	CG_DrawBigString(320 - 10 * 8, 425, "Spectating", 1.0F);
 
-	if (cg.snap->ps.persistant[PERS_SAVEDTEAM] == TEAM_RED || cg.snap->ps.persistant[PERS_SAVEDTEAM] == TEAM_BLUE) return;
+	if (cg.snap->ps.persistant[PERS_SAVEDTEAM] == TEAM_RED || 
+		cg.snap->ps.persistant[PERS_SAVEDTEAM] == TEAM_BLUE) return;
 
 	if ( cgs.gametype == GT_TOURNAMENT ) {
-		CG_DrawBigString(320 - 15 * 8, 450, "Waiting to play...", 1.0F);
+		CG_DrawBigString(320 - 15 * 8, 455, "Waiting to play...", 1.0F);
 	}
 	else if ( cgs.gametype >= GT_TEAM ) {
-		CG_DrawBigString(320 - 19 * 8, 450, "Join a team to play", 1.0F);
+		CG_DrawBigString(320 - 19 * 8, 455, "Join a team to play", 1.0F);
 	}
 }
 
diff --git a/reaction/cgame/cg_predict.c b/reaction/cgame/cg_predict.c
index 9d7b4727..e31c693e 100644
--- a/reaction/cgame/cg_predict.c
+++ b/reaction/cgame/cg_predict.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.20  2002/06/03 05:23:22  niceass
+// spectator changes
+//
 // Revision 1.19  2002/03/31 03:31:24  jbravo
 // Compiler warning cleanups
 //
@@ -479,10 +482,10 @@ void CG_PredictPlayerState( void ) {
 		cg_pmove.tracemask = MASK_PLAYERSOLID;
 	}
 	if ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR ) {
-		cg_pmove.tracemask &= ~CONTENTS_BODY;	// spectators can fly through bodies
+		cg_pmove.tracemask = 0;	// NiceAss: spectators can fly through everything
 	}
 
-// JBravo: fixing telefragging and shit during spawing (Thanks NiceAss! :)
+	// JBravo: fixing telefragging and shit during spawing (Thanks NiceAss! :)
 	if ((cg.snap->ps.stats[STAT_RQ3] & RQ3_PLAYERSOLID) != RQ3_PLAYERSOLID) {
 		cg_pmove.tracemask &= ~CONTENTS_BODY;
 	}
diff --git a/reaction/game/g_active.c b/reaction/game/g_active.c
index b408f5d1..1f20b892 100644
--- a/reaction/game/g_active.c
+++ b/reaction/game/g_active.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.74  2002/06/03 05:25:37  niceass
+// spectator changes
+//
 // Revision 1.73  2002/05/21 04:58:27  blaze
 // kicked the reload bugs ass!
 //
@@ -502,11 +505,11 @@ void	G_TouchTriggers( gentity_t *ent ) {
 
 		// ignore most entities if a spectator
 		if ( ent->client->sess.sessionTeam == TEAM_SPECTATOR ) {
-			if ( hit->s.eType != ET_TELEPORT_TRIGGER &&
+			if ( hit->s.eType != ET_TELEPORT_TRIGGER ) { //&&
 				// this is ugly but adding a new ET_? type will
 				// most likely cause network incompatibilities
 				// NiceAss: changed Touch_DoorTrigger to Touch_DoorTriggerSpectator
-				hit->touch != Touch_DoorTriggerSpectator) {
+				// hit->touch != Touch_DoorTriggerSpectator) {
 				continue;
 			}
 		}
@@ -573,7 +576,7 @@ void SpectatorThink( gentity_t *ent, usercmd_t *ucmd ) {
 		memset (&pm, 0, sizeof(pm));
 		pm.ps = &client->ps;
 		pm.cmd = *ucmd;
-		pm.tracemask = MASK_PLAYERSOLID & ~CONTENTS_BODY;	// spectators can fly through bodies
+		pm.tracemask = 0;	// spectators can fly through bodies
 		pm.trace = trap_Trace;
 		pm.pointcontents = trap_PointContents;
 
diff --git a/reaction/game/g_local.h b/reaction/game/g_local.h
index 0740e1d0..8c2dead3 100644
--- a/reaction/game/g_local.h
+++ b/reaction/game/g_local.h
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.87  2002/06/03 05:24:31  niceass
+// spectator changes
+//
 // Revision 1.86  2002/05/31 18:17:10  makro
 // Bot stuff. Added a server command that prints a line to a client
 // and everyone who is spectating him
@@ -899,7 +902,7 @@ gentity_t *fire_prox( gentity_t *self, vec3_t start, vec3_t aimdir );
 //
 void G_RunMover( gentity_t *ent );
 void Touch_DoorTrigger( gentity_t *ent, gentity_t *other, trace_t *trace );
-void Touch_DoorTriggerSpectator( gentity_t *ent, gentity_t *other, trace_t *trace ); // NiceAss: Added
+//void Touch_DoorTriggerSpectator( gentity_t *ent, gentity_t *other, trace_t *trace ); // NiceAss: Added
 
 //
 // g_trigger.c