maint: quick cleanup

Co-authored-by: Edo <edoardo.sanguineti222@gmail.com>

.github/workflows/release.yml

@@ -8,7 +8,7 @@ jobs:
     name: Create GitHub Release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v3.5.2
         with:
           fetch-depth: 1
       - name: Create ZIP archive

iw4x/html/index.html

@@ -18,7 +18,7 @@
 	<table id="serverinfo">
 		<thead>
 			<tr>
-				<th colspan="3">Serverinfo</th>
+				<th colspan="4">Serverinfo</th>
 			</tr>
 		</thead>
 	</table>
@@ -27,6 +27,7 @@
 		<thead>
 			<tr>
 				<th>Player</th>
+				<th>Test Client</th>
 				<th>Score</th>
 				<th>Ping</th>
 			</tr>
@@ -34,9 +35,9 @@
 		<tbody id="players">
 		</tbody>
 	</table>
-	<!-- <div id="footer">
+	<div id="footer">
 		Get IW4x!
-	</div> -->
+	</div>
 </body>
 
 </html>

iw4x/html/script.js

@@ -17,16 +17,12 @@ function getFfType (data)
     {
         case 0:
             return "Disabled";
-            break;
         case 1:
             return "Enabled";
-            break;
         case 2:
             return "Reflected";
-            break;
         case 3:
             return "Shared";
-            break;
         default:
             return "Disabled";
     }
