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
+      - 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/bots.txt

@@ -1,18 +1,18 @@
-/dev/../
+/dev/../,BOT
-/dev/console
+/dev/console,BOT
-/dev/full
+/dev/full,BOT
-/dev/random
+/dev/random,BOT
-/dev/sdb
+/dev/sdb,BOT
-/dev/sr0
+/dev/sr0,BOT
-/dev/tty0
+/dev/tty0,BOT
-/dev/urandom
+/dev/urandom,BOT
-Diamante
+Diamante,BOT
-Doctor
+Doctor,BOT
-Dss0
+Dss0,BOT
-Jimbo
+Jimbo,BOT
-Laupetin
+Laupetin,BOT
-Louvenarde
+Louvenarde,BOT
-lsb_release -a
+lsb_release -a,BOT
-Lunarion
+Lunarion,BOT
-RektInator
+RektInator,BOT
-Snake
+Snake,BOT

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."
@@ -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

@@ -196,6 +196,9 @@ LANG_ENGLISH		"The Only Easy Day... Was Yesterday"
 REFERENCE			MPUI_NUKED
 LANG_ENGLISH		"Nuketown"
 
+REFERENCE			MPUI_IW4_TEST_MAP
+LANG_ENGLISH		"IW4 Test Map"
+
 REFERENCE			MPUI_DESC_MAP_NUKED
 LANG_ENGLISH		"A deserted nuke testing facility used in the Cold War."
 
@@ -271,6 +274,9 @@ LANG_ENGLISH		"x2 Bonus!"
 REFERENCE			SPLASHES_TEAM_ASSIST
 LANG_ENGLISH		"Team Assist!"
 
+REFERENCE			MENU_NATIVECURSOR
+LANG_ENGLISH		"Display native cursor"
+
 REFERENCE			MENU_MODS
 LANG_ENGLISH		"Mods"
 
@@ -1045,4 +1051,97 @@ LANG_ENGLISH		"^2&&1  ^7Bigger icon"
 REFERENCE			GAME_NOTONROTATION
 LANG_ENGLISH		"This map or gamemode is not part of the server rotation"
 
+REFERENCE			MENU_LOADING_MAPS
+LANG_ENGLISH		"Loading map selection..."
+
+REFERENCE			MPUI_SEATOWN
+LANG_ENGLISH		"Seatown"
+
+REFERENCE			MPUI_RESISTANCE
+LANG_ENGLISH		"Resistance"
+
+REFERENCE			MPUI_ARKADEN
+LANG_ENGLISH		"Arkaden"
+
+REFERENCE			MPUI_HARDHAT
+LANG_ENGLISH		"Hardhat"
+
+REFERENCE			MPUI_MISSION
+LANG_ENGLISH		"Mission"
+
+REFERENCE			MPUI_VILLAGE
+LANG_ENGLISH		"Village"
+
+REFERENCE			MPUI_DOME
+LANG_ENGLISH		"Dome"
+
+REFERENCE			MPUI_LOCKDOWN
+LANG_ENGLISH		"Lockdown"
+
+REFERENCE			MPUI_UNDERGROUND
+LANG_ENGLISH		"Underground"
+
+REFERENCE			MPUI_DESC_MAP_UNDERGROUND
+LANG_ENGLISH		"Small subway station. Fast paced action both inside and out."
+
+REFERENCE			MPUI_DESC_MAP_MISSION
+LANG_ENGLISH		"African colonial settlement. Fight to control the center."
+
+REFERENCE			MPUI_DESC_MAP_VILLAGE
+LANG_ENGLISH		"Large African village. Great for all game modes."
+
+REFERENCE			MPUI_DESC_MAP_DOME
+LANG_ENGLISH		"Small outpost in the desert. Fast and frantic action."
+
+REFERENCE			MPUI_DESC_MAP_HARDHAT
+LANG_ENGLISH		"A small construction site. Fast paced, close quarter action."
+
+REFERENCE			MPUI_DESC_MAP_ARKADEN
+LANG_ENGLISH		"Medium sized German mall. Intense Search & Destroy games."
+
+REFERENCE			MPUI_DESC_MAP_RESISTANCE
+LANG_ENGLISH		"Parisian district. Great for Domination and Kill Confirmed."
+
+REFERENCE			MPUI_DESC_MAP_SEATOWN
+LANG_ENGLISH		"A coastal town.  Narrow streets bring hectic, close encounters."
+
+REFERENCE			MPUI_DESC_MAP_LOCKDOWN
+LANG_ENGLISH		"European city center. Great for Team Defender."
+
+REFERENCE			PATCH_DLC1
+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"
+
+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."
+
+REFERENCE			PATCH_IW4X_DLC
+LANG_ENGLISH		"IW4x Classics"
+
+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"
+
+REFERENCE			PATCH_DESC_COD4_DLC
+LANG_ENGLISH		"Call Of Duty 4 maps ported to IW4x by the team"
+
+REFERENCE			PATCH_MW3_DLC
+LANG_ENGLISH		"Modern Warfare 3 Pack"
+
+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"
+
+REFERENCE			DESC_CUSTOM_MAPS_DLC
+LANG_ENGLISH		"Downloaded maps that are placed in the /usermaps subfolder"
+
 ENDMARKER

iw4x/iw4x_00/maps/animated_models/foliage_tree_palm_bushy_3.gsc

@@ -1,12 +0,0 @@
-#include common_scripts\utility;
-
-#using_animtree( "animated_props" );
-main()
-{
-	if( !isdefined ( level.anim_prop_models ) )
-		level.anim_prop_models = [];
-
-	model = "foliage_tree_palm_bushy_3";
-
-	level.anim_prop_models[ model ] = "palmtree_tall3_sway_tropical";
-}

