From 24b36137144c0b583edc39596980768dd360b5f0 Mon Sep 17 00:00:00 2001
From: Richard Allen <ra@ra.is>
Date: Sat, 23 Mar 2002 05:17:43 +0000
Subject: [PATCH] Major cleanup of game -> cgame communication with LCA vars.

---
 reaction/cgame/cg_draw.c       | 13 ++++++++-----
 reaction/cgame/cg_event.c      | 18 +++++++++++++-----
 reaction/cgame/cg_local.h      | 10 ++++++++--
 reaction/cgame/cg_main.c       | 16 +++++++++++++---
 reaction/cgame/cg_predict.c    |  8 ++++++++
 reaction/cgame/cg_scoreboard.c | 10 +++++-----
 reaction/game/bg_pmove.c       | 10 +++++-----
 reaction/game/bg_public.h      |  5 +++++
 reaction/game/g_active.c       |  8 ++++++++
 reaction/game/g_cmds.c         | 11 +++++++++--
 reaction/game/g_local.h        |  6 +++++-
 reaction/game/g_main.c         | 13 +++++++++----
 reaction/game/g_spawn.c        | 18 ++++++++++++------
 reaction/game/g_teamplay.c     | 19 +++++++++++++++++--
 14 files changed, 125 insertions(+), 40 deletions(-)

diff --git a/reaction/cgame/cg_draw.c b/reaction/cgame/cg_draw.c
index 11652dee..9cef06e2 100644
--- a/reaction/cgame/cg_draw.c
+++ b/reaction/cgame/cg_draw.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.30  2002/03/23 05:17:42  jbravo
+// Major cleanup of game -> cgame communication with LCA vars.
+//
 // Revision 1.29  2002/03/21 15:02:05  jbravo
 // More teamname cleanups and fix for fraglines.
 //
