From f72621755b33cc0ca0e16250aaa5cdade2d84920 Mon Sep 17 00:00:00 2001
From: Richard Allen <ra@ra.is>
Date: Sun, 10 Feb 2002 04:55:28 +0000
Subject: [PATCH] Fix #1 to zcam jitter.   More is probably needed.

---
 reaction/Makefile          | 6 +++---
 reaction/game/g_main.c     | 5 ++++-
 reaction/game/g_teamplay.c | 8 +++++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/reaction/Makefile b/reaction/Makefile
index 044fb120..aac8509b 100755
--- a/reaction/Makefile
+++ b/reaction/Makefile
@@ -47,9 +47,9 @@ GOBJ = \
 	$(GDIRNAME)/ai_vcmd.o \
 	$(GDIRNAME)/rxn_game.o \
 	$(GDIRNAME)/g_teamplay.o \
-	$(GDIRNAME)/g_matchmode.o
-#	$(GDIRNAME)/zcam.o \
-#	$(GDIRNAME)/zcam_target.o
+	$(GDIRNAME)/g_matchmode.o \
+	$(GDIRNAME)/zcam.o \
+	$(GDIRNAME)/zcam_target.o
 
 CGOBJ = \
 	$(CGDIRNAME)/cg_main.o \
diff --git a/reaction/game/g_main.c b/reaction/game/g_main.c
index 88c76896..7a6f8fc4 100644
--- a/reaction/game/g_main.c
+++ b/reaction/game/g_main.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.23  2002/02/10 04:55:28  jbravo
+// Fix #1 to zcam jitter.   More is probably needed.
+//
 // Revision 1.22  2002/02/07 23:47:06  niceass
 // Score sorting for >= GT_TEAM fixed
 //
@@ -565,7 +568,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) {
 	//Elder: spawn unique items.
 	// JBravo: unless we are in Teamplay
 	if ( g_gametype.integer != GT_TEAMPLAY ) {
-	RQ3_StartUniqueItems();
+		RQ3_StartUniqueItems();
 	}
 
 	// Elder: force sv_floodprotect to 0 -- remove when we finish
diff --git a/reaction/game/g_teamplay.c b/reaction/game/g_teamplay.c
index eac4c355..f54886dc 100644
--- a/reaction/game/g_teamplay.c
+++ b/reaction/game/g_teamplay.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.14  2002/02/10 04:55:28  jbravo
+// Fix #1 to zcam jitter.   More is probably needed.
+//
 // Revision 1.13  2002/02/09 00:10:12  jbravo
 // Fixed spectator follow and free and updated zcam to 1.04 and added the
 // missing zcam files.
@@ -384,7 +387,7 @@ int WonGame(int winner)
 			trap_Cvar_Set("RQ3_Team2", "0");
 			MakeAllLivePlayersObservers ();
 			trap_SendServerCommand( -1, "cp \"Match is OVER !!!.\n\"");
-			return;
+			return 1;
 			}
 		}
 		else {
@@ -492,8 +495,10 @@ void SpawnPlayers()
 		client->sess.teamSpawn = qtrue;
 		if (client->sess.savedTeam == TEAM_RED) {
 			client->sess.sessionTeam = TEAM_RED;
+			client->ps.persistant[PERS_TEAM] = TEAM_RED;
 		} else if (client->sess.savedTeam == TEAM_BLUE) {
 			client->sess.sessionTeam = TEAM_BLUE;
+			client->ps.persistant[PERS_TEAM] = TEAM_BLUE;
 		}
 		client->ps.stats[STAT_RQ3] &= ~RQ3_PLAYERSOLID;
 		ClientSpawn(player);
@@ -686,6 +691,7 @@ void MakeSpectator( gentity_t *ent )
 	client->ps.stats[STAT_WEAPONS] = 0;
 	client->sess.savedTeam = client->sess.sessionTeam;
 	client->sess.sessionTeam = TEAM_SPECTATOR;
+	client->ps.persistant[PERS_TEAM] = TEAM_SPECTATOR;
 	ClientSpawn(ent);
 }