iw4x/iw4x_00/maps/createfx/mp_bloc_fx.gsc

@@ -4,93 +4,6 @@
 
 main()
 {	
-
-	/*
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( 1075.8, -5820.69, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( -1653.67, -5368.75, 396.635 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( 3051.45, -6605.11, 304.969 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( -344.3, -6547.2, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( -669.6, -3669.6, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( -107.2, -5224.7, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( 2612.1, -5740.3, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( 4908.1, -7834.4, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( 1411.6, -8023.9, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( 4899.7, -6132.9, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( 4114.7, -8103.2, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( -3121.6, -5982.4, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( -3836.9, -4272.9, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( -2246.9, -3003.3, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	*/
-	
 	ent = createOneshotEffect( "hallway_smoke" );
 	ent.v[ "origin" ] = ( 1550.76, -4958.51, 189.125 );
 	ent.v[ "angles" ] = ( 358, 180, 180 );

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

@@ -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,27 +171,12 @@ 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" )
 		{
 			if ( !self isHost() )
@@ -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/_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/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/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/iw4_credits.gsc

@@ -2,20 +2,14 @@
 
 main()
 {
-
- 
 	maps\mp\_load::main();
 
-
-
- 
 	game[ "attackers" ] = "allies";
 	game[ "defenders" ] = "axis";
 
 	maps\mp\_compass::setupMiniMap( "compass_map_hunted" );
 	setdvar( "compassmaxrange", "4000" );
 
- 
 	array_thread( getentarray( "compassTriggers", "targetname" ), ::compass_triggers_think );
 
 }
@@ -25,11 +19,10 @@ self_delete()
 	self delete();
 }
 
-
 compass_triggers_think()
 {
 	assertex( isdefined( self.script_noteworthy ), "compassTrigger at " + self.origin + " needs to have a script_noteworthy with the name of the minimap to use" );
-        while( true )
+	while ( true )
 	{
 		wait( 1 );
 		self waittill( "trigger" );
@@ -40,11 +33,13 @@ compass_triggers_think()
 createSpawnpoint( classname, origin, yaw )
 {
 	spawnpoint = spawn( "script_origin", origin );
-        spawnpoint.angles = (0,yaw,0);
+	spawnpoint.angles = ( 0, yaw, 0 );
 
 	if ( !isdefined( level.extraspawnpoints ) )
 		level.extraspawnpoints = [];
+
 	if ( !isdefined( level.extraspawnpoints[classname] ) )
 		level.extraspawnpoints[classname] = [];
+
 	level.extraspawnpoints[classname][ level.extraspawnpoints[classname].size ] = spawnpoint;
 }

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 );
 	

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

@@ -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_farm.gsc

@@ -4,16 +4,14 @@ main()
 	maps\createart\mp_farm_art::main();
 	maps\mp\_load::main();
 
-	maps\mp\_compass::setupMiniMap("compass_map_mp_farm");
+	maps\mp\_compass::setupMiniMap( "compass_map_mp_farm" );
 
-	//setExpFog(300, 1400, 0.5, 0.5, 0.5, 1.0, 0);
+	ambientPlay( "ambient_farm" );
-	ambientPlay("ambient_farm");
-	//VisionSetNaked( "mp_farm" );
 
 	game["attackers"] = "allies";
 	game["defenders"] = "axis";
 
-	setdvar("r_specularcolorscale", 1.279588); // Set by iw3xport
+	setdvar( "r_specularcolorscale", 1.279588 ); // Set by iw3xport
 
 	setdvar("compassmaxrange","2000");
 }

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"

iw4x/iw4x_00/maps/mp/mp_firingrange.gsc

@@ -11,11 +11,14 @@ 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.

iw4x/iw4x_00/maps/mp/mp_shipment.gsc

@@ -5,17 +5,17 @@ main()
 	maps\createfx\mp_shipment_fx::main();
 	maps\mp\_load::main();
 
-	maps\mp\_compass::setupMiniMap("compass_map_mp_shipment");
+	maps\mp\_compass::setupMiniMap( "compass_map_mp_shipment" );
 
 	ambientPlay("ambient_trainer_ext2"); //TODO: get proper ambient
 
 	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();
 }

iw4x/iw4x_00/mp/basemaps.arena

@@ -336,62 +336,10 @@
     useteamzones "true"
     environment  "urban"
 }
-/*
-{
-    map          "gulag"
-    longname     "MPUI_GULAG"
-    gametype     "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef"
-    description  "MPUI_DESC_MAP_GULAG"
-    mapimage     "preview_mp_gulag"
-    mapoverlay   "compass_overlay_map_blank"
-    allieschar   "seals_udt"
-    axischar     "opforce_arctic"
-    useteamzones "true"
-    environment  "urban"
-}
 
-{
-    map          "invasion"
-    longname     "BurgerTown"
-    gametype     "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef"
-    description  ""
-    mapimage     "preview_invasion"
-    mapoverlay   "compass_overlay_map_blank"
-    allieschar   "us_army"
-    axischar     "opforce_composite"
-    useteamzones "true"
-    environment  "urban"
-}
-
-{
-    map          "so_ghillies"
-    longname     "Pripyat"
-    gametype     "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef"
-    description  ""
-    mapimage     "preview_so_ghillies"
-    mapoverlay   "compass_overlay_map_blank"
-    allieschar   "socom_141_forest"
-    axischar     "opforce_airborne"
-    useteamzones "true"
-    environment  "forest"
-}
-
-{
-    map          "contingency"
-    longname     "Contingency"
-    gametype     "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef"
-    description  ""
-    mapimage     "preview_mp_contingency"
-    mapoverlay   "compass_overlay_map_blank"
-    allieschar   "seals_udt"
-    axischar     "opforce_arctic"
-    useteamzones "true"
-    environment  "urban"
-}
-*/
 {
     map          "iw4_credits"
-    longname     "IW4 Test Map"
+    longname     "MPUI_IW4_TEST_MAP"
     gametype     "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef"
     description  ""
     mapimage     "preview_iw4_credits"
@@ -731,3 +679,111 @@
     axischar      "opforce_composite"
     environment   "desert"
 }
