From 8b8db22180744e7f7a8bfe33a3322d7c60a26090 Mon Sep 17 00:00:00 2001
From: Diavolo <edoardo.sanguineti222@gmail.com>
Date: Tue, 17 Jan 2023 15:56:16 +0100
Subject: [PATCH] fix mp_firingrange

---
 .../maps/mp/mp_firingrange.d3dbsp.ents        | 45 -------------------
 iw4x/iw4x_00/maps/mp/mp_firingrange.gsc       |  9 ++--
 2 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/iw4x/iw4x_00/maps/mp/mp_firingrange.d3dbsp.ents b/iw4x/iw4x_00/maps/mp/mp_firingrange.d3dbsp.ents
index 727f108..2b099ca 100644
--- a/iw4x/iw4x_00/maps/mp/mp_firingrange.d3dbsp.ents
+++ b/iw4x/iw4x_00/maps/mp/mp_firingrange.d3dbsp.ents
@@ -934,38 +934,6 @@
 "script_specialopsname" "mp_firingrange"
 "spawnflags" "1"
 }
-// open the metal door
-/*{
-"model" "*23"
-"origin" "993 -30 33"
-"classname" "script_brushmodel"
-"script_specialopsname" "coop_survival_mp_firingrange"
-}
-{
-"model" "*24"
-"origin" "1033 -11 33"
-"classname" "script_brushmodel"
-"script_specialopsname" "mp_firingrange"
-}
-{
-"model" "*25"
-"origin" "906 -60 33"
-"classname" "script_brushmodel"
-"script_specialopsname" "coop_survival_mp_firingrange"
-"spawnflags" "1"
-}
-{
-"model" "*26"
-"origin" "910 -61 33"
-"classname" "script_brushmodel"
-"script_noteworthy" "hdrportal"
-}
-{
-"model" "*27"
-"origin" "1941 2231 18"
-"classname" "script_brushmodel"
-"script_noteworthy" "hdrportal"
-}*/
 {
 "gndLt" "5352548a01"
 "ltOrigin" "1743 2422.5 -20.2041"
@@ -1826,19 +1794,6 @@
 "spawnflags" "1"
 }
 {
-"gndLt" "1a16150000"
-"ltOrigin" "-420.117 767.141 -32.7392"
-"angles" "0 185.2 0"
-"classname" "script_model"
-"targetname" "destructible_toy"
-"model" "dest_propanetanks_02_d0"
-"origin" "-420.8 766.8 -48"
-"csv_include" "destructible_propane_tanks02"
-"destructible_type" "toy_propane_tanks_02"
-"sound_csv_include" "destruct_oxygen_tank"
-"destructibledef" "dest_propanetanks_02"
-}
-{
 "gndLt" "231f1d0000"
 "ltOrigin" "-536.4 933.9 -20.8741"
 "angles" "0 13 0"
diff --git a/iw4x/iw4x_00/maps/mp/mp_firingrange.gsc b/iw4x/iw4x_00/maps/mp/mp_firingrange.gsc
index 0ee6de3..9c369d6 100644
--- a/iw4x/iw4x_00/maps/mp/mp_firingrange.gsc
+++ b/iw4x/iw4x_00/maps/mp/mp_firingrange.gsc
@@ -10,12 +10,15 @@ main()
 	maps\createfx\mp_firingrange_fx::main();
 	
 	maps\mp\_explosive_barrels::main();
+
+	game[ "attackers" ] = "axis";
+	game[ "defenders" ] = "allies";
 	
 	ambientPlay( "ambient_mp_estate" );
 	
 	maps\mp\_compass::setupMiniMap("compass_map_mp_firingrange");
 	
-	setdvar ( "r_diffusecolorscale", "1.5");
+	setDvar ( "r_diffusecolorscale", "1.5");
 
 	/****** GET ENTITIES ******/
 	//TRIGGERS
@@ -157,13 +160,13 @@ main()
 triggerCheck(target)
 {
 	self endon("game_ended");
-	while(1)
+	while (1)
 	{
 		self waittill("trigger", player);
 
 		//If the target is close enough to the player to cause a possible issue, tell the target to go back the other direction.
 		distance = Distance(target.origin, self.origin);
-		if(distance <= 90)
+		if (distance <= 90)
 		{
 			if( isDefined(target.triggeroff))
 				target.triggeroff = false; //Stop the target.