@@ -2507,7 +2510,7 @@ static qboolean CG_DrawFollow( void ) {
 	vec4_t		color;
 	const char	*name;
 	int		team;
-	char		combinedName[512], teamname[128];
+	char		combinedName[512];
 
 	if ( !(cg.snap->ps.pm_flags & PMF_FOLLOW) ) {
 		return qfalse;
@@ -2523,13 +2526,13 @@ static qboolean CG_DrawFollow( void ) {
 	if ( cgs.gametype >= GT_TEAM ) {
 		team = cgs.clientinfo[ cg.snap->ps.clientNum ].team;
 		if (team == TEAM_RED) {
-			trap_Cvar_VariableStringBuffer("g_RQ3_team1name", teamname, sizeof(teamname));
 			Com_sprintf (combinedName, sizeof(combinedName), "%s/%s",
-				cgs.clientinfo[cg.snap->ps.clientNum].name, teamname);
+				cgs.clientinfo[cg.snap->ps.clientNum].name,
+				cg_RQ3_team1name.string);
 		} else {
-			trap_Cvar_VariableStringBuffer("g_RQ3_team2name", teamname, sizeof(teamname));
 			Com_sprintf (combinedName, sizeof(combinedName), "%s/%s",
-				cgs.clientinfo[cg.snap->ps.clientNum].name, teamname);
+				cgs.clientinfo[cg.snap->ps.clientNum].name,
+				cg_RQ3_team2name.string);
 		}
 		x = 0.5 * ( 640 - GIANT_WIDTH -16 * CG_DrawStrlen( combinedName ) );
 		CG_DrawStringExt( x, 40, combinedName, color, qtrue, qtrue, GIANT_WIDTH - 16, GIANT_HEIGHT - 16, 0 );
diff --git a/reaction/cgame/cg_event.c b/reaction/cgame/cg_event.c
index 0bfc0958..a3eb72da 100644
--- a/reaction/cgame/cg_event.c
+++ b/reaction/cgame/cg_event.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.46  2002/03/23 05:17:42  jbravo
+// Major cleanup of game -> cgame communication with LCA vars.
+//
 // Revision 1.45  2002/03/21 15:02:05  jbravo
 // More teamname cleanups and fix for fraglines.
 //
@@ -453,7 +456,8 @@ static void CG_Obituary( entityState_t *ent ) {
 // JBravo: live players dont get fraglines.
 		if (message) {
 			if (cg.snap->ps.clientNum == target || cg.snap->ps.clientNum == attacker ||
-				cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR)
+				cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR ||
+				cg_RQ3_team_round_going.integer == 0)
 				CG_Printf( "%s %s %s%s\n",
 					targetName, message, attackerName, message2);
 			return;
@@ -663,7 +667,8 @@ static void CG_Obituary_Head( entityState_t *ent ) {
 // JBravo: live players dont get fraglines.
 		if (message) {
 			if (cg.snap->ps.clientNum == target || cg.snap->ps.clientNum == attacker ||
-				cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR)
+				cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR ||
+				cg_RQ3_team_round_going.integer == 0)
 				CG_Printf( "%s %s %s%s\n",
 					targetName, message, attackerName, message2);
 			return;
@@ -846,7 +851,8 @@ static void CG_Obituary_Chest( entityState_t *ent ) {
 // JBravo: live players dont get fraglines.
 		if (message) {
 			if (cg.snap->ps.clientNum == target || cg.snap->ps.clientNum == attacker ||
-				cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR)
+				cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR ||
+				cg_RQ3_team_round_going.integer == 0)
 				CG_Printf( "%s %s %s%s\n",
 					targetName, message, attackerName, message2);
 			return;
@@ -1038,7 +1044,8 @@ static void CG_Obituary_Stomach( entityState_t *ent ) {
 // JBravo: live players dont get fraglines.
 		if (message) {
 			if (cg.snap->ps.clientNum == target || cg.snap->ps.clientNum == attacker ||
-				cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR)
+				cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR ||
+				cg_RQ3_team_round_going.integer == 0)
 				CG_Printf( "%s %s %s%s\n",
 					targetName, message, attackerName, message2);
 			return;
@@ -1234,7 +1241,8 @@ static void CG_Obituary_Legs( entityState_t *ent ) {
 // JBravo: live players dont get fraglines.
 		if (message) {
 			if (cg.snap->ps.clientNum == target || cg.snap->ps.clientNum == attacker ||
-				cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR)
+				cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR ||
+				cg_RQ3_team_round_going.integer == 0)
 				CG_Printf( "%s %s %s%s\n",
 					targetName, message, attackerName, message2);
 			return;
diff --git a/reaction/cgame/cg_local.h b/reaction/cgame/cg_local.h
index f295ca23..2bed9074 100644
--- a/reaction/cgame/cg_local.h
+++ b/reaction/cgame/cg_local.h
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.57  2002/03/23 05:17:42  jbravo
+// Major cleanup of game -> cgame communication with LCA vars.
+//
 // Revision 1.56  2002/03/21 15:02:05  jbravo
 // More teamname cleanups and fix for fraglines.
 //
@@ -1553,8 +1556,11 @@ extern	vmCvar_t		cg_enableDust;
 extern	vmCvar_t		cg_enableBreath;
 //Blaze: Cheat cvars
 extern cheat_cvar		cheats[30];
-// JBravo: To signal cgame that lca is in progress
-extern	vmCvar_t		RQ3_lca;
+// JBravo: Teamplay cvars synched from game
+extern	vmCvar_t		cg_RQ3_lca;
+extern	vmCvar_t		cg_RQ3_team_round_going;
+extern	vmCvar_t		cg_RQ3_team1name;
+extern	vmCvar_t		cg_RQ3_team2name;
 //Slicer: matchmode team status cvars
 extern vmCvar_t	RQ3_team1;
 extern vmCvar_t	RQ3_team2;
diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c
index 20075607..4eb38689 100644
--- a/reaction/cgame/cg_main.c
+++ b/reaction/cgame/cg_main.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.49  2002/03/23 05:17:42  jbravo
+// Major cleanup of game -> cgame communication with LCA vars.
+//
 // Revision 1.48  2002/03/21 15:02:05  jbravo
 // More teamname cleanups and fix for fraglines.
 //
@@ -269,8 +272,12 @@ vmCvar_t	cg_enableDust;
 #endif
 //Blaze: cheat struct
 cheat_cvar	cheats[30];
-// JBravo: lca in progress cvar
-vmCvar_t	RQ3_lca;
+// JBravo: Teamplay cvars synced from game
+vmCvar_t	cg_RQ3_lca;
+vmCvar_t	cg_RQ3_team_round_going;
+vmCvar_t	cg_RQ3_team1name;
+vmCvar_t	cg_RQ3_team2name;
+
 //Slicer: matchmode team status cvars
 vmCvar_t	MM_team1;
 vmCvar_t	MM_team2;
@@ -426,7 +433,10 @@ static cvarTable_t cvarTable[] = { // bk001129
 	{ &cg_oldPlasma, "cg_oldPlasma", "1", CVAR_ARCHIVE},
 	{ &cg_trueLightning, "cg_trueLightning", "0.0", CVAR_ARCHIVE},
 // JBravo: added
-	{ &RQ3_lca, "RQ3_lca", "0", 0},
+	{ &cg_RQ3_lca, "g_RQ3_lca", "0", 0},
+	{ &cg_RQ3_team_round_going, "g_RQ3_team_round_going", "0", 0},
+	{ &cg_RQ3_team1name, "g_RQ3_team1name", "0", 0},
+	{ &cg_RQ3_team2name, "g_RQ3_team2name", "0", 0},
 	{ &cg_gravity, "g_gravity", "0", 0},
 	//Slicer: Team Status Cvars for MM
 	{ &MM_team1, "MM_team1", "0", 0},
diff --git a/reaction/cgame/cg_predict.c b/reaction/cgame/cg_predict.c
index 7c7fe6a7..f480fe4e 100644
--- a/reaction/cgame/cg_predict.c
+++ b/reaction/cgame/cg_predict.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.17  2002/03/23 05:17:42  jbravo
+// Major cleanup of game -> cgame communication with LCA vars.
+//
 // Revision 1.16  2002/03/11 02:23:06  niceass
 // client gravity fix
 //
@@ -631,6 +634,11 @@ void CG_PredictPlayerState( void ) {
 			cg_pmove.cmd.buttons |= BUTTON_ATTACK;
 	}*/
 
+// JBravo: setting lca in pm if needed
+		if (cg_RQ3_lca.integer == 1)
+			cg_pmove.lca = qtrue;
+		else
+			cg_pmove.lca = qfalse;
 		Pmove (&cg_pmove);
 
 		moved = qtrue;
diff --git a/reaction/cgame/cg_scoreboard.c b/reaction/cgame/cg_scoreboard.c
index 013569f1..eda99ae8 100644
--- a/reaction/cgame/cg_scoreboard.c
+++ b/reaction/cgame/cg_scoreboard.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.16  2002/03/23 05:17:42  jbravo
+// Major cleanup of game -> cgame communication with LCA vars.
+//
 // Revision 1.15  2002/03/21 15:02:05  jbravo
 // More teamname cleanups and fix for fraglines.
 //
@@ -320,7 +323,6 @@ static int CG_TeamplayScoreboard(int maxClients)
 	int		y;
 	int		size, players;
 	char	*String;
-	char	teamname[128];
 
 	if (cg.time > cg.scoreStartTime+300) {
 		Alpha = (cos((cg.time-cg.scoreStartTime) / 400.0f) + 1.0f) * 0.25f + 0.5f;
@@ -361,9 +363,8 @@ static int CG_TeamplayScoreboard(int maxClients)
 
 	
 	MAKERGBA(color, 0.0f, 0.0f, 0.0f, 1.0f);
-	trap_Cvar_VariableStringBuffer("g_RQ3_team1name", teamname, sizeof(teamname));
 	CG_DrawSmallStringColor(SB_MIDDLE-SB_WIDTH+SB_PADDING-6, SB_START_HEIGHT+SB_PADDING,
-							teamname, color);
+							cg_RQ3_team1name.string, color);
 
 	MAKERGBA(color, 1.0f, 1.0f, 1.0f, 0.8f);
 	CG_DrawSmallStringColor(SB_MIDDLE-SB_WIDTH+SB_PADDING-6, SB_START_HEIGHT+SMALLCHAR_HEIGHT+(SB_PADDING*3), 
@@ -396,9 +397,8 @@ static int CG_TeamplayScoreboard(int maxClients)
 		SB_WIDTH, (SMALLCHAR_HEIGHT+SB_PADDING*2), SB_LINE_WIDTH, color );
 
 	MAKERGBA(color, 0.0f, 0.0f, 0.0f, 1.0f);
-	trap_Cvar_VariableStringBuffer("g_RQ3_team2name", teamname, sizeof(teamname));
 	CG_DrawSmallStringColor(SB_MIDDLE+SB_PADDING+6, SB_START_HEIGHT+SB_PADDING,
-							teamname, color);
+							cg_RQ3_team2name.string, color);
 
 	MAKERGBA(color, 1.0f, 1.0f, 1.0f, 0.8f);
 	CG_DrawSmallStringColor(SB_MIDDLE+SB_PADDING+6, SB_START_HEIGHT+SMALLCHAR_HEIGHT+(SB_PADDING*3), 
diff --git a/reaction/game/bg_pmove.c b/reaction/game/bg_pmove.c
index 318a1294..ee7f0c01 100644
--- a/reaction/game/bg_pmove.c
+++ b/reaction/game/bg_pmove.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.63  2002/03/23 05:17:42  jbravo
+// Major cleanup of game -> cgame communication with LCA vars.
+//
 // Revision 1.62  2002/03/18 19:18:39  slicer
 // Fixed bandage bugs ( i hope )
 //
@@ -50,9 +53,6 @@
 #include "bg_public.h"
 #include "bg_local.h"
 
-// JBravo: the famous LCA cvar
-extern  vmCvar_t                RQ3_lca;
-
 pmove_t		*pm;
 pml_t		pml;
 
@@ -1193,7 +1193,7 @@ static void PM_CrashLand( void ) {
 	int			damage;
 
 // JBravo: no falling at all during LCA in Teamplay
-	if (RQ3_lca.integer) {
+	if (pm->lca) {
 		return;
 	}
 
@@ -2744,7 +2744,7 @@ static void PM_Weapon( void ) {
 	}
 
 	// JBravo: no shooting during LCA
-	if ( RQ3_lca.integer) {
+	if (pm->lca) {
 		return;
 	}
 
diff --git a/reaction/game/bg_public.h b/reaction/game/bg_public.h
index d219e477..352aacbb 100644
--- a/reaction/game/bg_public.h
+++ b/reaction/game/bg_public.h
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.52  2002/03/23 05:17:42  jbravo
+// Major cleanup of game -> cgame communication with LCA vars.
+//
 // Revision 1.51  2002/03/21 19:22:12  jbravo
 // Bando now adds extra ammo to the special weaps, and when its dropped it goes
 // away again.
@@ -525,6 +528,8 @@ typedef struct {
 	void		(*trace)( trace_t *results, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int passEntityNum, int contentMask );
 
 	int			(*pointcontents)( const vec3_t point, int passEntityNum );
+// JBravo: lca info for the pm stuff
+	qboolean	lca;
 } pmove_t;
 
 // if a full pmove isn't done on the client, you can just update the angles
diff --git a/reaction/game/g_active.c b/reaction/game/g_active.c
index bd0c3c61..6f354e6a 100644
--- a/reaction/game/g_active.c
+++ b/reaction/game/g_active.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.60  2002/03/23 05:17:42  jbravo
+// Major cleanup of game -> cgame communication with LCA vars.
+//
 // Revision 1.59  2002/03/18 19:18:39  slicer
 // Fixed bandage bugs ( i hope )
 //
@@ -1383,6 +1386,11 @@ void ClientThink_real( gentity_t *ent ) {
 		}
 	Pmove (&pm);
 #else
+// JBravo: setting lca in pm if appropriate
+		if(g_RQ3_lca.integer == 1)
+			pm.lca = qtrue;
+		else
+			pm.lca = qfalse;
 		Pmove (&pm);
 #endif
 
diff --git a/reaction/game/g_cmds.c b/reaction/game/g_cmds.c
index a3949407..45e0972c 100644
--- a/reaction/game/g_cmds.c
+++ b/reaction/game/g_cmds.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.81  2002/03/23 05:17:42  jbravo
+// Major cleanup of game -> cgame communication with LCA vars.
+//
 // Revision 1.80  2002/03/21 19:22:12  jbravo
 // Bando now adds extra ammo to the special weaps, and when its dropped it goes
 // away again.
@@ -152,6 +155,8 @@
 #include "../ui/menudef.h"			// for the voice chats
 //Blaze for door code
 void Use_BinaryMover( gentity_t *ent, gentity_t *other, gentity_t *activator );
+// JBravo: for Stopfollowing
+void LookAtKiller(gentity_t *self, gentity_t *inflictor, gentity_t *attacker);
 //Blaze: Get amount of ammo a clip holds
 //Elder: def'd in bg_public.h
 //int ClipAmountForWeapon( int );
@@ -959,16 +964,18 @@ to free floating spectator mode
 =================
 */
 void StopFollowing( gentity_t *ent ) {
+	gentity_t	*followee;
+
 	ent->client->ps.persistant[ PERS_TEAM ] = TEAM_SPECTATOR;
 	ent->client->sess.sessionTeam = TEAM_SPECTATOR;
 	ent->client->sess.spectatorState = SPECTATOR_FREE;
-//	ent->client->sess.spectatorState = SPECTATOR_ZCAM;
-//	ent->client->ps.stats[STAT_RQ3] |= RQ3_ZCAM;
 	//Slicer - Removing any zoom bits he might have gainned
 	Cmd_Unzoom(ent);
 	ent->client->ps.pm_flags &= ~PMF_FOLLOW;
 	ent->r.svFlags &= ~SVF_BOT;
+	followee = &g_entities[ent->client->ps.clientNum];
 	ent->client->ps.clientNum = ent - g_entities;
+	LookAtKiller(ent, followee, followee);
 }
 
 /*
diff --git a/reaction/game/g_local.h b/reaction/game/g_local.h
index 750fae33..9ef639db 100644
--- a/reaction/game/g_local.h
+++ b/reaction/game/g_local.h
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.56  2002/03/23 05:17:42  jbravo
+// Major cleanup of game -> cgame communication with LCA vars.
+//
 // Revision 1.55  2002/03/18 13:32:53  jbravo
 // Fixed the fraglines for sniper head kills and twekaed bandaging a bit for
 // testing
@@ -1126,7 +1129,8 @@ extern	vmCvar_t	g_RQ3_limchasecam;		// JBravo: 0 = no chasecam limit, 1 = limite
 extern	vmCvar_t	g_RQ3_sniperup;			// JBravo: 0 = snipers begin with pistol, 1 = begin with sniper
 extern	vmCvar_t	g_RQ3_team1name;		// JBravo: cvar for the name of team 1
 extern	vmCvar_t	g_RQ3_team2name;		// JBravo: cvar for the name of team 2
-extern	vmCvar_t	RQ3_lca;			// JBravo: cvar to signal cgame that LCA is in progress
+extern	vmCvar_t	g_RQ3_lca;			// JBravo: cvar to signal cgame that LCA is in progress
+extern	vmCvar_t	g_RQ3_team_round_going;		// JBravo: cvar to signal cgame that a round is in progress
 //Slicer: Team Status Cvars for MM
 extern vmCvar_t	RQ3_team1;
 extern vmCvar_t	RQ3_team2;
diff --git a/reaction/game/g_main.c b/reaction/game/g_main.c
index 630ea748..1bf1d65e 100644
--- a/reaction/game/g_main.c
+++ b/reaction/game/g_main.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.35  2002/03/23 05:17:43  jbravo
+// Major cleanup of game -> cgame communication with LCA vars.
+//
 // Revision 1.34  2002/03/21 15:02:05  jbravo
 // More teamname cleanups and fix for fraglines.
 //
@@ -161,9 +164,10 @@ vmCvar_t	g_RQ3_roundtimelimit;
 vmCvar_t	g_RQ3_tgren;
 vmCvar_t	g_RQ3_limchasecam;
 vmCvar_t	g_RQ3_sniperup;
+vmCvar_t	g_RQ3_lca;
+vmCvar_t	g_RQ3_team_round_going;
 vmCvar_t	g_RQ3_team1name;
 vmCvar_t	g_RQ3_team2name;
-vmCvar_t	RQ3_lca;
 //Slicer: Team Status Cvars for MM
 vmCvar_t	RQ3_team1;
 vmCvar_t	RQ3_team2;
@@ -294,9 +298,10 @@ static cvarTable_t		gameCvarTable[] = {
 	{ &g_RQ3_tgren, "g_RQ3_tgren", "0", CVAR_ARCHIVE, 0, qtrue},
 	{ &g_RQ3_limchasecam, "g_RQ3_limchasecam", "0", CVAR_ARCHIVE, 0, qtrue},
 	{ &g_RQ3_sniperup, "g_RQ3_sniperup", "0", CVAR_ARCHIVE, 0, qtrue},
-	{ &g_RQ3_team1name, "g_RQ3_team1name", "Robbers", CVAR_ARCHIVE | CVAR_SERVERINFO | CVAR_USERINFO | CVAR_LATCH, 0, qtrue, qtrue },
-	{ &g_RQ3_team2name, "g_RQ3_team2name", "Swat", CVAR_ARCHIVE | CVAR_SERVERINFO | CVAR_USERINFO | CVAR_LATCH, 0, qtrue, qtrue },
-	{ &RQ3_lca, "RQ3_lca", "0", CVAR_SYSTEMINFO, 0, qfalse},
+	{ &g_RQ3_team1name, "g_RQ3_team1name", "Robbers", CVAR_SYSTEMINFO | CVAR_SERVERINFO | CVAR_USERINFO | CVAR_LATCH, 0, qtrue, qtrue },
+	{ &g_RQ3_team2name, "g_RQ3_team2name", "Swat", CVAR_SYSTEMINFO | CVAR_SERVERINFO | CVAR_USERINFO | CVAR_LATCH, 0, qtrue, qtrue },
+	{ &g_RQ3_lca, "g_RQ3_lca", "0", CVAR_SYSTEMINFO, 0, qfalse},
+	{ &g_RQ3_team_round_going, "g_RQ3_team_round_going", "0", CVAR_SYSTEMINFO, 0, qfalse},
 	//Slicer: Team Status Cvars for MM
 	{ &RQ3_team1, "RQ3_team1", "0", CVAR_SYSTEMINFO, 0, qfalse},
 	{ &RQ3_team2, "RQ3_team2", "0", CVAR_SYSTEMINFO, 0, qfalse},
diff --git a/reaction/game/g_spawn.c b/reaction/game/g_spawn.c
index c4101751..f18ae3e7 100644
--- a/reaction/game/g_spawn.c
+++ b/reaction/game/g_spawn.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.12  2002/03/23 05:17:43  jbravo
+// Major cleanup of game -> cgame communication with LCA vars.
+//
 // Revision 1.11  2002/03/20 22:58:27  blaze
 // changed dlight to light_d
 //
@@ -378,13 +381,13 @@ qboolean G_CallSpawn( gentity_t *ent ) {
 
 // JBravo: No weapons and items on the maps in teamplay
 	if (g_gametype.integer != GT_TEAMPLAY) {
-	for ( item=bg_itemlist+1 ; item->classname ; item++ ) {
-		if ( !strcmp(item->classname, ent->classname) ) {
-			G_SpawnItem( ent, item );
-			return qtrue;
+		for ( item=bg_itemlist+1 ; item->classname ; item++ ) {
+			if ( !strcmp(item->classname, ent->classname) ) {
+				G_SpawnItem( ent, item );
+				return qtrue;
+			}
 		}
 	}
-	}
 
 	// check normal spawn functions
 	for ( s=spawns ; s->name ; s++ ) {
@@ -394,7 +397,10 @@ qboolean G_CallSpawn( gentity_t *ent ) {
 			return qtrue;
 		}
 	}
-	G_Printf ("%s doesn't have a spawn function\n", ent->classname);
+// JBravo: getting rid of warnings when the game starts up.
+// JBravo: FIXME! This is just supressing the message, not the problem.
+	if (g_gametype.integer != GT_TEAMPLAY)
+		G_Printf ("%s doesn't have a spawn function\n", ent->classname);
 	return qfalse;
 }
 
diff --git a/reaction/game/g_teamplay.c b/reaction/game/g_teamplay.c
index 8e466e79..5f8cd030 100644
--- a/reaction/game/g_teamplay.c
+++ b/reaction/game/g_teamplay.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.41  2002/03/23 05:17:43  jbravo
+// Major cleanup of game -> cgame communication with LCA vars.
+//
 // Revision 1.40  2002/03/21 19:22:12  jbravo
 // Bando now adds extra ammo to the special weaps, and when its dropped it goes
 // away again.
@@ -219,6 +222,7 @@ void CheckTeamRules()
 				if(level.matchTime >= g_timelimit.integer * 60) {
 					level.inGame = level.team_round_going = level.team_round_countdown = 
 					level.team_game_going = level.matchTime = 0;
+					trap_Cvar_Set("g_RQ3_team_round_going", "0");
 					trap_Cvar_Set("RQ3_Team1", "0");
 					trap_Cvar_Set("RQ3_Team2", "0");
 					MakeAllLivePlayersObservers ();
@@ -232,6 +236,7 @@ void CheckTeamRules()
 					trap_SendServerCommand( -1, "print \"Timelimit hit.\n\"" );
 					//trap_SendServerCommand( -1, va("cp \"Timelimit hit.\n\""));
 					level.team_round_going = level.team_round_countdown = level.team_game_going = 0;
+					trap_Cvar_Set("g_RQ3_team_round_going", "0");
 					//Slicer: Start Intermission
 					BeginIntermission();
 					return;
@@ -255,6 +260,7 @@ void CheckTeamRules()
 			if (WonGame(winner))
 				return;
 			level.team_round_going = 0;
+			trap_Cvar_Set("g_RQ3_team_round_going", "0");
 			level.lights_camera_action = 0;
 			level.holding_on_tie_check = 0;
 			level.team_round_countdown = (71*level.fps)/10;
@@ -268,6 +274,7 @@ void CheckTeamRules()
 			if (WonGame(winner))
 				return;
 			level.team_round_going = 0;
+			trap_Cvar_Set("g_RQ3_team_round_going", "0");
 			level.lights_camera_action = 0;
 			level.holding_on_tie_check = 0;
 			level.team_round_countdown = (71*level.fps)/10;
@@ -283,11 +290,12 @@ void StartLCA()
 	gentity_t *player;
 
 	CleanLevel();
-	trap_Cvar_Set("RQ3_lca", "1");
+	trap_Cvar_Set("g_RQ3_lca", "1");
 	level.lights_camera_action = (41*level.fps)/10;
 	SpawnPlayers();
 
 	trap_SendServerCommand( -1, "lights");
+	trap_SendServerCommand( -1, "print \"\nLIGHTS!\n\"");
 }
 
 void ContinueLCA()
@@ -297,11 +305,14 @@ void ContinueLCA()
 
 	if (level.lights_camera_action == (21*level.fps)/10) {
 		trap_SendServerCommand( -1, "camera");
+		trap_SendServerCommand( -1, "print \"\nCAMERA!\n\"");
 	}
 	else if (level.lights_camera_action == 1) {
 		trap_SendServerCommand( -1, "action");
-		trap_Cvar_Set("RQ3_lca", "0");
+		trap_SendServerCommand( -1, "print \"\nACTION!\n\"");
+		trap_Cvar_Set("g_RQ3_lca", "0");
 		level.team_round_going = 1;
+		trap_Cvar_Set("g_RQ3_team_round_going", "1");
 		level.current_round_length = 0;
 	}
 	level.lights_camera_action--;
@@ -464,6 +475,7 @@ int WonGame(int winner)
 			if(level.matchTime >= g_timelimit.integer * 60) {
 			level.inGame = level.team_round_going = level.team_round_countdown = 
 			level.team_game_going = level.matchTime = 0;
+			trap_Cvar_Set("g_RQ3_team_round_going", "0");
 			trap_Cvar_Set("RQ3_Team1", "0");
 			trap_Cvar_Set("RQ3_Team2", "0");
 			MakeAllLivePlayersObservers ();
@@ -475,6 +487,7 @@ int WonGame(int winner)
 			if(level.time - level.startTime >= g_timelimit.integer*60000) {
 				trap_SendServerCommand( -1, "print \"Timelimit hit.\n\"" );
 				level.team_round_going = level.team_round_countdown = level.team_game_going = 0;
+				trap_Cvar_Set("g_RQ3_team_round_going", "0");
 				//Slicer: Start Intermission
 				BeginIntermission();
 				return 1;
@@ -488,6 +501,7 @@ int WonGame(int winner)
 			if(g_RQ3_matchmode.integer) {
 				level.inGame = level.team_round_going = level.team_round_countdown = 
 				level.team_game_going = level.matchTime = 0;
+				trap_Cvar_Set("g_RQ3_team_round_going", "0");
 				trap_Cvar_Set("RQ3_Team1", "0");
 				trap_Cvar_Set("RQ3_Team2", "0");
 				MakeAllLivePlayersObservers ();
@@ -499,6 +513,7 @@ int WonGame(int winner)
 			trap_SendServerCommand( -1, "print \"Roundlimit hit.\n\"" );
 			trap_SendServerCommand( -1, va("cp \"Roundlimit hit.\n\""));
 			level.team_round_going = level.team_round_countdown = level.team_game_going = 0;
+			trap_Cvar_Set("g_RQ3_team_round_going", "0");
 			//Slicer: Start Intermission
 			BeginIntermission();
 			return 1;