From 272d2465538257688130150635229825a2d261fb Mon Sep 17 00:00:00 2001
From: Bryce Hutchings <niceass@rq3.com>
Date: Mon, 11 Feb 2002 00:30:23 +0000
Subject: [PATCH] LCA fix

---
 reaction/cgame/cg_event.c      | 18 +++---------------
 reaction/cgame/cg_servercmds.c | 20 ++++++++++++++++++++
 reaction/game/bg_public.h      |  7 +++----
 reaction/game/g_teamplay.c     | 31 +++++++------------------------
 4 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/reaction/cgame/cg_event.c b/reaction/cgame/cg_event.c
index 0c18c38b..6efc3c57 100644
--- a/reaction/cgame/cg_event.c
+++ b/reaction/cgame/cg_event.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.37  2002/02/11 00:30:02  niceass
+// LCA fix
+//
 // Revision 1.36  2002/02/10 16:26:55  jbravo
 // Attempting to intergrate zcam better into rq3 and a fix for lights.wav
 //
@@ -2215,21 +2218,6 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
 			case RQ3_SOUND_KNIFEDEATH:
 				trap_S_StartSound( NULL, es->number, CHAN_AUTO, cgs.media.knifeDeathSound);
 				break;
-// JBravo: LCA soundevents.
-			case RQ3_SOUND_LIGHTS:
-				if ( es->number == cg.snap->ps.clientNum )
-//					CG_AddBufferedSound(cgs.media.lightsSound);
-					trap_S_StartSound( NULL, es->number, CHAN_AUTO, cgs.media.lightsSound);
-//					trap_S_StartLocalSound( cgs.media.lightsSound, CHAN_ANNOUNCER );
-				break;
-			case RQ3_SOUND_CAMERA:
-				if ( es->number == cg.snap->ps.clientNum )
-					CG_AddBufferedSound(cgs.media.cameraSound);
-				break;
-			case RQ3_SOUND_ACTION:
-				if ( es->number == cg.snap->ps.clientNum )
-					CG_AddBufferedSound(cgs.media.actionSound);
-				break;
 			case RQ3_SOUND_COUNTDOWN:
 				trap_S_StartLocalSound( cgs.media.lca10_0Sound, CHAN_ANNOUNCER );
 				break;
diff --git a/reaction/cgame/cg_servercmds.c b/reaction/cgame/cg_servercmds.c
index ec88808e..175f8905 100644
--- a/reaction/cgame/cg_servercmds.c
+++ b/reaction/cgame/cg_servercmds.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.17  2002/02/11 00:30:02  niceass
+// LCA fix
+//
 // Revision 1.16  2002/02/10 08:17:08  niceass
 // many changes to scoreboard (deaths/second mode)
 //
@@ -1146,6 +1149,23 @@ static void CG_ServerCommand( void ) {
 		return;
 	}
 
+	// NiceAss: LCA
+	if ( !strcmp( cmd, "lights") ) {
+		CG_CenterPrint( "LIGHTS...", SCREEN_HEIGHT * 0.30, BIGCHAR_WIDTH );
+		CG_AddBufferedSound(cgs.media.lightsSound);
+		return;
+	}
+	if ( !strcmp( cmd, "camera") ) {
+		CG_CenterPrint( "CAMERA...", SCREEN_HEIGHT * 0.30, BIGCHAR_WIDTH );
+		CG_AddBufferedSound(cgs.media.cameraSound);
+		return;
+	}
+	if ( !strcmp( cmd, "action") ) {
+		CG_CenterPrint( "ACTION!", SCREEN_HEIGHT * 0.30, BIGCHAR_WIDTH );
+		CG_AddBufferedSound(cgs.media.actionSound);
+		return;
+	}
+
 	CG_Printf( "Unknown client game command: %s\n", cmd );
 }
 
diff --git a/reaction/game/bg_public.h b/reaction/game/bg_public.h
index f58fdb3f..e1e006cc 100644
--- a/reaction/game/bg_public.h
+++ b/reaction/game/bg_public.h
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.46  2002/02/11 00:30:23  niceass
+// LCA fix
+//
 // Revision 1.45  2002/01/27 13:33:28  jbravo
 // Teamplay antistick system.
 //
@@ -199,10 +202,6 @@ typedef enum {
 	RQ3_SOUND_KNIFEDEATH,
 	RQ3_SOUND_LCA,					//lights, camera, action!
 	RQ3_SOUND_KEVLARHIT,
-// JBravo: LCA sounds
-	RQ3_SOUND_LIGHTS,
-	RQ3_SOUND_CAMERA,
-	RQ3_SOUND_ACTION,
 	RQ3_SOUND_COUNTDOWN,
 
 	RQ3_SOUND_TOTAL
diff --git a/reaction/game/g_teamplay.c b/reaction/game/g_teamplay.c
index f54886dc..9a86f6c0 100644
--- a/reaction/game/g_teamplay.c
+++ b/reaction/game/g_teamplay.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.15  2002/02/11 00:30:23  niceass
+// LCA fix
+//
 // Revision 1.14  2002/02/10 04:55:28  jbravo
 // Fix #1 to zcam jitter.   More is probably needed.
 //
@@ -186,14 +189,7 @@ void StartLCA()
 	level.lights_camera_action = (41*level.fps)/10;
 	SpawnPlayers();
 
-	trap_SendServerCommand( -1, va("cp \"LIGHTS...\n\""));
-	for (i = 0; i < level.maxclients; i++) {
-		player = &g_entities[i];
-		if (!player->inuse)
-			continue;
-		G_AddEvent ( player, EV_RQ3_SOUND, RQ3_SOUND_LIGHTS);
-//		break;
-	}
+	trap_SendServerCommand( -1, "lights");
 }
 
 void ContinueLCA()
@@ -202,25 +198,12 @@ void ContinueLCA()
 	gentity_t *player;
 
 	if (level.lights_camera_action == (21*level.fps)/10) {
-		trap_SendServerCommand( -1, va("cp \"CAMERA...\n\""));
-		for (i = 0; i < level.maxclients; i++) {
-			player = &g_entities[i];
-			if (!player->inuse)
-				continue;
-			G_AddEvent ( player, EV_RQ3_SOUND, RQ3_SOUND_CAMERA);
-//			break;
-		}
+		trap_SendServerCommand( -1, "camera");
 	}
 	else if (level.lights_camera_action == 1) {
-		trap_SendServerCommand( -1, va("cp \"ACTION!\n\""));
+		trap_SendServerCommand( -1, "action");
 		trap_Cvar_Set("RQ3_lca", "0");
-		for (i = 0; i < level.maxclients; i++) {
-			player = &g_entities[i];
-			if (!player->inuse)
-				continue;
-			G_AddEvent ( player, EV_RQ3_SOUND, RQ3_SOUND_ACTION);
-//			break;
-		}
+
 		level.team_round_going = 1;
 		level.current_round_length = 0;
 	}