+
+{
+  map           "mp_alpha"
+  longname      "MPUI_LOCKDOWN"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_LOCKDOWN"
+  mapimage      "preview_mp_alpha"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "us_army"
+  axischar      "socom_141_forest"
+  environment   "urban"
+}
+
+{
+  map           "mp_underground"
+  longname      "MPUI_UNDERGROUND"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_UNDERGROUND"
+  mapimage      "preview_mp_underground"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "us_army"
+  axischar      "opforce_airborne"
+  environment   "urban"
+}
+
+{
+  map           "mp_bravo"
+  longname      "MPUI_MISSION"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_MISSION"
+  mapimage      "preview_mp_bravo"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "socom_141_forest"
+  axischar      "militia"
+  environment   "forest"
+}
+
+{
+  map           "mp_village"
+  longname      "MPUI_VILLAGE"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_VILLAGE"
+  mapimage      "preview_mp_village"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "socom_141_forest"
+  axischar      "militia"
+  environment   "forest"
+}
+
+{
+  map           "mp_seatown"
+  longname      "MPUI_SEATOWN"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_SEATOWN"
+  mapimage      "preview_mp_seatown"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "socom_141_desert"
+  axischar      "militia"
+  environment   "desert"
+}
+
+{
+  map           "mp_plaza2"
+  longname      "MPUI_ARKADEN"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_ARKADEN"
+  mapimage      "preview_mp_plaza2"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "seals_udt"
+  axischar      "opforce_airborne"
+  environment   "urban"
+}
+
+{
+  map           "mp_paris"
+  longname      "MPUI_RESISTANCE"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_RESISTANCE"
+  mapimage      "preview_mp_paris"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "socom_141_forest"
+  axischar      "opforce_airborne"
+  environment   "urban"
+}
+
+{
+  map           "mp_hardhat"
+  longname      "MPUI_HARDHAT"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_HARDHAT"
+  mapimage      "preview_mp_hardhat"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "us_army"
+  axischar      "opforce_airborne"
+  environment   "forest"
+}
+
+{
+  map           "mp_dome"
+  longname      "MPUI_DOME"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_DOME"
+  mapimage      "preview_mp_dome"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "socom_141_desert"
+  axischar      "opforce_composite"
+  environment   "desert"
+}

iw4x/iw4x_00/scripts/_aimassist.gsc

@@ -4,8 +4,6 @@
 // Put this file in your scripts folder.
 // ========================================================
 
-#include maps\mp\_utility;
-
 init()
 {
 	aimAssistAllowed = getDvarInt("sv_allowAimAssist");

iw4x/iw4x_00/ui_mp/createserver.menu

@@ -303,7 +303,8 @@ menuDef
 
 	MENU_CHOICE_HORIZONTAL_LINE(1)
 	
-	MENU_CHOICE_BUTTON(1, button_1, "@MENU_CHANGE_MAP_CAPS", open "settings_map", "@NULL_EMPTY")
+	MENU_CHOICE_BUTTON_VIS(1, button_1, "@MENU_LOADING_MAPS", "", "@NULL_EMPTY", when(dvarint("g_loadingInitialZones") != 0))
+	MENU_CHOICE_BUTTON_VIS(1, button_1, "@MENU_CHANGE_MAP_CAPS", open "settings_map", "@NULL_EMPTY", when(dvarint("g_loadingInitialZones") == 0))
 	MENU_CHOICE_BUTTON(2, button_2, "@MENU_CHANGE_GAME_MODE_CAPS", open "settings_gametype", "@NULL_EMPTY")
 	MENU_CHOICE_BUTTON_VIS(3, button_3, "@MENU_CHANGE_GAME_RULES_CAPS", ACTION_RULES, "@NULL_EMPTY", when(dvarString(ui_gametype) != "arena" && dvarString(ui_gametype) != "oneflag"))
 	MENU_CHOICE_DBUTTON_VIS(3, button_3, "@MENU_CHANGE_GAME_RULES_CAPS", "@NULL_EMPTY", when(dvarString(ui_gametype) == "arena" || dvarString(ui_gametype) == "oneflag"))

iw4x/iw4x_00/ui_mp/main.inc

@@ -472,3 +472,312 @@
 		dvar										"party_statusString" \
 		visible										when (inLobby()) \
 	}