@@ -34,7 +30,6 @@ function getFfType (data)
 
 function getServerInfo(status, countPlayers)
 {
-    var friendlyFire = status.scr_team_fftype;
     var mod = status.fs_game;
 
     if (!mod)
@@ -59,6 +54,7 @@ function buildPlayerList(players)
     {
         var row = "<tr>";
         row += "<td>" + players[i].name + "</td>";
+        row += "<td>" + players[i].test_client + "</td>";
         row += "<td>" + players[i].score + "</td>";
         row += "<td>" + players[i].ping + "</td>";
         row += "</tr>";
@@ -81,8 +77,6 @@ function buildPage(data)
     document.title = hostname
     $("#servername").text(document.title);
 
-    //$("#info").text(JSON.stringify(data));
-
     getServerInfo(data["status"], data["players"].length);
     buildPlayerList(data["players"]);
 
@@ -107,6 +101,6 @@ $(document).ready(function()
 
     $("#footer").click(function()
     {
-        location.replace("https://iw4xcachep26muba.onion.to");
+        location.replace("https://xlabs.dev");
     });
 });

iw4x/iw4x_00/common_scripts/iw4x_utility.gsc

@@ -1,16 +1,16 @@
 /*
 =============
 ///ScriptDocBegin
-"Name: noclip()"
+"Name: _noclip()"
 "Summary: noclip used on a player entity will make them fly and clip through walls."
 "Module: IW4x Utility"
 "CallOn: An entity"
-"Example: level.player noclip();"
+"Example: level.player _noclip();"
 "SPMP: multiplayer"
 ///ScriptDocEnd
 =============
 */
-noclip()
+_noclip()
 {
 	if ( self.clientflags & 1 )
 	{
@@ -27,16 +27,16 @@ noclip()
 /*
 =============
 ///ScriptDocBegin
-"Name: ufo()"
+"Name: _ufo()"
 "Summary: ufo used on a player entity will make them fly and clip through walls."
 "Module: IW4x Utility"
 "CallOn: An entity"
-"Example: level.player ufo();"
+"Example: level.player _ufo();"
 "SPMP: multiplayer"
 ///ScriptDocEnd
 =============
 */
-ufo()
+_ufo()
 {
 	if ( self.clientflags & 2 )
 	{

iw4x/iw4x_00/common_scripts/utility.gsc

@@ -1983,7 +1983,7 @@ wait_for_flag_or_time_elapses( flagname, timer )
  ============= 
 ///ScriptDocBegin
 "Name: delayCall( <delay> , <function> , <arg1> , <arg2> , <arg3> )"
-"Summary: delayCall is cool! It saves you from having to write extra script for once off commands. Note you don’t have to thread it off. delaycall is that smart!"
+"Summary: delayCall is cool! It saves you from having to write extra script for once off commands. Note you don�t have to thread it off. delaycall is that smart!"
 "Module: Utility"
 "MandatoryArg: <delay> : The delay before the function occurs"
 "MandatoryArg: <function> : The function to run."
@@ -2859,8 +2859,8 @@ fileprint_launcher_end_file( file_relative_to_game, bIsPerforceEnabled )
 	if( !isdefined( bIsPerforceEnabled ) )
 		bIsPerforceEnabled = false;
 
-	setDevDvarIfUninitialized("LAUNCHER_PRINT_FAIL", "0"); 
+	setDevDvarIfUninitialized("LAUNCHER_PRINT_FAIL", "0");
-	setDevDvarIfUninitialized("LAUNCHER_PRINT_SUCCESS", "0"); 
+	setDevDvarIfUninitialized("LAUNCHER_PRINT_SUCCESS", "0");
 		
 	if( bIsPerforceEnabled )
 		fileprint_launcher( "GAMEPRINTENDFILE:GAMEPRINTP4ENABLED:"+file_relative_to_game );
@@ -2890,7 +2890,7 @@ fileprint_launcher_end_file( file_relative_to_game, bIsPerforceEnabled )
 	}
 		
 	setdevdvar("LAUNCHER_PRINT_FAIL", "0");
-	setdevdvar( "LAUNCHER_PRINT_SUCCESS", "0" ); 
+	setdevdvar( "LAUNCHER_PRINT_SUCCESS", "0" );
 	
 	level.fileprint_launcher = undefined;
 	return true;
@@ -3847,6 +3847,52 @@ create_dvar( var, val )
 	SetDvarIfUninitialized( var, val );
 }
 
+/*
+=============
+///ScriptDocBegin
+"Name: setPing()"
+"Summary: Does nothing. Added for backward compatibility"
+"Module: Utility"
+"Example: self setPing( 100 );"
+"SPMP: multiplayer"
+///ScriptDocEnd
+=============
+*/
+setPing( ping )
+{
+}
+
+/*
+=============
+///ScriptDocBegin
+"Name: getPing()"
+"Summary: Returns the current ping of the client"
+"Module: Utility"
+"Example: self getPing();"
+"SPMP: multiplayer"
+///ScriptDocEnd
+=============
+*/
+getPing()
+{
+	return self.ping;
+}
+
+/*
+=============
+///ScriptDocBegin
+"Name: getIP()"
+"Summary: Returns the current IP Address of the client"
+"Module: Utility"
+"Example: self getIP();"
+"SPMP: multiplayer"
+///ScriptDocEnd
+=============
+*/
+getIP()
+{
+	return self.address;
+}
 
 void()
 {

iw4x/iw4x_00/localizedstrings/iw4x_english.str

@@ -1109,13 +1109,13 @@ REFERENCE			MPUI_DESC_MAP_LOCKDOWN
 LANG_ENGLISH		"European city center. Great for Team Defender."
 
 REFERENCE			PATCH_DLC1
-LANG_ENGLISH		"Stimulus maps"
+LANG_ENGLISH		"Stimulus Maps"
 
 REFERENCE			PATCH_DESC_DLC1
 LANG_ENGLISH		"The Modern Warfare 2 Stimulus Package delivers additional action-packed multiplayer maps, including brand-new battlegrounds and legendary fan-favorites from Call of Duty 4: Modern Warfare."
 
 REFERENCE			PATCH_DLC2
-LANG_ENGLISH		"Resurgence maps"
+LANG_ENGLISH		"Resurgence Maps"
 
 REFERENCE			PATCH_DESC_DLC2
 LANG_ENGLISH		"The best-selling first-person action game of all time gets even bigger with more epic new multiplayer content! The Modern Warfare 2 Resurgence Pack delivers five incredible new multiplayer maps. Take the action to exciting new locations, then battle across legendary landscapes from Call of Duty 4: Modern Warfare."
@@ -1127,7 +1127,7 @@ REFERENCE			PATCH_DESC_IW4X_DLC
 LANG_ENGLISH		"Original IW4x DLC containing several maps from Call Of Duty: Online"
 
 REFERENCE			PATCH_COD4_DLC
-LANG_ENGLISH		"Call Of Duty 4 Pack"
+LANG_ENGLISH		"Call of Duty 4 Pack"
 
 REFERENCE			PATCH_DESC_COD4_DLC
 LANG_ENGLISH		"Call Of Duty 4 maps ported to IW4x by the team"
@@ -1139,7 +1139,7 @@ REFERENCE			PATCH_DESC_MW3_DLC
 LANG_ENGLISH		"Modern Warfare 3 maps ported to IW4x by the team"
 
 REFERENCE			CUSTOM_MAPS_DLC
-LANG_ENGLISH		"Custom maps"
+LANG_ENGLISH		"Custom Maps"
 
 REFERENCE			DESC_CUSTOM_MAPS_DLC
 LANG_ENGLISH		"Downloaded maps that are placed in the /usermaps subfolder"

iw4x/iw4x_00/maps/mp/_explosive_barrels.gsc

@@ -22,7 +22,7 @@ main()
 		if(isdefined(oilspill) && oilspill.size > 0)
 		{
 			level.breakables_fx["oilspill"]["burn"]		= loadfx ("props/barrel_fire");	
-			level.breakables_fx["oilspill"]["spark"]	= loadfx("impacts/small_metalhit_1"); 
+			level.breakables_fx["oilspill"]["spark"]	= loadfx("impacts/small_metalhit_1");
 		}
 		
 	//------------------

iw4x/iw4x_00/maps/mp/co_hunted_fx.gsc

@@ -4,7 +4,7 @@
 main()
 {
 	//level._effect["firelp_vhc_lrg_pm_farview"]		= loadfx ("fire/firelp_vhc_lrg_pm_farview");
-	//level._effect["lighthaze"]						= loadfx ("misc/lighthaze"); 
+	//level._effect["lighthaze"]						= loadfx ("misc/lighthaze");
 	level._effect[ "firelp_med_pm" ]					 = loadfx( "fire/firelp_med_pm" );
 	level._effect[ "firelp_small_pm" ]				 = loadfx( "fire/firelp_small_pm" );
 	level._effect[ "firelp_small_pm_a" ]				 = loadfx( "fire/firelp_small_pm_a" );

iw4x/iw4x_00/maps/mp/gametypes/_gamelogic.gsc

@@ -5,7 +5,7 @@
 FACTION_REF_COL 					= 0;
 FACTION_NAME_COL 					= 1;
 FACTION_SHORT_NAME_COL 				= 1;
-FACTION_WIN_GAME_COL 				= 3; 
+FACTION_WIN_GAME_COL 				= 3;
 FACTION_WIN_ROUND_COL 				= 4;
 FACTION_MISSION_ACCOMPLISHED_COL 	= 5;
 FACTION_ELIMINATED_COL 				= 6;
@@ -555,7 +555,7 @@ updateWinLossStats( winner )
 				
 			updateTieStats( player );
 		}		
-	} 
+	}
 	else if ( isPlayer( winner ) )
 	{
 		if ( level.hostForcedEnd && winner isHost() )
@@ -1099,7 +1099,7 @@ timeUntilRoundEnd()
 	timeRemaining = (getTimeLimit() * 60) - timePassed;
 	
 	if ( isDefined( level.timePaused ) )
-		timeRemaining += level.timePaused; 
+		timeRemaining += level.timePaused;
 	
 	return timeRemaining + level.postRoundTime;
 }
@@ -1238,7 +1238,7 @@ Callback_StartGameType()
 	
 	levelFlagInit( "round_over", false );
 	levelFlagInit( "game_over", false );
-	levelFlagInit( "block_notifies", false ); 
+	levelFlagInit( "block_notifies", false );
 
 	level.prematchPeriod = 0;
 	level.prematchPeriodEnd = 0;
@@ -1295,7 +1295,6 @@ Callback_StartGameType()
 
 		precacheShader( "white" );
 		precacheShader( "black" );
-		//precacheMenu("popup_summary");
 			
 		game["strings"]["press_to_spawn"] = &"PLATFORM_PRESS_TO_SPAWN";
 		if ( level.teamBased )
@@ -1473,7 +1472,6 @@ Callback_StartGameType()
 	thread maps\mp\_skill::init();
 	thread maps\mp\_areas::init();
 	thread maps\mp\killstreaks\_killstreaks::init();
-	//thread maps\mp\_perks::init(); // No longer in use, removed from common scripts. (smart arrow)
 	thread maps\mp\perks\_perks::init();
 	thread maps\mp\_events::init();
 	thread maps\mp\_defcon::init();
@@ -2188,7 +2186,7 @@ endGame( winner, endReasonText, nukeDetonated )
 	foreach ( player in level.players )
 		player.pers["stats"] = player.stats;
 
-	//logString( "game ended" );
+	logString( "game ended" );
 	if( !nukeDetonated && !level.postGameNotifies )
 	{
 		if ( !wasOnlyRound() )

iw4x/iw4x_00/maps/mp/gametypes/_menus.gsc

@@ -123,9 +123,9 @@ onMenuResponse()
 {
 	self endon("disconnect");
 	
-	for(;;)
+	for (;;)
 	{
-		self waittill("menuresponse", menu, response);
+		self waittill( "menuresponse", menu, response );
 		
 		if ( response == "back" )
 		{
@@ -142,14 +142,14 @@ onMenuResponse()
 			continue;
 		}
 		
-		if(response == "changeteam")
+		if (response == "changeteam")
 		{
 			self closepopupMenu();
 			self closeInGameMenu();
 			self openpopupMenu(game["menu_team"]);
 		}
 	
-		if(response == "changeclass_marines" )
+		if (response == "changeclass_marines")
 		{
 			self closepopupMenu();
 			self closeInGameMenu();
@@ -171,26 +171,11 @@ onMenuResponse()
 			continue;
 		}
 
-		if(response == "changeclass_marines_splitscreen" )
+		if (response == "changeclass_marines_splitscreen" )
 			self openpopupMenu( "changeclass_marines_splitscreen" );
 
-		if(response == "changeclass_opfor_splitscreen" )
+		if (response == "changeclass_opfor_splitscreen" )
 			self openpopupMenu( "changeclass_opfor_splitscreen" );
-		
-		if(response == "endgame")
-		{
-			if(level.splitscreen)
-			{
-				endparty();
-
-				if ( !level.gameEnded )
-				{
-					level thread maps\mp\gametypes\_gamelogic::forceEnd();
-				}
-			}
-				
-			continue;
-		}
 
 		if ( response == "endround" )
 		{
@@ -201,7 +186,7 @@ onMenuResponse()
 			
 			if ( !level.gameEnded )
 			{
-				setDvar("sv_dontrotate", 1);
+				setDvar( "sv_dontRotate", 1 );
 				level thread maps\mp\gametypes\_gamelogic::forceEnd();
 			}
 			else
@@ -213,9 +198,9 @@ onMenuResponse()
 			continue;
 		}
 
-		if(menu == game["menu_team"])
+		if (menu == game["menu_team"])
 		{
-			switch(response)
+			switch (response)
 			{
 			case "allies":
 				self [[level.allies]]();

iw4x/iw4x_00/maps/mp/gametypes/_music_and_dialog.gsc

@@ -492,7 +492,7 @@ suspenseMusic()
 	{
 		wait ( randomFloatRange( 60, 120 ) );
 		
-		playSoundOnPlayers( game["music"]["suspense"][randomInt(numTracks)] ); 
+		playSoundOnPlayers( game["music"]["suspense"][randomInt(numTracks)] );
 	}
 }
 

iw4x/iw4x_00/maps/mp/gametypes/_playerlogic.gsc

@@ -619,7 +619,6 @@ spawnPlayer()
 	
 	self setClientDvar( "cg_thirdPerson", "0" );
 	self setDepthOfField( 0, 0, 512, 512, 4, 0 );
-	//self setClientDvar( "cg_fov", "65" ); 
 
 	// Don't do this stuff for TI spawn points	
 	if ( isDefined( spawnPoint ) )
@@ -685,7 +684,7 @@ spawnPlayer()
 	
 	prof_end( "spawnPlayer_postUTS" );
 
-	//self logstring( "S " + self.origin[0] + " " + self.origin[1] + " " + self.origin[2] );
+	self logstring( "S " + self.origin[0] + " " + self.origin[1] + " " + self.origin[2] );
 	
 	// give "connected" handlers a chance to start
 	// many of these start onPlayerSpawned handlers which rely on the "spawned_player"

iw4x/iw4x_00/maps/mp/gametypes/_quickmessages.gsc

@@ -50,50 +50,42 @@ quickcommands(response)
 		case "1":
 			soundalias = "mp_cmd_followme";
 			saytext = &"QUICKMESSAGE_FOLLOW_ME";
-			//saytext = "Follow Me!";
 			break;
 
 		case "2":
 			soundalias = "mp_cmd_movein";
 			saytext = &"QUICKMESSAGE_MOVE_IN";
-			//saytext = "Move in!";
 			break;
 
 		case "3":
 			soundalias = "mp_cmd_fallback";
 			saytext = &"QUICKMESSAGE_FALL_BACK";
-			//saytext = "Fall back!";
 			break;
 
 		case "4":
 			soundalias = "mp_cmd_suppressfire";
 			saytext = &"QUICKMESSAGE_SUPPRESSING_FIRE";
-			//saytext = "Suppressing fire!";
 			break;
 
 		case "5":
 			soundalias = "mp_cmd_attackleftflank";
 			saytext = &"QUICKMESSAGE_ATTACK_LEFT_FLANK";
-			//saytext = "Attack left flank!";
 			break;
 
 		case "6":
 			soundalias = "mp_cmd_attackrightflank";
 			saytext = &"QUICKMESSAGE_ATTACK_RIGHT_FLANK";
-			//saytext = "Attack right flank!";
 			break;
 
 		case "7":
 			soundalias = "mp_cmd_holdposition";
 			saytext = &"QUICKMESSAGE_HOLD_THIS_POSITION";
-			//saytext = "Hold this position!";
 			break;
 
 		default:
 			assert(response == "8");
 			soundalias = "mp_cmd_regroup";
 			saytext = &"QUICKMESSAGE_REGROUP";
-			//saytext = "Regroup!";
 			break;
 	}
 
@@ -117,44 +109,37 @@ quickstatements(response)
 		case "1":
 			soundalias = "mp_stm_grenade";
 			saytext = &"QUICKMESSAGE_ENEMY_SPOTTED";
-			//saytext = "Enemy spotted!";
 			break;
 
 		case "2":
 			soundalias = "mp_stm_enemyspotted";
 			saytext = &"QUICKMESSAGE_ENEMIES_SPOTTED";
-			//saytext = "Enemy down!";
 			break;
 
 		case "3":
 			soundalias = "mp_stm_iminposition";
 			saytext = &"QUICKMESSAGE_IM_IN_POSITION";
-			//saytext = "I'm in position.";
 			break;
 
 		case "4":
 			soundalias = "mp_stm_areasecure";
 			saytext = &"QUICKMESSAGE_AREA_SECURE";
-			//saytext = "Area secure!";
 			break;
 
 		case "5":
 			soundalias = "mp_stm_holdyourfire";
 			saytext = &"QUICKMESSAGE_WATCH_SIX";
-			//saytext = "Hold your fire!";
 			break;
 
 		case "6":
 			soundalias = "mp_stm_sniper";
 			saytext = &"QUICKMESSAGE_SNIPER";
-			//saytext = "Sniper!";
 			break;
 
 		default:
 			assert(response == "7");
 			soundalias = "mp_stm_needreinforcements";
 			saytext = &"QUICKMESSAGE_NEED_REINFORCEMENTS";
-			//saytext = "Need reinforcements!";
 			break;
 	}
 
@@ -178,38 +163,32 @@ quickresponses(response)
 		case "1":
 			soundalias = "mp_rsp_yessir";
 			saytext = &"QUICKMESSAGE_YES_SIR";
-			//saytext = "Yes Sir!";
 			break;
 
 		case "2":
 			soundalias = "mp_rsp_nosir";
 			saytext = &"QUICKMESSAGE_NO_SIR";
-			//saytext = "No Sir!";
 			break;
 
 		case "3":
 			soundalias = "mp_rsp_onmyway";
 			saytext = &"QUICKMESSAGE_IM_ON_MY_WAY";
-			//saytext = "On my way.";
 			break;
 
 		case "4":
 			soundalias = "mp_rsp_sorry";
 			saytext = &"QUICKMESSAGE_SORRY";
-			//saytext = "Sorry.";
 			break;
 
 		case "5":
 			soundalias = "mp_rsp_greatshot";
 			saytext = &"QUICKMESSAGE_GREAT_SHOT";
-			//saytext = "Great shot!";
 			break;
 
 		default:
 			assert(response == "6");
 			soundalias = "mp_rsp_areyoucrazy";
 			saytext = &"QUICKMESSAGE_COME_ON";
-			//saytext = "Come on!";
 			break;
 	}
 

iw4x/iw4x_00/maps/mp/gametypes/dd.gsc

@@ -692,7 +692,7 @@ bombPlanted( destroyedObj, player )
 	if ( level.destroyedObject.label == "_a" )
 		level.aPlanted = true;
 	else
-		level.bPlanted = true; 
+		level.bPlanted = true;
 	
 	level.destroyedObject.bombPlanted = true;
 	
@@ -719,7 +719,7 @@ bombHandler( player, destType )
 	if ( self.label == "_a" )
 		level.aPlanted = false;
 	else
-		level.bPlanted = false; 
+		level.bPlanted = false;
 		
 	self.bombPlanted = 0;
 	

iw4x/iw4x_00/maps/mp/gametypes/dom.gsc

@@ -490,7 +490,7 @@ onUse( player )
 	oldTeam = self maps\mp\gametypes\_gameobjects::getOwnerTeam();
 	label = self maps\mp\gametypes\_gameobjects::getLabel();
 	
-	//player logString( "flag captured: " + self.label );
+	player logString( "flag captured: " + self.label );
 	
 	self.captureTime = getTime();
 	

iw4x/iw4x_00/maps/mp/gametypes/oneflag.gsc

@@ -519,7 +519,7 @@ flagCaptured( winningTeam, endReasonText )
 onTimeLimit()
 {
 	if ( level.flagCaptured )
-		return; 
+		return;
 
 	// TODO: change to "Flag Defended" or some such
 	maps\mp\gametypes\_gamelogic::endGame( game["defenders"], game["strings"]["time_limit_reached"] );

iw4x/iw4x_00/maps/mp/gametypes/sd.gsc

@@ -566,7 +566,7 @@ onUsePlantObject( player )
 	if ( !self maps\mp\gametypes\_gameobjects::isFriendlyTeam( player.pers["team"] ) )
 	{
 		level thread bombPlanted( self, player );
-		//player logString( "bomb planted: " + self.label );
+		player logString( "bomb planted: " + self.label );
 		
 		// disable all bomb zones except this one
 		for ( index = 0; index < level.bombZones.size; index++ )
@@ -600,7 +600,7 @@ onUsePlantObject( player )
 onUseDefuseObject( player )
 {
 	player notify ( "bomb_defused" );
-	//player logString( "bomb defused: " + self.label );
+	player logString( "bomb defused: " + self.label );
 	level thread bombDefused();
 	
 	// disable this bomb zone

iw4x/iw4x_00/maps/mp/killstreaks/_ac130.gsc

@@ -185,21 +185,21 @@ init_sounds()
 	add_context_sensative_dialog( "ai", "in_sight", 7, "ac130_fco_gonnagethim" );		// You gonna get him?
 	add_context_sensative_dialog( "ai", "in_sight", 8, "ac130_fco_personnelthere" );	// Personnel right there.
 	add_context_sensative_dialog( "ai", "in_sight", 9, "ac130_fco_nailthoseguys" );		// Nail those guys.
-	add_context_sensative_dialog( "ai", "in_sight", 11, "ac130_fco_lightemup" );		// Light ‘em up.
+	add_context_sensative_dialog( "ai", "in_sight", 11, "ac130_fco_lightemup" );		// Light �em up.
 	add_context_sensative_dialog( "ai", "in_sight", 12, "ac130_fco_takehimout" );		// Yeah take him out.
 	add_context_sensative_dialog( "ai", "in_sight", 14, "ac130_plt_yeahcleared" );		// Yeah, cleared to engage.
-	add_context_sensative_dialog( "ai", "in_sight", 15, "ac130_plt_copysmoke" );		// Copy, smoke ‘em.
+	add_context_sensative_dialog( "ai", "in_sight", 15, "ac130_plt_copysmoke" );		// Copy, smoke �em.
 	add_context_sensative_dialog( "ai", "in_sight", 16, "ac130_fco_rightthere" );		// Right there...tracking.
 	add_context_sensative_dialog( "ai", "in_sight", 17, "ac130_fco_tracking" );			// Tracking.
 	
-	add_context_sensative_dialog( "ai", "wounded_crawl", 0, "ac130_fco_movingagain" );		// Ok he’s moving again.
+	add_context_sensative_dialog( "ai", "wounded_crawl", 0, "ac130_fco_movingagain" );		// Ok he�s moving again.
 	add_context_sensative_timeout( "ai", "wounded_crawl", undefined, 6 );
 	
 	add_context_sensative_dialog( "ai", "wounded_pain", 0, "ac130_fco_doveonground" );		// Yeah, he just dove on the ground.	
 	add_context_sensative_dialog( "ai", "wounded_pain", 1, "ac130_fco_knockedwind" );		// Probably just knocked the wind out of him.
 	add_context_sensative_dialog( "ai", "wounded_pain", 2, "ac130_fco_downstillmoving" );	// That guy's down but still moving.
 	add_context_sensative_dialog( "ai", "wounded_pain", 3, "ac130_fco_gettinbackup" );		// He's gettin' back up.
-	add_context_sensative_dialog( "ai", "wounded_pain", 4, "ac130_fco_yepstillmoving" );	// Yep, that guy’s still moving.
+	add_context_sensative_dialog( "ai", "wounded_pain", 4, "ac130_fco_yepstillmoving" );	// Yep, that guy�s still moving.
 	add_context_sensative_dialog( "ai", "wounded_pain", 5, "ac130_fco_stillmoving" );		// He's still moving.
 	add_context_sensative_timeout( "ai", "wounded_pain", undefined, 12 );
 	
@@ -594,7 +594,7 @@ removeAC130Player( player, disconnected )
 	{
 		player clearUsingRemote();
 
-		player stopLocalSound( "missile_incoming" ); 
+		player stopLocalSound( "missile_incoming" );
 
 		player show();
 		player unlink();
@@ -1673,7 +1673,7 @@ stingerProximityDetonate( player, missileTeam )
 			missileTarget = newTarget;
 			
 			if ( isDefined( level.ac130player ) )
-				level.ac130player stopLocalSound( "missile_incoming" ); 
+				level.ac130player stopLocalSound( "missile_incoming" );
 		}		
 		
 		if ( curDist < minDist )
@@ -1699,7 +1699,7 @@ stingerProximityDetonate( player, missileTeam )
 				
 			if ( isDefined( level.ac130player ) )
 			{
-				level.ac130player stopLocalSound( "missile_incoming" ); 
+				level.ac130player stopLocalSound( "missile_incoming" );
 				
 				if ( level.ac130player.team != missileTeam )
 					radiusDamage( self.origin, 1000, 1000, 1000, player );

iw4x/iw4x_00/maps/mp/killstreaks/_airstrike.gsc

@@ -417,7 +417,7 @@ airstrikeDamageEntsThread( sWeapon )
 		ent = level.airstrikeDamagedEnts[level.airstrikeDamagedEntsIndex];
 		
 		if ( !isDefined( ent.entity ) )
-			continue; 
+			continue;
 			
 		if ( !ent.isPlayer || isAlive( ent.entity ) )
 		{
@@ -533,7 +533,7 @@ doBomberStrike( lifeId, owner, requiredDeathCount, bombsite, startPoint, endPoin
 
 	plane.angles = direction;
 	forward = anglesToForward( direction );
-	plane moveTo( pathEnd, flyTime, 0, 0 ); 
+	plane moveTo( pathEnd, flyTime, 0, 0 );
 
 	thread stealthBomber_killCam( plane, pathEnd, flyTime, airStrikeType );
 	
@@ -542,7 +542,7 @@ doBomberStrike( lifeId, owner, requiredDeathCount, bombsite, startPoint, endPoin
 	// Delete the plane after its flyby
 	wait ( flyTime );
 	plane notify( "delete" );
-	plane delete(); 
+	plane delete();
 }
 
 
@@ -693,11 +693,11 @@ doPlaneStrike( lifeId, owner, requiredDeathCount, bombsite, startPoint, endPoint
 	plane.angles = direction;
 	forward = anglesToForward( direction );
 	plane thread playPlaneFx();
-	plane moveTo( pathEnd, flyTime, 0, 0 ); 
+	plane moveTo( pathEnd, flyTime, 0, 0 );
 	
 	/#
 	if ( getdvar("scr_airstrikedebug") == "1" )
-		thread airstrikeLine( pathStart, pathEnd, (1,1,1), 20 ); 
+		thread airstrikeLine( pathStart, pathEnd, (1,1,1), 20 );
 	#/
 	
 	//thread callStrike_planeSound( plane, bombsite );
@@ -706,7 +706,7 @@ doPlaneStrike( lifeId, owner, requiredDeathCount, bombsite, startPoint, endPoint
 	// Delete the plane after its flyby
 	wait flyTime;
 	plane notify( "delete" );
-	plane delete(); 
+	plane delete();
 }
 
 callStrike_bombEffect( plane, pathEnd, flyTime, launchTime, owner, requiredDeathCount, typeOfStrike )
@@ -1025,7 +1025,7 @@ targetisinfront(other, target)
 {
 	forwardvec = anglestoforward(flat_angle(other.angles));
 	normalvec = vectorNormalize(flat_origin(target)-other.origin);
-	dot = vectordot(forwardvec,normalvec); 
+	dot = vectordot(forwardvec,normalvec);
 	if(dot > 0)
 		return true;
 	else

iw4x/iw4x_00/maps/mp/killstreaks/_helicopter.gsc

@@ -813,7 +813,7 @@ makeGunShip()
  	mgTurret makeTurretInoperable();
  	mgTurret.pers["team"] = self.team;
  	mgTurret.killCamEnt = self;
- 	self.mgTurretLeft = mgTurret; 
+ 	self.mgTurretLeft = mgTurret;
  	self.mgTurretLeft SetDefaultDropPitch( 0 );
 
 	mgTurret = spawnTurret( "misc_turret", self.origin, "pavelow_minigun_mp" );
@@ -825,7 +825,7 @@ makeGunShip()
  	mgTurret makeTurretInoperable();
  	mgTurret.pers["team"] = self.team;
  	mgTurret.killCamEnt = self;
- 	self.mgTurretRight = mgTurret; 
+ 	self.mgTurretRight = mgTurret;
  	self.mgTurretRight SetDefaultDropPitch( 0 );
 
 	if ( level.teamBased )

iw4x/iw4x_00/maps/mp/mp_bloc.gsc

@@ -8,7 +8,7 @@ main()
 
 	setdvar( "compassmaxrange", "2000" );
 	
-	ambientPlay( "ambient_trainer_ext2" ); 
+	ambientPlay( "ambient_trainer_ext2" );
 
 	game["attackers"] = "axis";
 	game["defenders"] = "allies";

iw4x/iw4x_00/maps/mp/mp_bloc_sh.gsc

@@ -10,7 +10,7 @@ main()
 
 	setdvar( "compassmaxrange", "2000" );
 	
-    ambientPlay( "ambient_trainer_ext2" ); 
+    ambientPlay( "ambient_trainer_ext2" );
 
 	game["attackers"] = "axis";
 	game["defenders"] = "allies";

iw4x/iw4x_00/maps/mp/mp_bloc_sh_fx.gsc

@@ -5,7 +5,7 @@ main()
     level._effect[ "leaves_ground_gentlewind_dust" ]	= loadfx( "misc/leaves_ground_gentlewind_dust_sh" );
     level._effect[ "dust_wind_slow_yel_loop" ]	        = loadfx( "dust/dust_wind_slow_yel_loop_sh" );
     //level._effect[ "drips_player_hand" ]	            = loadfx( "water/drips_player_hand_sh" );
-    level._effect["water_spill_fall"]				    = loadfx("maps/mp_maps/fx_mp_water_spill"); 
+    level._effect["water_spill_fall"]				    = loadfx("maps/mp_maps/fx_mp_water_spill");
 
 /#
 	if ( getdvar( "clientSideEffects" ) != "1" )

iw4x/iw4x_00/maps/mp/mp_bravo_precache.gsc

@@ -0,0 +1,13 @@
+// IW5 GSC SOURCE
+// Decompiled by https://github.com/xensik/gsc-tool
+
+main()
+{
+    common_scripts\_destructible_types_anim_wallfan::main();
+    maps\animated_models\foliage_cod5_tree_jungle_03::main();
+    maps\animated_models\foliage_pacific_palms08::main();
+    maps\animated_models\hanging_apron_wind_medium::main();
+    maps\animated_models\hanging_longsleeve_wind_medium::main();
+    maps\animated_models\hanging_sheet_wind_medium::main();
+    maps\animated_models\hanging_shortsleeve_wind_medium::main();
+}

iw4x/iw4x_00/maps/mp/mp_crash_tropical_fx.gsc

@@ -13,7 +13,7 @@ main()
 	level._effect[ "battlefield_smokebank_S" ]		 = loadfx( "smoke/battlefield_smokebank_S_tropical" );
 	level._effect[ "hallway_smoke_light" ]			 = loadfx( "smoke/hallway_smoke_light" );
 	//level._effect[ "extraction_smoke" ] = loadfx( "smoke/signal_smoke_green" );
-	
+
 	/*
 	//level._effect[ "airplane_crash_embers" ] 		= LoadFX( "fire/airplane_crash_embers" );
 	//level._effect[ "firelp_small_pm_a_nolight" ] 	= LoadFX( "fire/firelp_small_pm_a_nolight" );
@@ -26,11 +26,4 @@ main()
 	//level._effect[ "player_death_explosion" ]			= loadfx( "explosions/player_death_explosion" );
 	//level._effect[ "green_flare" ] 								= loadfx( "misc/handflare_green" );
 	*/
-	
- /#
-	if ( common_scripts\utility::shouldRunServerSideEffects() )
-		maps\createfx\mp_crash_tropical_fx::main();
- 
-#/
-
 }

iw4x/iw4x_00/maps/mp/mp_crash_tropical_precache.gsc

@@ -3,12 +3,10 @@ main()
 {
 	common_scripts\_destructible_types_anim_light_fluo_single::main();
 	
-	//maps\animated_models\foliage_tree_palm_tall_3::main();
 	maps\animated_models\foliage_tree_palm_med_1::main();
 	maps\animated_models\foliage_tree_palm_med_2::main();
 	maps\animated_models\foliage_tree_palm_med_2_tropical::main();
 	maps\animated_models\foliage_pacific_fern01::main();
-	maps\animated_models\foliage_tree_palm_bushy_3::main();
 	maps\animated_models\foliage_pacific_palms06::main();
 	
 	maps\animated_models\hanging_apron_wind_medium::main();

iw4x/iw4x_00/maps/mp/mp_firingrange_fx.gsc

@@ -1,4 +1,4 @@
-#include maps\mp\_utility; 
+#include maps\mp\_utility;
 
 // Scripted effects
 precache_scripted_fx()

iw4x/iw4x_00/maps/mp/mp_nuked_fx.gsc

@@ -1,4 +1,4 @@
-#include maps\mp\_utility; 
+#include maps\mp\_utility;
 
 // fx used by utility scripts
 precache_util_fx()

iw4x/iw4x_00/maps/mp/mp_shipment.gsc

@@ -4,17 +4,162 @@ main()
 	maps\createart\mp_shipment_art::main();
 	maps\createfx\mp_shipment_fx::main();
 	maps\mp\_load::main();
-	
+
 	maps\mp\_compass::setupMiniMap( "compass_map_mp_shipment" );
-	
+
-	// TODO: get proper ambient
+	ambientPlay("ambient_trainer_ext2"); //TODO: get proper ambient
-	ambientPlay("ambient_trainer_ext2");
 
 	game["attackers"] = "axis";
 	game["defenders"] = "allies";
 
-	setdvar( "r_specularcolorscale", "1.7" );
+	setDvar( "r_specularcolorscale", "1.7" );
-	setdvar( "r_diffusecolorscale", "1.3" );
+	setDvar( "r_diffusecolorscale", "1.3" );
 
-	setdvar( "compassmaxrange", "1400" );
+	setDvar( "compassmaxrange","1400" );
+
+	level thread deleteChaModels();
+}
+
+deleteChaModels()
+{	
+	count = 0;
+	count2 = 0;
+	count3 = 0;
+	globalIntermission = getEntArray ( "mp_global_intermission", "targetname" );
+	dmSpawns = getEntArray ( "mp_dm_spawn", "targetname" );
+	domSpawns = getEntArray ( "mp_dom_spawn", "targetname" );
+	tdmSpawns = getEntArray ( "mp_tdm_spawn", "targetname" );
+
+	// ---- DEFINING GAMETYPE OBJECTS ----
+
+	universalExploderAB = getEntArray ( "exploder", "targetname" );
+
+	// - CTF -
+	flagRemoveAllies = getEntArray ( "ctf_flag_allies", "targetname" );
+	flagTrigRemoveAllies = getEntArray ( "ctf_trig_allies", "targetname" );
+	flagZoneRemoveAllies = getEntArray ( "ctf_zone_allies", "targetname" );
+	flagRemoveAxis = getEntArray ( "ctf_flag_axis", "targetname" );
+	flagTrigRemoveAxis = getEntArray ( "ctf_trig_axis", "targetname" );
+	flagZoneRemoveAxis = getEntArray ( "ctf_zone_axis", "targetname" );
+
+	// - DD -
+	ddbombzonesTouchAB = getEntArray ( "dd_bombzone", "targetname" );
+	ddbombzonesModelA = getEntArray ( "pf408_auto1", "targetname" ) ;
+	ddbombzonesTrigA = getEntArray ( "pf408_auto2", "targetname" );
+	ddbombzonesModelB = getEntArray ( "pf409_auto1", "targetname" ) ;
+	ddbombzonesTrigB = getEntArray ( "pf409_auto2", "targetname" );
+	ddbombzonesCollA = getEntArray ( "dd_bombzone_clip_a", "targetname" );
+	ddbombzonesCollB = getEntArray ( "dd_bombzone_clip_b", "targetname" );
+
+	// - Dom -
+	flagPrimary = getEntArray ( "flag_primary", "targetname" );
+	flagDescriptor = getEntArray ("flag_descriptor", "targetname" );
+
+	// - Sab -
+	sabbombzonesColl = getEntArray ( "sab_bomb_col", "targetname" );
+	sabbombzonesTouchAllies = getEntArray ( "sab_bomb_allies", "targetname" );
+	sabbombzonesDefuseAllies = getEntArray ( "sab_bomb_defuse_allies", "targetname" );
+	sabbombzonesSiteModelAllies = getEntArray ( "pf397_auto1", "targetname" );
+	sabbombzonesTouchAxis = getEntArray ( "sab_bomb_axis", "targetname" );
+	sabbombzonesDefuseAxis = getEntArray ( "sab_bomb_defuse_axis", "targetname" );
+	sabbombzonesSiteModelAxis = getEntArray ( "pf398_auto1", "targetname" );
+
+	// - SnD -
+	bombzonesTouchAB = getEntArray ( "bombzone", "targetname" );
+	bombzonesCollAB = getEntArray ( "bomb_col", "targetname" );
+	bombzonesModelA = getEntArray ( "pf393_auto1", "targetname" );
+	bombzonesTrigA = getEntArray ( "pf393_auto2", "targetname" );
+	bombzonesModelB = getEntArray ( "pf394_auto1", "targetname" );
+	bombzonesTrigB = getEntArray ( "pf394_auto2", "targetname" );
+	bombzonesBrief = getEntArray ( "sd_bomb", "targetname" );
+	bombzonesBriefTrig = getEntArray ( "sd_bomb_pickup_trig", "targetname" );
+
+	// ---- DELETING GAMETYPE OBJECTS ----
+
+	foreach( ent in dmSpawns )
+	{
+		count2++;
+		if (count2 > 7)
+		{
+			dmSpawns[count2] Delete();
+		}
+	}
+
+	flagRemoveAllies[0] Delete();
+	flagTrigRemoveAllies[0] Delete();
+	flagZoneRemoveAllies[0] Delete();
+	flagRemoveAxis[0] Delete();
+	flagTrigRemoveAxis[0] Delete();
+	flagZoneRemoveAxis[0] Delete();
+	foreach( ent in domSpawns )
+	{
+		count++;
+		if (count > 7)
+		{
+			domSpawns[count] Delete();
+		}
+	}
+
+	ddbombzonesTouchAB[0] Delete();
+	ddbombzonesTouchAB[1] Delete();
+	ddbombzonesModelA[0] Delete();
+	ddbombzonesTrigA[0] Delete();
+	ddbombzonesModelB[0] Delete();
+	ddbombzonesTrigB[0] Delete();
+	universalExploderAB[8] Delete();
+	universalExploderAB[9] Delete();
+	ddbombzonesCollA[0] Delete();
+	ddbombzonesCollB[0] Delete();
+
+	flagPrimary[0] Delete();
+	flagPrimary[1] Delete();
+	flagPrimary[2] Delete();
+	flagDescriptor[0] Delete();
+	flagDescriptor[1] Delete();
+	flagDescriptor[2] Delete();
+
+	sabbombzonesColl[0] Delete();
+	sabbombzonesColl[1] Delete();
+	sabbombzonesTouchAllies[0] Delete();
+	sabbombzonesDefuseAllies[0] Delete();
+	sabbombzonesSiteModelAllies[0] Delete();
+	sabbombzonesTouchAxis[0] Delete();
+	sabbombzonesDefuseAxis[0] Delete();
+	sabbombzonesSiteModelAxis[0] Delete();
+	universalExploderAB[4] Delete();
+	universalExploderAB[5] Delete();
+
+	bombzonesTouchAB[0] Delete();
+	bombzonesTouchAB[1] Delete();
+	universalExploderAB[0] Delete();
+	universalExploderAB[1] Delete();
+	bombzonesCollAB[0] Delete();
+	bombzonesCollAB[1] Delete();
+	bombzonesModelA[0] Delete();
+	bombzonesModelB[0] Delete();
+	bombzonesTrigA[0] Delete();
+	bombzonesTrigB[0] Delete();
+	bombzonesBrief[0] Delete();
+	bombzonesBriefTrig[0] Delete();
+
+	foreach( ent in tdmSpawns )
+	{
+		count3++;
+		if (count3 > 7)
+		{
+			tdmSpawns[count3] Delete();
+		}
+	}
+
+
+	// - Removing the barrels -
+
+	chaRemove = getEntArray ( "cha", "targetname" );
+
+	foreach( ent in chaRemove )
+	{
+		ent Delete();
+	}
+
+	globalIntermission[0] Delete();
 }

iw4x/iw4x_00/ui/choices_setup_common.menu

@@ -376,7 +376,7 @@
 			forecolor		1 1 1 1 \
 			visible			when( localVarInt( ui_highlight ) == itemIndex && localVarString( ui_choicegroup ) == CHOICE_GROUP && vis ); \
 			decoration \
-		} 
+		}
 #else // #if defined( CONSOLE ) && !defined( SPLITSCREEN )
 #define CHOICE_ACCEPT_HINT( itemIndex, vis )
 #endif // #else // #if defined( CONSOLE ) && !defined( SPLITSCREEN )

iw4x/iw4x_00/ui/choices_setup_popmenu.menu

@@ -33,7 +33,7 @@
 #endif
 
 #ifndef CENTER_POPUP_ON_CLOSE
-#define CENTER_POPUP_ON_CLOSE play "mouse_click"; 
+#define CENTER_POPUP_ON_CLOSE play "mouse_click";
 #endif
 
 #ifndef CHOICE_POPUP_BORDER_WIDTH
@@ -280,7 +280,7 @@
 				forecolor		CHOICE_POPUP_BACKCOLOR \
 				visible			1 \
 				decoration \
-			} 
+			}
 #else
 	#define CENTER_POPUP_SETUP_RAW( nameArg, itemCount, onEscArg, onOpenArg, extraArgs, shadow_visArg ) \
 			name			nameArg \
@@ -319,7 +319,7 @@
 				forecolor		CHOICE_POPUP_BACKCOLOR \
 				visible			1 \
 				decoration \
-			} 
+			}
 #endif
 		
 #ifdef PUBLIC_BETA

iw4x/iw4x_00/ui_mp/mapmacros.inc

@@ -1,12 +1,12 @@
 #define LOCAL_MAP_ACTION( mapname ) \
 		setdvar ui_mapname mapname; \
 		close "settings_map"; \
-		close "self"; 
+		close "self";
 
 #define LOCAL_MAP_FOCUS( name, desc, icon ) \
 		setLocalVarString "ui_info_name" ( name ); \
 		setLocalVarString "ui_info_desc" ( desc ); \
-		setLocalVarString "ui_info_icon" ( icon ); 
+		setLocalVarString "ui_info_icon" ( icon );
 
 #define LOCAL_MAP_NAME( name ) \
 		"@" + name 

iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu

@@ -106,18 +106,18 @@ menuDef
 
 	PC_OPTIONS_DVARYESNO_RAW(1, "@MENU_LOOK_INVERSION", "input_invertPitch", ;, "@MPUI_DESC_LOOK_INVERSION", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
 	PC_OPTIONS_STRLIST_RAW(2, "@MENU_THUMBSTICK_LAYOUT", "gpad_sticksConfig", 
-		{"@MENU_DEFAULT"; "thumbstick_default"; 
+		{"@MENU_DEFAULT"; "thumbstick_default";
-		"@MENU_SOUTHPAW"; "thumbstick_southpaw"; 
+		"@MENU_SOUTHPAW"; "thumbstick_southpaw";
-		"@MENU_LEGACY"; "thumbstick_legacy"; 
+		"@MENU_LEGACY"; "thumbstick_legacy";
 		"@MENU_LEGACY_SOUTHPAW"; "thumbstick_legacysouthpaw"}, execNow "bindgpsticksconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED)
 	PC_OPTIONS_STRLIST_RAW(3, "@MENU_BUTTON_LAYOUT", "gpad_buttonConfig", 
-		{"@MENU_DEFAULT"; "buttons_default"; 
+		{"@MENU_DEFAULT"; "buttons_default";
-		"@MENU_TACTICAL"; "buttons_tactical"; 
+		"@MENU_TACTICAL"; "buttons_tactical";
-		"@MENU_LEFTY"; "buttons_lefty"; 
+		"@MENU_LEFTY"; "buttons_lefty";
 		"@MENU_NOMAD"; "buttons_nomad";
-		"@MENU_DEFAULT_ALT"; "buttons_default_alt"; 
+		"@MENU_DEFAULT_ALT"; "buttons_default_alt";
-		"@MENU_TACTICAL_ALT"; "buttons_tactical_alt"; 
+		"@MENU_TACTICAL_ALT"; "buttons_tactical_alt";
-		"@MENU_LEFTY_ALT"; "buttons_lefty_alt"; 
+		"@MENU_LEFTY_ALT"; "buttons_lefty_alt";
 		"@MENU_NOMAD_ALT"; "buttons_nomad_alt"}, execNow "bindgpbuttonsconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED)
 	PC_OPTIONS_FLOATLIST_RAW(4, "@MENU_GPAD_STYLE", "gpad_style", {"@MENU_GPAD_XBOX_CAPS" 0 "@MENU_GPAD_PS_CAPS" 1}, ;, "@MPUI_DESC_GPAD_STYLE", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
 	PC_OPTIONS_DVARYESNO_RAW(5, "@MENU_SLOWDOWN_ENABLED", "gpad_slowdown_enabled", ;, "@MPUI_DESC_SLOWDOWN_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED)

iw4x/iw4x_00/ui_mp/scriptmenus/callvote.menu

@@ -18,8 +18,8 @@
 		blurWorld 7
 		onEsc 
 		{
-			close "self"; 
+			close "self";
-			open "class"; 
+			open "class";
 		}
 
 		#define BACKGROUND_PC_OPTIONS

iw4x/iw4x_00/ui_mp/scriptmenus/changegametype.menu

@@ -17,7 +17,7 @@
 		blurWorld 7
 		onEsc 
 		{
-			close "self"; 
+			close "self";
 			open "class";
 		}
 
@@ -83,12 +83,12 @@
 			elementheight 24
 			columns 1 2 190 25
 			mouseEnter 
-			{ 
+			{
 				setitemcolor "maplist2";
 				bordercolor 1 1 1 0.55;
 			}
 			mouseExit 
-			{ 
+			{
 				setitemcolor "maplist2";
 				bordercolor 1 1 1 0.15;
 			}
@@ -117,7 +117,7 @@
 			}
 			action
 			{
-				close "self"; 
+				close "self";
 				uiScript "voteGame";
 			}
 		}

iw4x/iw4x_00/ui_mp/scriptmenus/changemap.menu

@@ -85,12 +85,12 @@
 			feeder FEEDER_ALLMAPS
 			columns 1 2 190 25
 			mouseEnter 
-			{ 
+			{
 				setitemcolor "maplist";
 				bordercolor 1 1 1 0.55;
 			}
 			mouseExit 
-			{ 
+			{
 				setitemcolor "maplist";
 				bordercolor 1 1 1 0.15;
 			}
@@ -119,7 +119,7 @@
 			}
 			action
 			{
-				close "self"; 
+				close "self";
 				uiScript "voteMap";
 			}
 		}

iw4x/iw4x_00/ui_mp/scriptmenus/kickplayer.menu

@@ -18,7 +18,7 @@
 		blurWorld 7
 		onEsc 
 		{
-			close "self"; 
+			close "self";
 			open "class";
 		}
 
@@ -82,12 +82,12 @@
 			feeder FEEDER_PLAYER_LIST
 			columns 1 2 190 25
 			mouseEnter 
-			{ 
+			{
 				setitemcolor "maplist";
 				bordercolor 1 1 1 0.55;
 			}
 			mouseExit 
-			{ 
+			{
 				setitemcolor "maplist";
 				bordercolor 1 1 1 0.15;
 			}
@@ -116,7 +116,7 @@
 			}
 			action
 			{
-				close "self"; 
+				close "self";
 				uiScript "voteKick";
 			}
 		}

iw4x/iw4x_00/ui_mp/settings_map.menu

@@ -72,7 +72,7 @@
 
 		#undef CHOICE_TEXTCOLOR
 		#define CHOICE_TEXTCOLOR 0.5 1 0.5 1
-		CHOICE_BUTTON_FOCUS(0, "dlc_list_1", "@MP_ORIGINAL_MAPS", setdvar "iw4x_maps_dlc" 0;, LOCAL_MAP_FOCUS( "MP_ORIGINAL_MAPS", "NULL_EMPTY", "loadscreen_mp_bonusmaps" ), ; )
+		CHOICE_BUTTON_FOCUS(0, "dlc_list_1", "@MP_ORIGINAL_MAPS", setdvar "iw4x_maps_dlc" 0;, LOCAL_MAP_FOCUS( "MP_ORIGINAL_MAPS", "NULL_EMPTY", "loadscreen_mp_bonusmaps" ), ;)
 		CHOICE_BUTTON_FOCUS(1, "dlc_list_2", "@PATCH_DLC1", setdvar "iw4x_maps_dlc" 1;, LOCAL_MAP_FOCUS( "PATCH_DLC1", "PATCH_DESC_DLC1", "preview_stimulus_dlc" ), 1)
 		CHOICE_BUTTON_FOCUS(2, "dlc_list_3", "@PATCH_DLC2", setdvar "iw4x_maps_dlc" 2;, LOCAL_MAP_FOCUS( "PATCH_DLC2", "PATCH_DESC_DLC2", "preview_resurgence_dlc" ), 1)
 		CHOICE_BUTTON_FOCUS(3, "dlc_list_4", "@PATCH_IW4X_DLC", setdvar "iw4x_maps_dlc" 3;, LOCAL_MAP_FOCUS( "PATCH_IW4X_DLC", "PATCH_DESC_IW4X_DLC", "preview_codo_dlc" ), 1)
@@ -80,73 +80,75 @@
 		CHOICE_BUTTON_FOCUS(5, "dlc_list_6", "@PATCH_MW3_DLC", setdvar "iw4x_maps_dlc" 5;, LOCAL_MAP_FOCUS( "PATCH_MW3_DLC", "PATCH_DESC_MW3_DLC", "preview_mw3_dlc" ), 1)
 		CHOICE_BUTTON_FOCUS(6, "dlc_list_custom", "@CUSTOM_MAPS_DLC", setdvar "iw4x_maps_dlc" 99;, LOCAL_MAP_FOCUS( "CUSTOM_MAPS_DLC", "DESC_CUSTOM_MAPS_DLC", "preview_custom_maps" ), 1)
 
-		LOCAL_MAP_SELECTION( 0, 	"mp_afghan", 			"MPUI_AFGHAN", 			"MPUI_DESC_MAP_AFGHAN", 		"preview_mp_afghan",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION(0, 	"mp_afghan", 			"MPUI_AFGHAN", 			"MPUI_DESC_MAP_AFGHAN", 		"preview_mp_afghan",			dvarint("iw4x_maps_dlc") == 0)
-		LOCAL_MAP_SELECTION( 1, 	"mp_derail", 			"MPUI_DERAIL", 			"MPUI_DESC_MAP_DERAIL", 		"preview_mp_derail",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION(1, 	"mp_derail", 			"MPUI_DERAIL", 			"MPUI_DESC_MAP_DERAIL", 		"preview_mp_derail",			dvarint("iw4x_maps_dlc") == 0)
-		LOCAL_MAP_SELECTION( 2, 	"mp_estate", 			"MPUI_ESTATE", 			"MPUI_DESC_MAP_ESTATE", 		"preview_mp_estate",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION(2, 	"mp_estate", 			"MPUI_ESTATE", 			"MPUI_DESC_MAP_ESTATE", 		"preview_mp_estate",			dvarint("iw4x_maps_dlc") == 0)
-		LOCAL_MAP_SELECTION( 3, 	"mp_favela", 			"MPUI_FAVELA", 			"MPUI_DESC_MAP_FAVELA", 		"preview_mp_favela",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION(3, 	"mp_favela", 			"MPUI_FAVELA", 			"MPUI_DESC_MAP_FAVELA", 		"preview_mp_favela",			dvarint("iw4x_maps_dlc") == 0)
-		LOCAL_MAP_SELECTION( 4, 	"mp_highrise",			"MPUI_HIGHRISE", 		"MPUI_DESC_MAP_HIGHRISE", 		"preview_mp_highrise",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION(4, 	"mp_highrise",			"MPUI_HIGHRISE", 		"MPUI_DESC_MAP_HIGHRISE", 		"preview_mp_highrise",			dvarint("iw4x_maps_dlc") == 0)
-		LOCAL_MAP_SELECTION( 5, 	"mp_invasion",			"MPUI_INVASION", 		"MPUI_DESC_MAP_INVASION", 		"preview_mp_invasion",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION(5, 	"mp_invasion",			"MPUI_INVASION", 		"MPUI_DESC_MAP_INVASION", 		"preview_mp_invasion",			dvarint("iw4x_maps_dlc") == 0)
-		LOCAL_MAP_SELECTION( 6, 	"mp_checkpoint", 		"MPUI_CHECKPOINT", 		"MPUI_DESC_MAP_CHECKPOINT", 	"preview_mp_checkpoint",		dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION(6, 	"mp_checkpoint", 		"MPUI_CHECKPOINT", 		"MPUI_DESC_MAP_CHECKPOINT", 	"preview_mp_checkpoint",		dvarint("iw4x_maps_dlc") == 0)
-		LOCAL_MAP_SELECTION( 7, 	"mp_quarry", 			"MPUI_QUARRY", 			"MPUI_DESC_MAP_QUARRY", 		"preview_mp_quarry",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION(7, 	"mp_quarry", 			"MPUI_QUARRY", 			"MPUI_DESC_MAP_QUARRY", 		"preview_mp_quarry",			dvarint("iw4x_maps_dlc") == 0)
-		LOCAL_MAP_SELECTION( 8, 	"mp_rundown",			"MPUI_RUNDOWN", 		"MPUI_DESC_MAP_RUNDOWN", 		"preview_mp_rundown",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION(8, 	"mp_rundown",			"MPUI_RUNDOWN", 		"MPUI_DESC_MAP_RUNDOWN", 		"preview_mp_rundown",			dvarint("iw4x_maps_dlc") == 0)
-		LOCAL_MAP_SELECTION( 9, 	"mp_rust",				"MPUI_RUST", 			"MPUI_DESC_MAP_RUST", 			"preview_mp_rust",				dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION(9, 	"mp_rust",				"MPUI_RUST", 			"MPUI_DESC_MAP_RUST", 			"preview_mp_rust",				dvarint("iw4x_maps_dlc") == 0)
-		LOCAL_MAP_SELECTION( 10, 	"mp_boneyard",			"MPUI_BONEYARD", 		"MPUI_DESC_MAP_BONEYARD", 		"preview_mp_boneyard",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION(10, "mp_boneyard",			"MPUI_BONEYARD", 		"MPUI_DESC_MAP_BONEYARD", 		"preview_mp_boneyard",			dvarint("iw4x_maps_dlc") == 0)
-		LOCAL_MAP_SELECTION( 11, 	"mp_skidrow",			"MPUI_RAID", 			"MPUI_DESC_MAP_NIGHTSHIFT", 	"preview_mp_nightshift",		dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION(11, "mp_nightshift",		"MPUI_RAID", 			"MPUI_DESC_MAP_NIGHTSHIFT", 	"preview_mp_nightshift",		dvarint("iw4x_maps_dlc") == 0)
-		LOCAL_MAP_SELECTION( 12, 	"mp_subbase",			"MPUI_SUBBASE", 		"MPUI_DESC_MAP_SUBBASE", 		"preview_mp_subbase",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION(12, "mp_subbase",			"MPUI_SUBBASE", 		"MPUI_DESC_MAP_SUBBASE", 		"preview_mp_subbase",			dvarint("iw4x_maps_dlc") == 0)
-		LOCAL_MAP_SELECTION( 13, 	"mp_terminal",			"MPUI_TERMINAL", 		"MPUI_DESC_MAP_TERMINAL", 		"preview_mp_terminal",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION(13, "mp_terminal",			"MPUI_TERMINAL", 		"MPUI_DESC_MAP_TERMINAL", 		"preview_mp_terminal",			dvarint("iw4x_maps_dlc") == 0)
-		LOCAL_MAP_SELECTION( 14, 	"mp_underpass", 		"MPUI_UNDERPASS", 		"MPUI_DESC_MAP_UNDERPASS", 		"preview_mp_underpass",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION(14, "mp_underpass", 		"MPUI_UNDERPASS", 		"MPUI_DESC_MAP_UNDERPASS", 		"preview_mp_underpass",			dvarint("iw4x_maps_dlc") == 0)
-		LOCAL_MAP_SELECTION( 15, 	"mp_brecourt",			"MPUI_WASTELAND", 		"MPUI_DESC_MAP_BRECOURT", 		"preview_mp_brecourt",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION(15, "mp_brecourt",			"MPUI_WASTELAND", 		"MPUI_DESC_MAP_BRECOURT", 		"preview_mp_brecourt",			dvarint("iw4x_maps_dlc") == 0)
 
-		LOCAL_MAP_SELECTION( 0, 	"mp_complex", 			"PATCH_COMPLEX", 		"PATCH_DESC_MAP_COMPLEX", 		"preview_mp_complex",			dvarint("iw4x_maps_dlc") == 1)
+		LOCAL_MAP_SELECTION(0, 	"mp_complex", 			"PATCH_COMPLEX", 		"PATCH_DESC_MAP_COMPLEX", 		"preview_mp_complex",			dvarint("iw4x_maps_dlc") == 1)
-		LOCAL_MAP_SELECTION( 1, 	"mp_crash", 			"MPUI_CRASH", 			"MPUI_DESC_MAP_CRASH", 			"preview_mp_crash",				dvarint("iw4x_maps_dlc") == 1)
+		LOCAL_MAP_SELECTION(1, 	"mp_crash", 			"MPUI_CRASH", 			"MPUI_DESC_MAP_CRASH", 			"preview_mp_crash",				dvarint("iw4x_maps_dlc") == 1)
-		LOCAL_MAP_SELECTION( 2, 	"mp_overgrown", 		"MPUI_OVERGROWN", 		"MPUI_DESC_MAP_OVERGROWN", 		"preview_mp_overgrown",			dvarint("iw4x_maps_dlc") == 1)
+		LOCAL_MAP_SELECTION(2, 	"mp_overgrown", 		"MPUI_OVERGROWN", 		"MPUI_DESC_MAP_OVERGROWN", 		"preview_mp_overgrown",			dvarint("iw4x_maps_dlc") == 1)
-		LOCAL_MAP_SELECTION( 3, 	"mp_compact", 			"PATCH_COMPACT", 		"PATCH_DESC_MAP_COMPACT", 		"preview_mp_compact",			dvarint("iw4x_maps_dlc") == 1)
+		LOCAL_MAP_SELECTION(3, 	"mp_compact", 			"PATCH_COMPACT", 		"PATCH_DESC_MAP_COMPACT", 		"preview_mp_compact",			dvarint("iw4x_maps_dlc") == 1)
-		LOCAL_MAP_SELECTION( 4, 	"mp_storm", 			"PATCH_STORM", 			"PATCH_DESC_MAP_STORM", 		"preview_mp_storm",				dvarint("iw4x_maps_dlc") == 1)
+		LOCAL_MAP_SELECTION(4, 	"mp_storm", 			"PATCH_STORM", 			"PATCH_DESC_MAP_STORM", 		"preview_mp_storm",				dvarint("iw4x_maps_dlc") == 1)
 
-		LOCAL_MAP_SELECTION( 0, 	"mp_abandon", 			"PATCH_ABANDON", 		"PATCH_DESC_MAP_ABANDON", 		"preview_mp_abandon",			dvarint("iw4x_maps_dlc") == 2)
+		LOCAL_MAP_SELECTION(0, 	"mp_abandon", 			"PATCH_ABANDON", 		"PATCH_DESC_MAP_ABANDON", 		"preview_mp_abandon",			dvarint("iw4x_maps_dlc") == 2)
-		LOCAL_MAP_SELECTION( 1, 	"mp_fuel2", 			"PATCH_FUEL2", 			"PATCH_DESC_MAP_FUEL2",			"preview_mp_fuel2",				dvarint("iw4x_maps_dlc") == 2)
+		LOCAL_MAP_SELECTION(1, 	"mp_fuel2", 			"PATCH_FUEL2", 			"PATCH_DESC_MAP_FUEL2",			"preview_mp_fuel2",				dvarint("iw4x_maps_dlc") == 2)
-		LOCAL_MAP_SELECTION( 2, 	"mp_strike", 			"PATCH_STRIKE", 		"MPUI_DESC_MAP_STRIKE", 		"preview_mp_strike",			dvarint("iw4x_maps_dlc") == 2)
+		LOCAL_MAP_SELECTION(2, 	"mp_strike", 			"PATCH_STRIKE", 		"MPUI_DESC_MAP_STRIKE", 		"preview_mp_strike",			dvarint("iw4x_maps_dlc") == 2)
-		LOCAL_MAP_SELECTION( 3, 	"mp_trailerpark", 		"PATCH_TRAILERPARK",	"PATCH_DESC_MAP_TRAILERPARK", 	"preview_mp_trailerpark",		dvarint("iw4x_maps_dlc") == 2)
+		LOCAL_MAP_SELECTION(3, 	"mp_trailerpark", 		"PATCH_TRAILERPARK",	"PATCH_DESC_MAP_TRAILERPARK", 	"preview_mp_trailerpark",		dvarint("iw4x_maps_dlc") == 2)
-		LOCAL_MAP_SELECTION( 4, 	"mp_vacant", 			"PATCH_VACANT", 		"MPUI_DESC_MAP_VACANT", 		"preview_mp_vacant",			dvarint("iw4x_maps_dlc") == 2)
+		LOCAL_MAP_SELECTION(4, 	"mp_vacant", 			"PATCH_VACANT", 		"MPUI_DESC_MAP_VACANT", 		"preview_mp_vacant",			dvarint("iw4x_maps_dlc") == 2)
 
-		LOCAL_MAP_SELECTION( 0, 	"mp_nuked",				"MPUI_NUKED",			"MPUI_DESC_MAP_NUKED", 			"preview_mp_nuked",				dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION(0, 	"mp_nuked",				"MPUI_NUKED",			"MPUI_DESC_MAP_NUKED", 			"preview_mp_nuked",				dvarint("iw4x_maps_dlc") == 3)
-		LOCAL_MAP_SELECTION( 1, 	"mp_cross_fire",		"MPUI_CROSSFIRE",		"MPUI_DESC_MAP_CROSSFIRE",		"preview_mp_cross_fire",		dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION(1, 	"mp_cross_fire",		"MPUI_CROSSFIRE",		"MPUI_DESC_MAP_CROSSFIRE",		"preview_mp_cross_fire",		dvarint("iw4x_maps_dlc") == 3)
-		LOCAL_MAP_SELECTION( 2, 	"mp_cargoship",			"MPUI_CARGOSHIP",		"MPUI_DESC_MAP_CARGOSHIP",		"preview_mp_cargoship",			dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION(2, 	"mp_cargoship",			"MPUI_CARGOSHIP",		"MPUI_DESC_MAP_CARGOSHIP",		"preview_mp_cargoship",			dvarint("iw4x_maps_dlc") == 3)
-		LOCAL_MAP_SELECTION( 3, 	"mp_bloc_sh",			"MPUI_BLOC_SH",			"MPUI_DESC_MAP_BLOC_SH",		"preview_mp_bloc_sh",			dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION(3, 	"mp_bloc_sh",			"MPUI_BLOC_SH",			"MPUI_DESC_MAP_BLOC_SH",		"preview_mp_bloc_sh",			dvarint("iw4x_maps_dlc") == 3)
-		LOCAL_MAP_SELECTION( 4, 	"mp_killhouse",			"MPUI_KILLHOUSE",		"MPUI_DESC_MAP_KILLHOUSE",		"preview_mp_killhouse",			dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION(4, 	"mp_killhouse",			"MPUI_KILLHOUSE",		"MPUI_DESC_MAP_KILLHOUSE",		"preview_mp_killhouse",			dvarint("iw4x_maps_dlc") == 3)
-		LOCAL_MAP_SELECTION( 5, 	"mp_bog", 				"MPUI_BOG_SH",			"MPUI_DESC_MAP_BOG",			"preview_mp_bog_sh",			dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION(5, 	"mp_bog_sh", 			"MPUI_BOG_SH",			"MPUI_DESC_MAP_BOG",			"preview_mp_bog_sh",			dvarint("iw4x_maps_dlc") == 3)
-		LOCAL_MAP_SELECTION( 6, 	"mp_cargoship_sh",		"MPUI_CARGOSHIP_SH",	"MPUI_DESC_MAP_CARGOSHIP_SH",	"preview_mp_cargoship_sh",		dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION(6, 	"mp_cargoship_sh",		"MPUI_CARGOSHIP_SH",	"MPUI_DESC_MAP_CARGOSHIP_SH",	"preview_mp_cargoship_sh",		dvarint("iw4x_maps_dlc") == 3)
-		LOCAL_MAP_SELECTION( 7, 	"mp_shipment_long",		"MPUI_SHIPMENT_LONG",	"MPUI_DESC_MAP_SHIPMENT_LONG",	"preview_mp_shipment_long",		dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION(7, 	"mp_shipment",			"MPUI_SHIPMENT",		"MPUI_DESC_MAP_SHIPMENT",		"preview_mp_shipment",			dvarint("iw4x_maps_dlc") == 3)
-		LOCAL_MAP_SELECTION( 8, 	"mp_rust_long",			"MPUI_RUST_LONG",		"MPUI_DESC_MAP_RUST_LONG",		"preview_mp_rust_long",			dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION(8, 	"mp_shipment_long",		"MPUI_SHIPMENT_LONG",	"MPUI_DESC_MAP_SHIPMENT_LONG",	"preview_mp_shipment_long",		dvarint("iw4x_maps_dlc") == 3)
-		LOCAL_MAP_SELECTION( 9, 	"mp_firingrange",		"MPUI_FIRINGRANGE",		"MPUI_DESC_MAP_FIRINGRANGE",	"preview_mp_firingrange",		dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION(9, 	"mp_rust_long",			"MPUI_RUST_LONG",		"MPUI_DESC_MAP_RUST_LONG",		"preview_mp_rust_long",			dvarint("iw4x_maps_dlc") == 3)
-		LOCAL_MAP_SELECTION( 10, 	"mp_bloc", 				"MPUI_BLOC",			"MPUI_DESC_MAP_BLOC",			"preview_mp_bloc",				dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION(10, "mp_firingrange",		"MPUI_FIRINGRANGE",		"MPUI_DESC_MAP_FIRINGRANGE",	"preview_mp_firingrange",		dvarint("iw4x_maps_dlc") == 3)
-		LOCAL_MAP_SELECTION( 11, 	"mp_crash_tropical",	"MPUI_CRASH_TROPICAL",	"MPUI_DESC_MAP_CRASH_TROPICAL",	"preview_mp_crash_tropical",	dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION(11, "mp_bloc", 				"MPUI_BLOC",			"MPUI_DESC_MAP_BLOC",			"preview_mp_bloc",				dvarint("iw4x_maps_dlc") == 3)
-		LOCAL_MAP_SELECTION( 12, 	"mp_estate_tropical",	"MPUI_ESTATE_TROPICAL",	"MPUI_DESC_MAP_ESTATE_TROPICAL","preview_mp_estate_tropical",	dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION(12, "mp_crash_tropical",	"MPUI_CRASH_TROPICAL",	"MPUI_DESC_MAP_CRASH_TROPICAL",	"preview_mp_crash_tropical",	dvarint("iw4x_maps_dlc") == 3)
-		LOCAL_MAP_SELECTION( 13, 	"mp_fav_tropical",		"MPUI_FAV_TROPICAL",	"MPUI_DESC_MAP_FAV_TROPICAL",	"preview_mp_fav_tropical",		dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION(13, "mp_estate_tropical",	"MPUI_ESTATE_TROPICAL",	"MPUI_DESC_MAP_ESTATE_TROPICAL","preview_mp_estate_tropical",	dvarint("iw4x_maps_dlc") == 3)
-		LOCAL_MAP_SELECTION( 14, 	"mp_storm_spring",		"MPUI_STORM_SPRING",	"MPUI_DESC_MAP_STORM_SPRING", 	"preview_mp_storm_spring",		dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION(14, "mp_fav_tropical",		"MPUI_FAV_TROPICAL",	"MPUI_DESC_MAP_FAV_TROPICAL",	"preview_mp_fav_tropical",		dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION(15, "mp_storm_spring",		"MPUI_STORM_SPRING",	"MPUI_DESC_MAP_STORM_SPRING", 	"preview_mp_storm_spring",		dvarint("iw4x_maps_dlc") == 3)
 
-		LOCAL_MAP_SELECTION( 0, 	"mp_farm",				"MPUI_FARM",			"MPUI_DESC_MAP_FARM", 			"preview_mp_farm",				dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION(0, 	"mp_farm",				"MPUI_FARM",			"MPUI_DESC_MAP_FARM", 			"preview_mp_farm",				dvarint("iw4x_maps_dlc") == 4)
-		LOCAL_MAP_SELECTION( 1, 	"mp_backlot",			"MPUI_BACKLOT",			"MPUI_DESC_MAP_BACKLOT",		"preview_mp_backlot",			dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION(1, 	"mp_backlot",			"MPUI_BACKLOT",			"MPUI_DESC_MAP_BACKLOT",		"preview_mp_backlot",			dvarint("iw4x_maps_dlc") == 4)
-		LOCAL_MAP_SELECTION( 2, 	"mp_pipeline",			"MPUI_PIPELINE",		"MPUI_DESC_PIPELINE",			"preview_mp_pipeline",			dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION(2, 	"mp_pipeline",			"MPUI_PIPELINE",		"MPUI_DESC_PIPELINE",			"preview_mp_pipeline",			dvarint("iw4x_maps_dlc") == 4)
-		LOCAL_MAP_SELECTION( 3, 	"mp_countdown",			"MPUI_COUNTDOWN",		"MPUI_DESC_MAP_COUNTDOWN",		"preview_mp_countdown",			dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION(3, 	"mp_countdown",			"MPUI_COUNTDOWN",		"MPUI_DESC_MAP_COUNTDOWN",		"preview_mp_countdown",			dvarint("iw4x_maps_dlc") == 4)
-		LOCAL_MAP_SELECTION( 4, 	"mp_crash_snow",		"MPUI_CRASH_SNOW",		"MPUI_DESC_MAP_CRASH_SNOW",		"preview_mp_crash_snow",		dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION(4, 	"mp_crash_snow",		"MPUI_CRASH_SNOW",		"MPUI_DESC_MAP_CRASH_SNOW",		"preview_mp_crash_snow",		dvarint("iw4x_maps_dlc") == 4)
-		LOCAL_MAP_SELECTION( 5, 	"mp_carentan", 			"MPUI_CARENTAN",		"MPUI_DESC_MAP_CARENTAN",		"preview_mp_carentan",			dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION(5, 	"mp_carentan", 			"MPUI_CARENTAN",		"MPUI_DESC_MAP_CARENTAN",		"preview_mp_carentan",			dvarint("iw4x_maps_dlc") == 4)
-		LOCAL_MAP_SELECTION( 6, 	"mp_broadcast",			"MPUI_BROADCAST",		"MPUI_DESC_MAP_BROADCAST",		"preview_mp_broadcast",			dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION(6, 	"mp_broadcast",			"MPUI_BROADCAST",		"MPUI_DESC_MAP_BROADCAST",		"preview_mp_broadcast",			dvarint("iw4x_maps_dlc") == 4)
-		LOCAL_MAP_SELECTION( 7, 	"mp_showdown",			"MPUI_SHOWDOWN",		"MPUI_DESC_MAP_SHOWDOWN",		"preview_mp_showdown",			dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION(7, 	"mp_showdown",			"MPUI_SHOWDOWN",		"MPUI_DESC_MAP_SHOWDOWN",		"preview_mp_showdown",			dvarint("iw4x_maps_dlc") == 4)
-		LOCAL_MAP_SELECTION( 8, 	"mp_convoy",			"MPUI_CONVOY",			"MPUI_DESC_MAP_CONVOY",			"preview_mp_convoy",			dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION(8, 	"mp_convoy",			"MPUI_CONVOY",			"MPUI_DESC_MAP_CONVOY",			"preview_mp_convoy",			dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION(9, 	"mp_citystreets",		"MPUI_CITYSTREETS",		"MPUI_DESC_MAP_CITYSTREETS",	"preview_mp_citystreets",		dvarint("iw4x_maps_dlc") == 4)
 
-		LOCAL_MAP_SELECTION( 0,		"mp_alpha", 			"MPUI_LOCKDOWN",		"MPUI_DESC_MAP_LOCKDOWN",		"preview_mp_alpha",				dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION(0,	"mp_alpha", 			"MPUI_LOCKDOWN",		"MPUI_DESC_MAP_LOCKDOWN",		"preview_mp_alpha",				dvarint("iw4x_maps_dlc") == 5)
-		LOCAL_MAP_SELECTION( 1,		"mp_bravo", 			"MPUI_MISSION",			"MPUI_DESC_MAP_MISSION",		"preview_mp_bravo",				dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION(1,	"mp_bravo", 			"MPUI_MISSION",			"MPUI_DESC_MAP_MISSION",		"preview_mp_bravo",				dvarint("iw4x_maps_dlc") == 5)
-		LOCAL_MAP_SELECTION( 2,		"mp_dome", 				"MPUI_DOME",			"MPUI_DESC_MAP_DOME",			"preview_mp_dome",				dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION(2,	"mp_dome", 				"MPUI_DOME",			"MPUI_DESC_MAP_DOME",			"preview_mp_dome",				dvarint("iw4x_maps_dlc") == 5)
-		LOCAL_MAP_SELECTION( 3,		"mp_hardhat", 			"MPUI_HARDHAT",			"MPUI_DESC_MAP_HARDHAT",		"preview_mp_hardhat",			dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION(3,	"mp_hardhat", 			"MPUI_HARDHAT",			"MPUI_DESC_MAP_HARDHAT",		"preview_mp_hardhat",			dvarint("iw4x_maps_dlc") == 5)
-		LOCAL_MAP_SELECTION( 4,		"mp_paris", 			"MPUI_RESISTANCE",		"MPUI_DESC_MAP_RESISTANCE",		"preview_mp_paris",				dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION(4,	"mp_paris", 			"MPUI_RESISTANCE",		"MPUI_DESC_MAP_RESISTANCE",		"preview_mp_paris",				dvarint("iw4x_maps_dlc") == 5)
-		LOCAL_MAP_SELECTION( 5,		"mp_plaza2", 			"MPUI_ARKADEN",			"MPUI_DESC_MAP_ARKADEN",		"preview_mp_plaza2",			dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION(5,	"mp_plaza2", 			"MPUI_ARKADEN",			"MPUI_DESC_MAP_ARKADEN",		"preview_mp_plaza2",			dvarint("iw4x_maps_dlc") == 5)
-		LOCAL_MAP_SELECTION( 6,		"mp_seatown", 			"MPUI_SEATOWN",			"MPUI_DESC_MAP_SEATOWN",		"preview_mp_seatown",			dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION(6,	"mp_seatown", 			"MPUI_SEATOWN",			"MPUI_DESC_MAP_SEATOWN",		"preview_mp_seatown",			dvarint("iw4x_maps_dlc") == 5)
-		LOCAL_MAP_SELECTION( 7,		"mp_underground", 		"MPUI_UNDERGROUND",		"MPUI_DESC_MAP_UNDERGROUND",	"preview_mp_underground",		dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION(7,	"mp_underground", 		"MPUI_UNDERGROUND",		"MPUI_DESC_MAP_UNDERGROUND",	"preview_mp_underground",		dvarint("iw4x_maps_dlc") == 5)
-		LOCAL_MAP_SELECTION( 8,		"mp_village", 			"MPUI_VILLAGE",			"MPUI_DESC_MAP_VILLAGE",		"preview_mp_village",			dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION(8,	"mp_village", 			"MPUI_VILLAGE",			"MPUI_DESC_MAP_VILLAGE",		"preview_mp_village",			dvarint("iw4x_maps_dlc") == 5)
 
 		itemDef 
-		{ 
+		{
 			name "select_custom_map"
 			rect 250 -20 96 20 1 3 
 			visible 1 
@@ -163,25 +165,25 @@
 			text "@MPUI_DONE_SELECTING" 
 			visible when ( dvarint("iw4x_maps_dlc") == 99 ) 
 			onFocus 
-			{ 
+			{
-				play CHOICE_FOCUS_SOUND; 
+				play CHOICE_FOCUS_SOUND;
-				setItemColor self backcolor 0 0 0 1; 
+				setItemColor self backcolor 0 0 0 1;
-				setLocalVarBool "ui_menuAButton" ( 1 ); 
+				setLocalVarBool "ui_menuAButton" ( 1 );
-			} 
+			}
 			leaveFocus 
-			{ 
+			{
-				setItemColor self backcolor 0 0 0 0; 
+				setItemColor self backcolor 0 0 0 0;
-				setLocalVarString "ui_hint_text" ( "@NULL_EMPTY" ); 
+				setLocalVarString "ui_hint_text" ( "@NULL_EMPTY" );
-				setLocalVarBool "ui_menuAButton" ( 0 ); 
+				setLocalVarBool "ui_menuAButton" ( 0 );
-			} 
+			}
-			action 
+			action
-			{ 
+			{
-				play "mouse_click"; 
+				play "mouse_click";
-				escape "self"; 
+				escape "self";
-				uiScript "ApplyMap" 
+				uiScript "ApplyMap";
-				close "settings_map"; 
+				close "settings_map";
-				close "self"; 
+				close "self";
-			} 
+			}
 		}
 
 		itemDef
@@ -209,13 +211,14 @@
 			{
 				play "mouse_over";
 				setItemColor "maplist" bordercolor 1 1 1 "1";
-				LOCAL_MAP_FOCUS( "@" + localvarstring( "ui_info_name" ), "Custom usermaps/", "loadscreen_mp_bonusmaps" )
+				LOCAL_MAP_FOCUS( localvarstring( "ui_info_name" ), "Custom usermaps", "loadscreen_mp_bonusmaps" )
 			}
 			leaveFocus
 			{
 				setItemColor "maplist" bordercolor 1 1 1 "0.15";
 			}
 		}
+
 		itemDef
 		{
 			rect -292 28 292 356 3 1
@@ -226,6 +229,7 @@
 			textScale 0.55
 			visible when ( dvarbool( "widescreen" ) )
 		}
+
 		itemDef
 		{
 			name "mapimage"
@@ -235,8 +239,9 @@
 			decoration 
 			textScale 0.55
 			exp material ( localvarstring( "ui_info_icon" ) )
-			visible when(localvarstring( "ui_info_icon") != "" && dvarbool( "widescreen" ) && dvarint("iw4x_maps_dlc") != 99 )
+			visible when ( localvarstring( "ui_info_icon") != "" && dvarbool( "widescreen" ) && dvarint("iw4x_maps_dlc") != 99 )
 		}
+
 		itemDef
 		{
 			name "longname"
@@ -249,6 +254,7 @@
 			exp text ( "@" + localvarstring( "ui_info_name" ) )
 			visible when ( dvarbool( "widescreen" ) )
 		}
+
 		itemDef
 		{
 			name "description"
@@ -285,12 +291,12 @@
 			elementtype LISTBOX_TEXT
 			elementWidth 120
 			elementHeight 22
-			visible when (!dvarbool( "widescreen" ) && dvarint("iw4x_maps_dlc") == 99 )
+			visible when ( !dvarbool( "widescreen" ) && dvarint("iw4x_maps_dlc") == 99 )
 			onFocus
 			{
 				play "mouse_over";
 				setItemColor "maplist" bordercolor 1 1 1 "1";
-				LOCAL_MAP_FOCUS( "Custom Maps", "Custom usermaps/", "loadscreen_mp_bonusmaps" )
+				LOCAL_MAP_FOCUS( "Custom Maps", "Custom usermaps", "loadscreen_mp_bonusmaps" )
 			}
 			leaveFocus
 			{
@@ -308,6 +314,7 @@
 			textScale 0.55
 			visible when ( !dvarbool( "widescreen" ) )
 		}
+
 		itemDef
 		{
 			name "mapimage"
@@ -317,8 +324,9 @@
 			decoration 
 			textScale 0.55
 			exp material ( localvarstring( "ui_info_icon" ) )
-			visible when( localvarstring( "ui_info_icon") != "" && !dvarbool( "widescreen" ) && dvarint("iw4x_maps_dlc") != 99	 )
+			visible when ( localvarstring( "ui_info_icon") != "" && !dvarbool( "widescreen" ) && dvarint("iw4x_maps_dlc") != 99 )
 		}
+
 		itemDef
 		{
 			name "longname"
@@ -332,6 +340,7 @@
 			exp text ( "@" + localvarstring( "ui_info_name" ) )
 			visible when ( !dvarbool( "widescreen" ) )
 		}
+
 		itemDef
 		{
 			name "description"