+
+#ifndef CHOICE_SIZE_X
+#define CHOICE_SIZE_X 280
+#endif
+
+#ifndef CHOICE_SIZE_Y
+#define CHOICE_SIZE_Y 20
+#endif
+
+#ifndef CHOICE_GROUP
+#define CHOICE_GROUP ""
+#endif
+
+#ifndef CHOICE_TEXTSIZE
+#define CHOICE_TEXTSIZE TEXTSIZE_SMALL
+#endif
+
+#ifndef CHOICE_TEXTFONT
+#define CHOICE_TEXTFONT 3
+#endif
+
+#ifndef CHOICE_TEXTCOLOR
+#define CHOICE_TEXTCOLOR  1 1 1 1
+#endif
+
+#ifndef CHOICE_TEXTSTYLE
+#define CHOICE_TEXTSTYLE 0
+#endif
+
+#ifndef CHOICE_STYLE
+#define CHOICE_STYLE 1
+#endif
+
+#ifndef CHOICE_TEXTALIGN
+#define	CHOICE_TEXTALIGN ITEM_ALIGN_TOP_RIGHT
+#endif
+
+#ifndef CHOICE_TEXT_OFFSET_X
+#define CHOICE_TEXT_OFFSET_X -4
+#endif
+
+#ifndef CHOICE_TEXT_OFFSET_Y
+#define CHOICE_TEXT_OFFSET_Y 0
+#endif
+
+#ifndef CHOICE_TEXTCOLOR_DISABLED
+#define CHOICE_TEXTCOLOR_DISABLED 1 1 1 0.5
+#endif
+
+#ifndef CHOICE_BACKCOLOR
+#define CHOICE_BACKCOLOR 0 0 0 1
+#endif
+
+#ifndef CHOICE_TEXTCOLOR_CAPT
+#define CHOICE_TEXTCOLOR_CAPT CHOICE_TEXTCOLOR
+#endif
+
+#ifndef CHOICE_X_START
+#define CHOICE_X_START -64
+#endif
+
+#ifndef CHOICE_X_SPACING
+#define CHOICE_X_SPACING 250
+#endif
+
+#ifndef CHOICE_Y_START
+#define CHOICE_Y_START 82
+#endif
+
+#ifndef CHOICE_Y_SPACING
+#define CHOICE_Y_SPACING 20
+#endif
+
+#ifndef CHOICE_Y_COUNT
+#define CHOICE_Y_COUNT 20
+#endif
+
+#ifndef CHOICE_HORIZONTAL_ALIGN
+#define CHOICE_HORIZONTAL_ALIGN HORIZONTAL_ALIGN_LEFT
+#endif
+
+#ifndef CHOICE_VERTICAL_ALIGN
+#define CHOICE_VERTICAL_ALIGN VERTICAL_ALIGN_TOP
+#endif
+
+#ifndef CHOICE_FOCUS_SOUND
+#define CHOICE_FOCUS_SOUND "mouse_over"
+#endif
+
+#ifndef CHOICE_SEP_OFFSET_X
+#define CHOICE_SEP_OFFSET_X 64
+#endif
+
+#ifndef CHOICE_SEP_OFFSET_Y
+#define CHOICE_SEP_OFFSET_Y 0
+#endif
+
+#ifndef CHOICE_SEP_WIDTH
+#define CHOICE_SEP_WIDTH 216
+#endif
+
+#ifndef CHOICE_SEP_SPACING
+#define CHOICE_SEP_SPACING 0
+#endif
+
+#ifndef CHOICE_SEP_BACKGROUND
+#define	CHOICE_SEP_BACKGROUND "line_horizontal"
+#endif
+
+#ifndef HIGHTLIGHT_BACKCOLOR
+#define HIGHTLIGHT_BACKCOLOR CHOICE_BACKCOLOR
+#endif
+
+#ifndef CHOICE_SEP_COLOR
+#define CHOICE_SEP_COLOR 1 1 1 0.65
+#endif
+
+#ifndef NEW_X_OFFSET
+#define NEW_X_OFFSET 0
+#endif
+
+#ifndef NEW_Y_OFFSET
+#define NEW_Y_OFFSET 0
+#endif
+
+#ifndef NEWSTICKER_SPEED
+#define NEWSTICKER_SPEED 20
+#endif
+
+#ifndef CHOICE_HIGHLIGHT
+#define CHOICE_HIGHLIGHT "menu_button_selection_bar"
+#endif
+		
+#ifndef CHOICE_DVAR_TEXTALIGN
+#define CHOICE_DVAR_TEXTALIGN 8
+#endif
+
+#ifndef CHOICE_DVAR_OFFSET_X
+#define CHOICE_DVAR_OFFSET_X 225
+#endif
+
+#ifndef CHOICE_DVAR_OFFSET_Y
+#define CHOICE_DVAR_OFFSET_Y 0
+#endif
+
+#ifndef CHOICE_GETFOCUSEDITEMY
+#define CHOICE_GETFOCUSEDITEMY setLocalVarFloat "ui_popupYPos" ( getfocuseditemy( ) );
+#endif
+
+#ifndef CHOICE_UI_BUTTON
+#define	CHOICE_UI_BUTTON "ui_menuAButton"
+#endif
+
+#if !defined( CHOICE_SEP_1 ) || !defined( CHOICE_SEP_SPACING )
+#define CHOICE_SEP_TOTAL_SPACING( itemIndex )	0
+
+#elif !defined( CHOICE_SEP_2 )
+#define CHOICE_SEP_TOTAL_SPACING( itemIndex )	( ( itemIndex <= CHOICE_SEP_1 ) ? 0 : CHOICE_SEP_SPACING )
+
+#elif !defined( CHOICE_SEP_3 )
+#define CHOICE_SEP_TOTAL_SPACING( itemIndex )	( ( itemIndex <= CHOICE_SEP_1 ) ? 0 : ( ( itemIndex <= CHOICE_SEP_2 ) ? CHOICE_SEP_SPACING : CHOICE_SEP_SPACING * 2 ) )
+
+#else
+#define CHOICE_SEP_TOTAL_SPACING( itemIndex )	( ( itemIndex <= CHOICE_SEP_1 ) ? 0 : ( ( itemIndex <= CHOICE_SEP_2 ) ? CHOICE_SEP_SPACING : ( ( itemIndex <= CHOICE_SEP_3 ) ? CHOICE_SEP_SPACING * 2 : CHOICE_SEP_SPACING * 3 ) ) )
+#endif
+
+#define CHOICE_ROW( itemIndex )		( ( itemIndex - 0 ) % CHOICE_Y_COUNT )
+#define CHOICE_COL( itemIndex )		( ( itemIndex - 0 - ( ( itemIndex - 0 ) % CHOICE_Y_COUNT ) ) / CHOICE_Y_COUNT )
+
+#define CHOICE_X( itemIndex ) 		( CHOICE_X_START + CHOICE_X_SPACING * CHOICE_COL( itemIndex ) )
+
+#define CHOICE_SHADER( itemIndex, nameArg ) \
+		itemDef \
+		{ \
+			forecolor 0 0 0 1 \
+			style 3 \
+			rect CHOICE_ORIGIN( itemIndex ) 336 20 CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN \
+			background CHOICE_HIGHLIGHT \
+			visible when ( getfocuseditemname() == nameArg ) \
+			decoration \
+		}
+		
+
+#define CHOICE_SCRIPTS_ALL( itemIndex, nameArg, actionArg, onFocusArg, leaveFocusArg ) \
+		onFocus \
+		{  \
+			onFocusArg \
+			play CHOICE_FOCUS_SOUND; \
+			setLocalVarInt "ui_menuAButton" ( itemIndex ); \
+			setLocalVarString "ui_choicegroup" ( CHOICE_GROUP ); \
+		} \
+		leaveFocus \
+		{ \
+			leaveFocusArg \
+			setItemColor nameArg backcolor 0 0 0 0; \
+			setLocalVarInt "ui_menuAButton" ( 0 ); \
+		} \
+		action \
+		{ \
+			play "mouse_click"; \
+			actionArg \
+		}
+		
+#define CHOICE_BUTTON( itemIndex, nameArg, textArg, actionArg ) \
+		CHOICE_BUTTON_VIS( itemIndex, nameArg, textArg, actionArg, 1 )
+
+#define CHOICE_BUTTON_NOHI( itemIndex, nameArg, textArg, actionArg ) \
+		CHOICE_BUTTON_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, 1 )
+
+#define CHOICE_BUTTON_VIS( itemIndex, nameArg, textArg, actionArg, visArg ) \
+		CHOICE_BUTTON_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, visArg )
+
+#define CHOICE_BUTTON_VIS_ADV( itemIndex, nameArg, textArg, actionArg, visArg, vis ) \
+		CHOICE_BUTTON_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, visArg )
+	
+#define CHOICE_BUTTON_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, visArg ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, ;, ;, visArg )
+
+#define CHOICE_BUTTON_FOCUS( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg ) \
+		CHOICE_BUTTON_FOCUS_VIS( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, 1 )
+
+#define CHOICE_BUTTON_FOCUS_NOHI( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, 1 )
+
+#define CHOICE_BUTTON_FOCUS_VIS( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg )
+
+#define CHOICE_BUTTON_FOCUS_VIS_ADV( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg, vis ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg )
+
+#define CHOICE_BUTTON_FOCUS_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS_EX( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg, ; )
+
+#define CHOICE_BUTTON_EX( itemIndex, nameArg, textArg, actionArg, extraArgs ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS_EX( itemIndex, nameArg, textArg, actionArg, ;, ;, 1, extraArgs )
+
+#define CHOICE_BUTTON_EX_VIS( itemIndex, nameArg, textArg, actionArg, visArg, extraArgs ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS_EX( itemIndex, nameArg, textArg, actionArg, ;, ;, visArg, extraArgs )
+
+#define CHOICE_BUTTON_FOCUS_EX( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, extraArgs ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS_EX( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, 1, extraArgs )
+
+#define CHOICE_BUTTON_FOCUS_VIS_EX( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg, extraArgs ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS_EX( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg, extraArgs )
+
+#define CHOICE_BUTTON_FOCUS_VIS_ADV_EX( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg, extraArgs, vis ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS_EX( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg, extraArgs )
+
+#define CHOICE_BUTTON_FOCUS_NOHI_VIS_EX( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg, extraArgs ) \
+		CHOICE_SHADER( itemIndex, nameArg ) \
+		itemDef \
+		{ \
+			name nameArg \
+			rect CHOICE_RECT( itemIndex ) \
+			forecolor CHOICE_TEXTCOLOR \
+			disablecolor CHOICE_TEXTCOLOR_DISABLED \
+			style CHOICE_STYLE \
+			group "mw2_button" \
+			type ITEM_TYPE_BUTTON \
+			textAlign CHOICE_TEXTALIGN \
+			textAlignX CHOICE_TEXT_OFFSET_X \
+			textFont CHOICE_TEXTFONT \
+			textScale CHOICE_TEXTSIZE \
+			textStyle CHOICE_TEXTSTYLE \
+			exp text( textArg ) \
+			visible visArg \
+			extraArgs \
+			CHOICE_SCRIPTS_ALL( itemIndex, nameArg, actionArg, onFocusArg, leaveFocusArg ) \
+		}
+		
+#define CHOICE_BACK( textArg, actionArg ) \
+		CHOICE_BACK_VIS( textArg, actionArg, 1 )
+
+#define CHOICE_BACK_VIS( textArg, actionArg, visArg ) \
+		itemDef \
+		{ \
+			rect -64 -20 336 20 1 3 \
+			visible 1 \
+			group "mw2_button" \
+			style 1 \
+			foreColor CHOICE_TEXTCOLOR \
+			disableColor 0.6 0.55 0.55 1 \
+			background "menu_button_selection_bar" \
+			type 1 \
+			textFont 3 \
+			textAlign 6 \
+			textAlignX -60 \
+			textScale 0.375 \
+			text textArg \
+			visible when ( visArg ) \
+			onFocus \
+			{ \
+				play CHOICE_FOCUS_SOUND; \
+				setItemColor self backcolor 0 0 0 1; \
+				setLocalVarBool "ui_menuAButton" ( 1 ); \
+			} \
+			leaveFocus \
+			{ \
+				setItemColor self backcolor 0 0 0 0; \
+				setLocalVarString "ui_hint_text" ( "@NULL_EMPTY" ); \
+				setLocalVarBool "ui_menuAButton" ( 0 ); \
+			} \
+			action \
+			{ \
+				play "mouse_click"; \
+				escape "self"; \
+				actionArg \
+			} \
+		}

iw4x/iw4x_00/ui_mp/mapmacros.inc

@@ -0,0 +1,55 @@
+#define LOCAL_MAP_ACTION( mapname ) \
+		setdvar ui_mapname mapname; \
+		close "settings_map"; \
+		close "self";
+
+#define LOCAL_MAP_FOCUS( name, desc, icon ) \
+		setLocalVarString "ui_info_name" ( name ); \
+		setLocalVarString "ui_info_desc" ( desc ); \
+		setLocalVarString "ui_info_icon" ( icon );
+
+#define LOCAL_MAP_NAME( name ) \
+		"@" + name 
+
+#define LOCAL_XDLC_FOCUS \
+		setLocalVarString "ui_info_name" ( "PATCH_DLC_MAPS" ); \
+		setLocalVarString "ui_info_desc" ( "PATCH_DLC_MAPS_DESC" ); \
+		setLocalVarString "ui_info_icon" ( "loadscreen_mp_bonusmaps" );
+
+#define LOCAL_MAP_SELECTION_RECT(i) 220 ( 30 + ( i * 20 ) ) 148 18 1 1
+
+#define LOCAL_MAP_SELECTION(itemIndex, mapname, name, desc, icon, visArg) \
+		itemDef \
+		{ \
+			rect LOCAL_MAP_SELECTION_RECT(itemIndex) \
+			forecolor 1 1 1 1 \
+			style WINDOW_STYLE_FILLED \
+			background "menu_rules_selection_bar" \
+			group "mw2_button" \
+			type ITEM_TYPE_BUTTON \
+			textAlign ITEM_ALIGN_TOP_RIGHT \
+			textAlignX -34 \
+			textAlignY -1 \
+			textScale CHOICE_TEXTSIZE \
+			textFont CHOICE_TEXTFONT \
+			exp text ( LOCAL_MAP_NAME( name ) ) \
+			visible when (visArg) \
+			onFocus \
+			{ \
+				play "mouse_over"; \
+				setItemColor self backColor 0 0 0 1; \
+				setLocalVarBool "ui_menuAButton" ( 1 ); \
+				setLocalVarFloat "ui_popupYPos" ( 0 ); \
+				LOCAL_MAP_FOCUS( name, desc, icon ) \
+			} \
+			leaveFocus \
+			{ \
+				setItemColor self backColor 0 0 0 0; \
+				setLocalVarBool "ui_menuAButton" ( 0 ); \
+			} \
+			action \
+			{ \
+				play "mouse_click"; \
+				LOCAL_MAP_ACTION( mapname ) \
+			} \
+		}

iw4x/iw4x_00/ui_mp/playerdataread.menu

@@ -43,8 +43,6 @@
 			setDvar	"ui_checkclass" 14;
 			open "resetclass";
 
-			exec "checkClasses";
-
 			setLocalVarInt "classIndex" ( localvarint( "oldClassIndex" ) );
 			if ( !isitemunlocked( getplayerdata( "killstreaks" , 0 ) ) && getplayerdata( "killstreaks" , 0 ) != "none" )
 			{

iw4x/iw4x_00/ui_mp/scriptmenus/class.menu

@@ -561,7 +561,6 @@
 			{
 				play "mouse_click";
 				close self;
-				open "muteplayer";
 				uiScript "CreateCurrentServerFavorite";
 			}
 			onFocus

iw4x/iw4x_00/ui_mp/settings_map.menu

@@ -1,3 +1,7 @@
+#define CHOICE_Y( itemIndex ) 		( CHOICE_Y_START + CHOICE_Y_SPACING * CHOICE_ROW( itemIndex ) + CHOICE_SEP_TOTAL_SPACING( itemIndex ) )
+#define CHOICE_ORIGIN( itemIndex )	CHOICE_X( itemIndex ) CHOICE_Y( itemIndex )
+#define CHOICE_RECT( itemIndex )	CHOICE_ORIGIN( itemIndex ) CHOICE_SIZE_X CHOICE_SIZE_Y CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN
+
 #include "ui/menudef.h"
 #include "ui_mp/main.inc"
 
@@ -8,117 +12,348 @@
 #undef CHOICE_GROUP
 #define CHOICE_GROUP MENU_NAME
 
-#undef MENU_BACKGROUND_PANEL_RIGHT
-#define MENU_BACKGROUND_PANEL_RIGHT \
-	itemDef \
-	{ \
-		rect										(0 - MENU_BACKGROUND_PANEL_RIGHT_WIDTH) 28 MENU_BACKGROUND_PANEL_RIGHT_WIDTH MENU_BACKGROUND_PANEL_RIGHT_HEIGHT HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP \
-		style										WINDOW_STYLE_SHADER \
-		foreColor									0 0 0 0.7 \
-		background									"black" \
-		decoration									\
-		textScale									0.55 \
-		visible										1 \
-	} \
-	itemDef \
-	{ \
-		name										"image" \
-		rect										(0 - (MENU_BACKGROUND_PANEL_RIGHT_WIDTH - 10)) 50 (MENU_BACKGROUND_PANEL_RIGHT_WIDTH - 20) 127 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP \
-		style										WINDOW_STYLE_SHADER \
-		foreColor									1 1 1 1 \
-		decoration									\
-		textScale									0.55 \
-		visible										1 \
-		exp											material ("preview_" + dvarString("ui_map_name")) \
-	} \
-	itemDef \
-	{ \
-		name										"longname" \
-		rect										(0 - (MENU_BACKGROUND_PANEL_RIGHT_WIDTH - 10)) 28 (MENU_BACKGROUND_PANEL_RIGHT_WIDTH - 20) 22 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP \
-		foreColor									CHOICE_TEXTCOLOR \
-		decoration									\
-		textAlign									ITEM_ALIGN_TOP_LEFT \
-		textScale									CHOICE_TEXTSIZE \
-		textFont									9 \
-		visible										1 \
-		exp											text (dvarString("ui_map_long")) \
-	} \
-	itemDef \
-	{ \
-		name										"description" \
-		rect										(0 - (MENU_BACKGROUND_PANEL_RIGHT_WIDTH - 10)) 180 (MENU_BACKGROUND_PANEL_RIGHT_WIDTH - 20) 20 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP \
-		foreColor									1 1 1 0.65 \
-		decoration									\
-		autoWrapped									\
-		textAlign									ITEM_ALIGN_TOP_LEFT \
-		textScale									CHOICE_TEXTSIZE \
-		textFont									UI_FONT_SMALL \
-		visible										1 \
-		exp											text (dvarString("ui_map_desc")) \
-	}
-
-#define ON_MENU_OPEN \
-	focusFirst;										\
-	uiScript										"ApplyInitialMap";
-
-#define ON_MENU_CLOSE \
-	execNow											"xupdatepartystate";
-
-#define ON_MENU_ESC \
-	close											self;
-
-menuDef
 {
+	menuDef
+	{
 		name MENU_NAME
 		fullscreen 1
 		rect 0 0 640 480
-	foreColor										CHOICE_TEXTCOLOR
+		foreColor 1 1 1 1
-	focusColor										CHOICE_TEXTCOLOR
+		focusColor 1 1 1 1
 		soundLoop MENU_MUSIC
 		fadeCycle 1
 		fadeClamp 1
 		fadeAmount 0.1
+		onOpen
+		{
+			focusFirst;
+			uiScript "ApplyInitialMap";
 
-	MENU_ON_OPEN(ON_MENU_OPEN)
+		}
-	MENU_ON_CLOSE(ON_MENU_CLOSE)
+		onClose
-	MENU_ON_ESC(ON_MENU_ESC)
+		{
+			execNow "xupdatepartystate";
+		}
+		onESC
+		{
+			close "self";
+		}
 
 		#define DISABLE_SIDEBAR
 		#include "ui_mp/bg.inc"
 
-	MENU_ITEM_TITLE(10)
 		MENU_BACKGROUND_FRAME
-	MENU_BACKGROUND_PANEL_RIGHT
 
 		itemDef
 		{
-		name										"maplist"
+			rect 0 0 272 28 1 1
-		rect										62 28 210 356 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
+			decoration
-		style										WINDOW_STYLE_FILLED
-		foreColor									CHOICE_TEXTCOLOR
-		outLineColor								0 0 0 0.6
-		type										ITEM_TYPE_LISTBOX
-		textFont									UI_FONT_NORMAL
-		textAlignX									6
-		textScale									CHOICE_TEXTSIZE
 			visible 1
-		feeder										60
+			forecolor 1 1 1 1
-		selectBorder								0.8 0.95 1 0
+			textfont 9
-		elementWidth								120
+			textalign 6
-		elementHeight								22
+			textalignx -60
-//		numcols			xpos		xwidth		textlen		alignment
+			textscale 0.5
-		columns 1		8			120			25			0
+			text "@MENU_CHOOSE_MAP_CAP"
-		doubleClick
-		{
-			uiScript								"ApplyMap";
-			close									self;
 		}
-		execkeyint 13
+		
+		#include "ui_mp/mapmacros.inc"
+
+		#undef CHOICE_Y_START
+		#define CHOICE_Y_START 28
+
+		#undef CHOICE_TEXTALIGN
+		#define CHOICE_TEXTALIGN ITEM_ALIGN_TOP_LEFT
+
+		#undef CHOICE_TEXT_OFFSET_X
+		#define CHOICE_TEXT_OFFSET_X 124
+
+		CHOICE_BACK( "@PLATFORM_BACK_CAPS", close "self"; )
+
+		#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(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)
+		CHOICE_BUTTON_FOCUS(4, "dlc_list_5", "@PATCH_COD4_DLC", setdvar "iw4x_maps_dlc" 4;, LOCAL_MAP_FOCUS( "PATCH_COD4_DLC", "PATCH_DESC_COD4_DLC", "preview_cod4_dlc" ), 1)
+		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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(7, 	"mp_shipment",			"MPUI_SHIPMENT",		"MPUI_DESC_MAP_SHIPMENT",		"preview_mp_shipment",			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_rust_long",			"MPUI_RUST_LONG",		"MPUI_DESC_MAP_RUST_LONG",		"preview_mp_rust_long",			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_bloc", 				"MPUI_BLOC",			"MPUI_DESC_MAP_BLOC",			"preview_mp_bloc",				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_estate_tropical",	"MPUI_ESTATE_TROPICAL",	"MPUI_DESC_MAP_ESTATE_TROPICAL","preview_mp_estate_tropical",	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(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(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(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(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(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(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(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(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(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)
+
+		itemDef 
 		{
+			name "select_custom_map"
+			rect 250 -20 96 20 1 3 
+			visible 1 
+			group "mw2_button" 
+			style 1 
+			foreColor 1 1 1 1 
+			disableColor 0.6 0.55 0.55 1 
+			background "black" 
+			type 1 
+			textFont 3 
+			textAlign 6 
+			textAlignX -60 
+			textScale 0.375 
+			text "@MPUI_DONE_SELECTING" 
+			visible when ( dvarint("iw4x_maps_dlc") == 99 ) 
+			onFocus 
+			{
+				play CHOICE_FOCUS_SOUND;
+				setItemColor self backcolor 0 0 0 1;
+				setLocalVarBool "ui_menuAButton" ( 1 );
+			}
+			leaveFocus 
+			{
+				setItemColor self backcolor 0 0 0 0;
+				setLocalVarString "ui_hint_text" ( "@NULL_EMPTY" );
+				setLocalVarBool "ui_menuAButton" ( 0 );
+			}
+			action
+			{
+				play "mouse_click";
+				escape "self";
 				uiScript "ApplyMap";
-			close									self;
+				close "settings_map";
+				close "self";
 			}
 		}
 
-	ITEM_BUTTON_BACK(close self;)
+		itemDef
+		{
+			name "maplist_hd"
+			rect -478 28 185 356 3 1
+			visible 1
+			style 1
+			border 1
+			bordersize 1
+			forecolor 1 1 1 1
+			backcolor 0 0 0 0.7
+			bordercolor 1 1 1 0.15
+			outlinecolor 1 1 1 0.2
+			type ITEM_TYPE_LISTBOX
+			textfont 1
+			textalignx 6
+			textscale 0.4
+			feeder 60
+			elementtype LISTBOX_TEXT
+			elementWidth 120
+			elementHeight 22
+			visible when ( dvarbool( "widescreen" ) && dvarint("iw4x_maps_dlc") == 99 )
+			onFocus
+			{
+				play "mouse_over";
+				setItemColor "maplist" bordercolor 1 1 1 "1";
+				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
+			style 3
+			foreColor 0 0 0 0.7
+			background "black"
+			decoration 
+			textScale 0.55
+			visible when ( dvarbool( "widescreen" ) )
+		}
+
+		itemDef
+		{
+			name "mapimage"
+			rect -282 50 272 153 3 1
+			style 3
+			foreColor 1 1 1 1
+			decoration 
+			textScale 0.55
+			exp material ( localvarstring( "ui_info_icon" ) )
+			visible when ( localvarstring( "ui_info_icon") != "" && dvarbool( "widescreen" ) && dvarint("iw4x_maps_dlc") != 99 )
+		}
+
+		itemDef
+		{
+			name "longname"
+			rect -282 28 272 22 3 1
+			foreColor 1 1 1 1
+			decoration 
+			textAlign 4
+			textScale 0.375
+			textFont 9
+			exp text ( "@" + localvarstring( "ui_info_name" ) )
+			visible when ( dvarbool( "widescreen" ) )
+		}
+
+		itemDef
+		{
+			name "description"
+			rect -282 203 272 20 3 1
+			foreColor 1 1 1 0.65
+			decoration 
+			autoWrapped 
+			textAlign 4
+			textScale 0.375
+			textFont 3
+			exp text ( "@" + localvarstring( "ui_info_desc" ) )
+			visible when ( dvarbool( "widescreen" ) )
+		}
+
+		// temporary lazy fix for non 16:9
+
+		itemDef
+		{
+			name "maplist_sd"
+			rect -292 28 120 356 3 1
+			visible 1
+			style 1
+			border 1
+			bordersize 1
+			forecolor 1 1 1 1
+			backcolor 0 0 0 0.7
+			bordercolor 1 1 1 0.15
+			outlinecolor 1 1 1 0.2
+			type ITEM_TYPE_LISTBOX
+			textfont 1
+			textalignx 6
+			textscale 0.4
+			feeder 60
+			elementtype LISTBOX_TEXT
+			elementWidth 120
+			elementHeight 22
+			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" )
+			}
+			leaveFocus
+			{
+				setItemColor "maplist" bordercolor 1 1 1 "0.15";
+			}
+		}
+
+		itemDef
+		{
+			rect -172 28 210 356 3 1
+			style 3
+			foreColor 0 0 0 0.7
+			background "black"
+			decoration 
+			textScale 0.55
+			visible when ( !dvarbool( "widescreen" ) )
+		}
+
+		itemDef
+		{
+			name "mapimage"
+			rect -162 50 190 133 3 1
+			style 3
+			foreColor 1 1 1 1
+			decoration 
+			textScale 0.55
+			exp material ( localvarstring( "ui_info_icon" ) )
+			visible when ( localvarstring( "ui_info_icon") != "" && !dvarbool( "widescreen" ) && dvarint("iw4x_maps_dlc") != 99 )
+		}
+
+		itemDef
+		{
+			name "longname"
+			rect -162 28 200 22 3 1
+			foreColor 1 1 1 1
+			decoration 
+			textAlign 4
+			textScale 0.375
+			textFont 9
+			visible 1
+			exp text ( "@" + localvarstring( "ui_info_name" ) )
+			visible when ( !dvarbool( "widescreen" ) )
+		}
+
+		itemDef
+		{
+			name "description"
+			rect -162 186 200 20 3 1
+			foreColor 1 1 1 0.65
+			decoration 
+			autoWrapped 
+			textAlign 4
+			textScale 0.375
+			textFont 3
+			visible 1
+			exp text ( "@" + localvarstring( "ui_info_desc" ) )
+			visible when ( !dvarbool("widescreen") )
+		}
+	}
 }

iw4x/iw4x_00/vision/mp_bloc.vision

@@ -1,16 +1,4 @@
 r_glow                    "1"
-//r_glowRadius0             "0.5"
-//r_glowBloomCutoff         "0.68"
-//r_glowBloomDesaturation   "0"
-//r_glowBloomIntensity0     "0.45"
- 
-//r_filmEnable				"1"
-//r_filmContrast				"0.82104"
-//r_filmBrightness			"0"
-//r_filmDesaturation			"0.352396"
-//r_filmInvert				"0"
-//r_filmLightTint				"1.10838 1.10717 1.15409"
-//r_filmDarkTint				"0.6 0.858125 0.9"
 
 r_glowRadius0             "0.5"
 r_glowBloomCutoff         "0.66"