Merge branch 'develop' of github.com:iw4x/iw4x-rawfiles into develop

Add support for auto updater

iw4x/html/script.js

@@ -101,6 +101,6 @@ $(document).ready(function()
 
     $("#footer").click(function()
     {
-        location.replace("https://xlabs.dev");
+        location.replace("https://alterware.dev/");
     });
 });

iw4x/iw4x_00/maps/createart/mp_shipment_art.gsc

@@ -1,17 +0,0 @@
-// _createart generated.  modify at your own risk. Changing values should be fine.
-main()
-{
-
-	level.tweakfile = true;
- 
-
-	//* Fog section * 
-
-	setdvar( "scr_fog_disable", "0" );
-
-	//setExpFog( 500, 2842, 0.642709, 0.626383, 0.5, 3.0, 0 );
-	//setExpFog( start distance, halfway distance, red, green, blue, max opacity, transition time,
-	setExpFog( 750, 2842, 0.642709, 0.666383, 0.5, 0.02, 100 );
-	VisionSetNaked( "mp_shipment", 0 );
-
-}

iw4x/iw4x_00/maps/createfx/mp_shipment_fx.gsc

@@ -1,125 +0,0 @@
-//_createfx generated. Do not touch!!
-#include common_scripts\utility;
-#include common_scripts\_createfx;
-main()
-{
-	// CreateFX entities placed: 121
-	ent = createLoopSound();
-	ent.v[ "origin" ] = ( 1026.31, 690.984, 325.106 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "soundalias" ] = "emt_tree_leaf_rustle";
-
-	ent = createLoopSound();
-	ent.v[ "origin" ] = ( -74.0565, -1064.84, 395.295 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "soundalias" ] = "emt_tree_leaf_rustle";
-
-	ent = createLoopSound();
-	ent.v[ "origin" ] = ( 672.98, 116.825, 298.125 );
-	ent.v[ "angles" ] = ( 0, 0, 0 );
-	ent.v[ "soundalias" ] = "emt_ac_metal_rattle";
-
-	ent = createLoopSound();
-	ent.v[ "origin" ] = ( -15.6846, -531.97, 298.125 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "soundalias" ] = "emt_ac_metal_rattle";
-
-	ent = createLoopSound();
-	ent.v[ "origin" ] = ( -609.761, 98.299, 298.125 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "soundalias" ] = "emt_ac_metal_rattle";
-
-	ent = createLoopSound();
-	ent.v[ "origin" ] = ( 17.674, 657.888, 298.125 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "soundalias" ] = "emt_ac_metal_rattle";
-
-	ent = createLoopSound();
-	ent.v[ "origin" ] = ( 139.752, 127.875, 358.052 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "soundalias" ] = "emt_ac_metal_rattle";
-
-	ent = createLoopSound();
-	ent.v[ "origin" ] = ( 482.075, 1591.5, 523.125 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "soundalias" ] = "emt_ship_chain_sway";
-
-	ent = createLoopSound();
-	ent.v[ "origin" ] = ( -774.494, -632.406, 332.547 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "soundalias" ] = "emt_wind_treeA_lp";
-
-	ent = createLoopSound();
-	ent.v[ "origin" ] = ( 63.875, 128.89, 392.724 );
-	ent.v[ "angles" ] = ( 0, 0, 0 );
-	ent.v[ "soundalias" ] = "emt_wind_flat_surface";
-
-	ent = createLoopSound();
-	ent.v[ "origin" ] = ( 780.594, -763.875, 304.545 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "soundalias" ] = "emt_wind_treeB_lp";
-
-	ent = createLoopSound();
-	ent.v[ "origin" ] = ( 1190.88, -235.615, 325 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "soundalias" ] = "emt_wind_flat_surface";
-
-	ent = createLoopSound();
-	ent.v[ "origin" ] = ( 738.938, 770.663, 307.269 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "soundalias" ] = "emt_wind_treeA_lp";
-
-	ent = createLoopSound();
-	ent.v[ "origin" ] = ( -406.884, -387.643, 212.276 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "soundalias" ] = "emt_tree_leaf_rustle";
-	
-	ent = createOneshotEffect( "mist_hunted_fav" );
-	ent.v[ "origin" ] = ( 529.182, 402.978, 194 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "mist_hunted_fav";
-	ent.v[ "delay" ] = -15;
-
-	ent = createOneshotEffect( "mist_hunted_fav" );
-	ent.v[ "origin" ] = ( 293.407, -404.612, 194 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "mist_hunted_fav";
-	ent.v[ "delay" ] = -15;
-
-	ent = createOneshotEffect( "mist_hunted_fav" );
-	ent.v[ "origin" ] = ( -494.269, -404.613, 208.65 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "mist_hunted_fav";
-	ent.v[ "delay" ] = -15;
-
-	ent = createOneshotEffect( "mist_hunted_fav" );
-	ent.v[ "origin" ] = ( -437.342, 44.2978, 194 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "mist_hunted_fav";
-	ent.v[ "delay" ] = -15;
-
-	ent = createOneshotEffect( "mist_hunted_fav" );
-	ent.v[ "origin" ] = ( -8.40515, 48.6187, 194 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "mist_hunted_fav";
-	ent.v[ "delay" ] = -15;
-
-	ent = createOneshotEffect( "mist_hunted_fav" );
-	ent.v[ "origin" ] = ( -18.4671, 850.419, 199.613 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "mist_hunted_fav";
-	ent.v[ "delay" ] = -15;
-
-	ent = createOneshotEffect( "mist_hunted_fav" );
-	ent.v[ "origin" ] = ( -610.763, 847.477, 197.121 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "mist_hunted_fav";
-	ent.v[ "delay" ] = -15;
-
-	ent = createOneshotEffect( "mist_hunted_fav" );
-	ent.v[ "origin" ] = ( 657.552, -492.835, 195.54 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "mist_hunted_fav";
-	ent.v[ "delay" ] = -15;
-
-}

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

@@ -33,11 +33,14 @@ getLosingPlayers()
 }
 
 
-givePlayerScore( event, player, victim, overridePointsPopup )
+givePlayerScore( event, player, victim, overrideCheckPlayerScoreLimitSoon, overridePointsPopup )
 {
 	if ( isDefined( level.nukeIncoming ) )
 		return;
 	
+	if ( !isDefined( overrideCheckPlayerScoreLimitSoon ) )
+		overrideCheckPlayerScoreLimitSoon = false;
+		
 	if ( !isDefined( overridePointsPopup ) )
 		overridePointsPopup = false;	
 	
@@ -58,7 +61,11 @@ givePlayerScore( event, player, victim, overridePointsPopup )
 	if ( !level.teambased )
 		thread sendUpdatedDMScores();
 	
+	//	player score and team score aren't always the same values towards winning the match
+	//	checkScoreLimit() checks team score correctly, checkPlayerScoreLimitSoon() uses player score
+	if ( !overrideCheckPlayerScoreLimitSoon )
 		player maps\mp\gametypes\_gamelogic::checkPlayerScoreLimitSoon();
+		
 	scoreEndedMatch = player maps\mp\gametypes\_gamelogic::checkScoreLimit();
 	
 	if ( scoreEndedMatch && event == "kill" )

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

@@ -32,7 +32,11 @@ init()
 	
 		if ( !level.console )
 		{
+			game["menu_callvote"] = "callvote";
+			game["menu_kickplayer"] = "kickplayer";
 			game["menu_muteplayer"] = "muteplayer";
+			precacheMenu(game["menu_callvote"]);
+			precacheMenu(game["menu_kickplayer"]);
 			precacheMenu(game["menu_muteplayer"]);			
 		}
 		else

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

@@ -389,8 +389,15 @@ balanceTeams()
 setGhillieModels( env )
 {
 	level.environment = env;
+
 	switch ( env )
 	{
+		default:
+		case "iw3":
+			game["allies_model"]["GHILLIE"] = game["allies_model"]["SNIPER"];
+			game["axis_model"]["GHILLIE"] = game["axis_model"]["SNIPER"];
+			break;
+	
 		case "desert":
 			mptype\mptype_ally_ghillie_desert::precache();
 			mptype\mptype_opforce_ghillie_desert::precache();
@@ -415,8 +422,6 @@ setGhillieModels( env )
 			game["allies_model"]["GHILLIE"] = mptype\mptype_ally_ghillie_forest::main;
 			game["axis_model"]["GHILLIE"] = mptype\mptype_opforce_ghillie_forest::main;
 			break;
-		default:
-			break;			
 	}
 }
 
@@ -597,8 +602,8 @@ setTeamModels( team, charSet )
 			game[team + "_model"]["SNIPER"] = mptype\mptype_axis_sniper::main;
 			game[team + "_model"]["LMG"] = mptype\mptype_axis_support::main;
 			game[team + "_model"]["ASSAULT"] = mptype\mptype_axis_rifleman::main;
-			game[team + "_model"]["SHOTGUN"] = mptype\mptype_axis_cqb::main;
-			game[team + "_model"]["SMG"] = mptype\mptype_axis_engineer::main;
+			game[team + "_model"]["SHOTGUN"] = mptype\mptype_axis_engineer::main;
+			game[team + "_model"]["SMG"] = mptype\mptype_axis_cqb::main;
 			game[team + "_model"]["RIOT"] = mptype\mptype_opforce_comp_riot::main;
 
 			break; 
@@ -615,8 +620,8 @@ setTeamModels( team, charSet )
 			game[team + "_model"]["SNIPER"] = mptype\mptype_ally_urban_sniper::main;
 			game[team + "_model"]["LMG"] = mptype\mptype_ally_urban_support::main;
 			game[team + "_model"]["ASSAULT"] = mptype\mptype_ally_urban_assault::main;
-			game[team + "_model"]["SHOTGUN"] = mptype\mptype_ally_urban_specops::main;
-			game[team + "_model"]["SMG"] = mptype\mptype_ally_urban_recon::main;
+			game[team + "_model"]["SHOTGUN"] = mptype\mptype_ally_urban_recon::main;
+			game[team + "_model"]["SMG"] = mptype\mptype_ally_urban_specops::main;
 			game[team + "_model"]["RIOT"] = mptype\mptype_seal_udt_riot::main;
 
 			break; 
@@ -633,8 +638,8 @@ setTeamModels( team, charSet )
 			game[team + "_model"]["SNIPER"] = mptype\mptype_ally_woodland_sniper::main;
 			game[team + "_model"]["LMG"] = mptype\mptype_ally_woodland_support::main;
 			game[team + "_model"]["ASSAULT"] = mptype\mptype_ally_woodland_assault::main;
-			game[team + "_model"]["SHOTGUN"] = mptype\mptype_ally_woodland_specops::main;
-			game[team + "_model"]["SMG"] = mptype\mptype_ally_woodland_recon::main;
+			game[team + "_model"]["SHOTGUN"] = mptype\mptype_ally_woodland_recon::main;
+			game[team + "_model"]["SMG"] = mptype\mptype_ally_woodland_specops::main;
 			game[team + "_model"]["RIOT"] = mptype\mptype_tf141_forest_riot::main;
 
 			break; 
@@ -651,8 +656,8 @@ setTeamModels( team, charSet )
 			game[team + "_model"]["SNIPER"] = mptype\mptype_axis_urban_sniper::main;
 			game[team + "_model"]["LMG"] = mptype\mptype_axis_urban_support::main;
 			game[team + "_model"]["ASSAULT"] = mptype\mptype_axis_urban_assault::main;
-			game[team + "_model"]["SHOTGUN"] = mptype\mptype_axis_urban_cqb::main;
-			game[team + "_model"]["SMG"] = mptype\mptype_axis_urban_engineer::main;
+			game[team + "_model"]["SHOTGUN"] = mptype\mptype_axis_urban_engineer::main;
+			game[team + "_model"]["SMG"] = mptype\mptype_axis_urban_cqb::main;
 			game[team + "_model"]["RIOT"] = mptype\mptype_opforce_airborne_riot::main;
 
 			break; 
@@ -669,8 +674,8 @@ setTeamModels( team, charSet )
 			game[team + "_model"]["SNIPER"] = mptype\mptype_axis_woodland_sniper::main;
 			game[team + "_model"]["LMG"] = mptype\mptype_axis_woodland_support::main;
 			game[team + "_model"]["ASSAULT"] = mptype\mptype_axis_woodland_rifleman::main;
-			game[team + "_model"]["SHOTGUN"] = mptype\mptype_axis_woodland_cqb::main;
-			game[team + "_model"]["SMG"] = mptype\mptype_axis_woodland_engineer::main;
+			game[team + "_model"]["SHOTGUN"] = mptype\mptype_axis_woodland_engineer::main;
+			game[team + "_model"]["SMG"] = mptype\mptype_axis_woodland_cqb::main;
 			game[team + "_model"]["RIOT"] = mptype\mptype_opforce_airborne_riot::main;
 
 			break; 
@@ -687,8 +692,8 @@ setTeamModels( team, charSet )
 			game[team + "_model"]["SNIPER"] = mptype\mptype_ally_sniper::main;
 			game[team + "_model"]["LMG"] = mptype\mptype_ally_support::main;
 			game[team + "_model"]["ASSAULT"] = mptype\mptype_ally_rifleman::main;
-			game[team + "_model"]["SHOTGUN"] = mptype\mptype_ally_cqb::main;
-			game[team + "_model"]["SMG"] = mptype\mptype_ally_engineer::main;
+			game[team + "_model"]["SHOTGUN"] = mptype\mptype_ally_engineer::main;
+			game[team + "_model"]["SMG"] = mptype\mptype_ally_cqb::main;
 			game[team + "_model"]["RIOT"] = mptype\mptype_us_army_riot::main;
 
 			break; 

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

@@ -115,7 +115,7 @@ onStartGameType()
 	allowed = [];
 	maps\mp\gametypes\_gameobjects::main(allowed);
 	
-	// Prevent class and team change
+	// Prevent class and team change. TODO: Must be disabled in _menus.gsc as well
 	setDvar( "ui_allow_classchange", 0 );
 	setdvar( "ui_allow_teamchange", 0 );	
 
@@ -189,11 +189,10 @@ waitLoadoutDone()
 	
 	self waittill( "spawned_player" );
 	
-	self _setPerk( "specialty_bling" );
 	self giveNextGun( true );
 }
 
-onPlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration )
+onPlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration, lifeId )
 {
 	if ( sMeansOfDeath == "MOD_FALLING" || ( isDefined( attacker ) && isPlayer( attacker ) ) )
 	{
@@ -382,6 +381,8 @@ refillSingleCountAmmo()
 
 initGunHUD()
 {
+	if ( self isTestClient() ) return;
+
 	self.gun_progressDisplay[0] = self createFontString( "small", 1.6 );	
 	self.gun_progressDisplay[0] setPoint( "TOP LEFT", "TOP LEFT", 115, 5 );
 	self.gun_progressDisplay[0] setText( &"MP_WEAPON" );
@@ -402,11 +403,14 @@ initGunHUD()
 
 updateGunHUD()
 {
+	if ( self isTestClient() ) return;
 	self.gun_progressDisplay[1] setText( (self.gunGameGunIndex+1) + " / " + level.gun_guns.size );
 }
 
 hideInKillCam()
 {
+    if ( self isTestClient() ) return;
+
     self endon( "disconnect" );
     var_0 = 1;
 
@@ -431,6 +435,8 @@ hideInKillCam()
 
 hideOnGameEnd()
 {
+    if ( self isTestClient() ) return;
+
     self endon( "disconnect" );
     level waittill( "game_ended" );
 	

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

@@ -26,6 +26,7 @@ main()
     level.onSpawnPlayer = ::onSpawnPlayer;
     level.getSpawnPoint = ::getSpawnPoint;
     level.onPlayerKilled = ::onPlayerKilled;
+    level.onDeadEvent = ::onDeadEvent;
     level.onTimeLimit = ::onTimeLimit;
 	
 	level.infect_perks = [];
@@ -54,12 +55,13 @@ determineWinningTeam()
 
 onPrecacheGameType()
 {
-    precachestring( &"MP_CONSCRIPTION_STARTS_IN" );
+	precacheString( &"MP_CONSCRIPTION_STARTS_IN" );
 }
 
 onStartGameType()
 {
-    setclientnamemode( "auto_change" );
+	setClientNameMode("auto_change");
+
 	setObjectiveText( "allies", &"OBJECTIVES_INFECT" );
 	setObjectiveText( "axis", &"OBJECTIVES_INFECT" );
 
@@ -103,7 +105,6 @@ onStartGameType()
 	level.infect_choseFirstInfected = false;
 	level.infect_choosingFirstInfected = false;
 	level.infect_awardedFinalSurvivor = false;
-	level.infect_countdownInProgress = false;
 	
 	level.infect_teamScores["axis"] = 0;
 	level.infect_teamScores["allies"] = 0;	
@@ -118,20 +119,15 @@ onPlayerConnect()
     for (;;)
     {
         level waittill( "connected", player );
-		
         player.infect_firstSpawn = true;
-		player.infected_Rejoined = false;
-		player.infect_JoinedAtStart = true;
 
         if ( gameFlag( "prematch_done" ) )
-		{
-			player.infect_JoinedAtStart = false;
-		}
-		//	infected who quit and rejoined same game
-		if( IsDefined( level.infect_players[player.name] ) )
-		{
-			player.infected_Rejoined = true;
-		}
+            player.infect_joinedatstart = false;
+        else
+            player.infect_joinedatstart = true;
+
+        if ( isDefined( level.infect_players[player.name] ) )
+            player.infect_rejoined = true;
     }
 }
 
@@ -148,18 +144,13 @@ getSpawnPoint()
 		self.class = self.pers["class"];
 		self.lastClass = self.pers["lastClass"];
 
-		// survivors are allies
-		teamChoice = "allies";
-		
-		//	everyone starts as survivors, unless an infected quit and rejoined same game
-		if( self.infected_Rejoined )	
-		{
-			teamChoice = "axis";	
-		}
-		
-		self maps\mp\gametypes\_menus::addToTeam( teamChoice, true );	
+        if ( isDefined( self.infect_rejoined ) )
+            maps\mp\gametypes\_menus::addToTeam( "axis", true );
+        else
+            maps\mp\gametypes\_menus::addToTeam( "allies", true );
 
         thread onPlayerDisconnect();
+	
 	}
 		
 	if ( level.inGracePeriod )
@@ -176,12 +167,11 @@ getSpawnPoint()
 	return spawnPoint;	
 }
 
+
 onSpawnPlayer()
 {
-	self.teamChangedThisFrame = undefined;
-	self.infect_spawnPos = self.origin;
-	
-	//	resynch teams
+	self.teamchangedthisframe = undefined;
+    self.infect_spawnpos = self.origin;
 	updateTeamScores();	
 	
 	//	let the first spawned player kick this off
@@ -191,17 +181,16 @@ onSpawnPlayer()
 		level thread chooseFirstInfected();
 	}
 
-	//	infected who quit and rejoined same game?
-	if( self.infected_Rejoined )
+	if ( isDefined( self.infect_rejoined ) )
     {
         self.infect_rejoined = undefined;
 
-		//	stop initial infect countdown (if quit/join player was initial and a new coutdown is underway)
-		if ( !level.infect_allowSuicide ) 
+        if ( !level.infect_allowsuicide )
         {
             level notify( "infect_stopCountdown" );
-			level.infect_choseFirstInfected = true;
-			level.infect_allowSuicide = true;
+            level.infect_choseFirstInfected = 1;
+            level.infect_allowsuicide = 1;
+
             foreach ( player in level.players )
             {
                 if ( isDefined( player.infect_isBeingChosen ) )
@@ -209,16 +198,14 @@ onSpawnPlayer()
             }
         }
 
-		//	if an initial was already chosen while they were gone and they are still initial, set them to normal
         foreach ( player in level.players )
         {
             if ( isDefined( player.isInitialInfected ) )
                 player thread setInitialToNormalInfected();
         }
 
-		//	if they're the only infected, then set them as initial infected
-		if ( level.infect_teamScores["axis"] == 1 )
-			self.isInitialInfected = true;
+        if ( level.infect_teamscores["axis"] == 1 )
+            self.isInitialInfected = 1;
     }
 	
 	//	onSpawnPlayer() is called before giveLoadout()
@@ -228,8 +215,7 @@ onSpawnPlayer()
 	else
 		self.pers["gamemodeLoadout"] = level.infect_loadouts[self.pers["team"]];		
 	
-	self thread onSpawnFinished();
-	
+	thread onSpawnFinished();
 	level notify ( "spawned_player" );
 }
 
@@ -323,32 +309,19 @@ chooseFirstInfected()
     level endon( "game_ended" );
     level endon( "infect_stopCountdown" );
 	
-	level.infect_allowSuicide = false;
+    level.infect_allowsuicide = false;
+	
     gameFlagWait( "prematch_done" );
 	
     level.infect_timerDisplay.label = &"MP_DRAFT_STARTS_IN";
-	level.infect_timerDisplay setTimer( 15 );
+    level.infect_timerDisplay settimer( 8 );
     level.infect_timerDisplay.alpha = 1;
 	
-    maps\mp\gametypes\_hostmigration::waitLongDurationWithHostMigrationPause( 15.0 );
+    maps\mp\gametypes\_hostmigration::waitLongDurationWithHostMigrationPause( 8.0 );
 	
     level.infect_timerDisplay.alpha = 0;
 	
-	possibleInfected = [];
-	
-	foreach( player in level.players )
-	{
-		if ( player.team == "spectator" )
-			continue;
-		
-		if ( !player.hasSpawned )
-			continue;
-				
-		possibleInfected[possibleInfected.size] = player;
-	}
-	
-	firstInfectedPlayer = possibleInfected[ randomInt( possibleInfected.size ) ];
-	firstInfectedPlayer setFirstInfected( true );
+    level.players[randomint( level.players.size )] setFirstInfected( true );
 }
 
 setFirstInfected( wasChosen )
@@ -359,14 +332,14 @@ setFirstInfected( wasChosen )
         self.infect_isBeingChosen = true;
 		
 	//	wait alive
-	while( !isReallyAlive( self ) || self isUsingRemote() )
-		wait( 0.05 );
+    while ( !isReallyAlive( self ) || isUsingRemote() )
+        wait 0.05;
 
 	//	remove placement item if carrying
-	if ( IsDefined( self.isCarrying ) && self.isCarrying == true )
+    if ( isDefined( self.isCarrying ) && self.isCarrying == 1 )
     {
         self notify( "force_cancel_placement" );
-		wait( 0.05 );
+        wait 0.05;
     }
 
 	//	not while mantling
@@ -377,6 +350,9 @@ setFirstInfected( wasChosen )
 	while ( !self isOnGround() && !self IsOnLadder() )
 		wait( 0.05 );
 
+	while ( !isAlive( self ) )
+		waitframe();
+
 	//	move to other team
 	if ( wasChosen )
 	{
@@ -385,7 +361,6 @@ setFirstInfected( wasChosen )
 		self.infect_isBeingChosen = undefined;
 		
 		//	resynch teams
-		level notify( "update_game_time" );
 		updateTeamScores();					
 		
 		//	allow suicides now
@@ -400,7 +375,7 @@ setFirstInfected( wasChosen )
 
 	//	remove old TI if it exists
     if ( isDefined( self.setSpawnpoint ) )
-		self maps\mp\perks\_perkfunctions::deleteTI( self.setSpawnpoint );	
+        maps\mp\perks\_perkfunctions::deleteTI( self.setSpawnpoint );
 
 	//	set faux TI to respawn in place
 	spawnPoint = spawn( "script_model", self.origin );
@@ -412,13 +387,12 @@ setFirstInfected( wasChosen )
 	//	faux spawn
 	self notify( "faux_spawn" );
 	self.faux_spawn_stance = self getStance();
-    thread maps\mp\gametypes\_playerlogic::spawnPlayer( true );
+	self thread maps\mp\gametypes\_playerlogic::spawnPlayer( true );
 
 	//	store infected
 	if ( wasChosen )
 		level.infect_players[self.name] = true;
 
-	//	tell the world!
     thread teamPlayerCardSplash( "callout_first_mercenary", self );
     playSoundOnPlayers( "mp_enemy_obj_captured" );
 }
@@ -472,11 +446,11 @@ setInitialToNormalInfected( gotKill )
 	//	faux spawn
 	self notify( "faux_spawn" );
 	self.faux_spawn_stance = self getStance();
-	
     thread maps\mp\gametypes\_playerlogic::spawnPlayer( true );
 }
 
-onPlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration )
+
+onPlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration, lifeId )
 {
 	processKill = false;
 	wasSuicide = false;
@@ -518,10 +492,8 @@ onPlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHi
 				}				
 			}
 		}
-		else
-		{
+        else if ( isDefined( attacker.isInitialInfected ) )
 			//	set attacker to regular infected if they were the first infected
-			if ( isDefined( attacker.isInitialInfected ) )
             attacker thread setInitialToNormalInfected( true );
         else
         {
@@ -530,7 +502,6 @@ onPlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHi
             maps\mp\gametypes\_gamescore::givePlayerScore( "draft_rogue", attacker, self, true );
             attacker thread maps\mp\gametypes\_rank::giveRankXP( "draft_rogue" );
         }
-		}
 		
 		//	generic messages/sounds, and reward survivors
         if ( level.infect_teamScores["allies"] > 1 )
@@ -545,10 +516,7 @@ onPlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHi
 
                 foreach ( player in level.players )
                 {
-					if( !isReallyAlive( player ) || self.sessionstate == "spectator" )
-						continue;
-						
-                    if ( player.team == "allies" && player != self && distance( player.infect_spawnPos, player.origin ) > 32 )
+                    if ( player.team == "allies" && player != self && distance( player.infect_spawnpos, player.origin ) > 32 )
                     {
                         player thread maps\mp\gametypes\_rank::xpEventPopup( &"SPLASHES_SURVIVOR" );
                         maps\mp\gametypes\_gamescore::givePlayerScore( "survivor", player, undefined, true );
@@ -559,16 +527,11 @@ onPlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHi
         }
 		//	inform/reward last
         else if ( level.infect_teamScores["allies"] == 1 )
-		{
             onFinalSurvivor();
-		}
 		//	infected win
         else if ( level.infect_teamScores["allies"] == 0 )
-		{
             onSurvivorsEliminated();
     }
-		
-    }
 }
 
 onFinalSurvivor()
@@ -582,27 +545,27 @@ onFinalSurvivor()
         if ( player.team == "allies" )
         {
             player thread maps\mp\gametypes\_rank::xpEventPopup( &"SPLASHES_FINAL_ROGUE" );
+
             if ( !level.infect_awardedFinalSurvivor )
             {
-                if ( player.gameModeJoinedAtStart && isDefined( player.infect_spawnPos ) && distance( player.infect_spawnPos, player.origin ) > 32 )
+                if ( player.infect_joinedatstart && distance( player.infect_spawnpos, player.origin ) > 32 )
                 {
                     maps\mp\gametypes\_gamescore::givePlayerScore( "final_rogue", player, undefined, true );
                     player thread maps\mp\gametypes\_rank::giveRankXP( "final_rogue" );
                 }
-
                 level.infect_awardedFinalSurvivor = true;
             }
 
-            thread teamplayercardsplash( "callout_final_rogue", player );
+            thread maps\mp\_utility::teamPlayerCardSplash( "callout_final_rogue", player );
 
             if ( matchMakingGame() )
-                level thread finalsurvivoruav( player );
-
+                level thread finalSurvivorUAV( player );
             break;
         }
     }
 }
 
+
 finalSurvivorUAV( finalPlayer )
 {
     level endon( "game_ended" );
@@ -612,34 +575,31 @@ finalSurvivorUAV( finalPlayer )
     level thread endUAVonLateJoiner( finalPlayer );
 	
     removeUAV = false;
-	level.radarMode["axis"] = "normal_radar";	
+    level.radarmode["axis"] = "normal_radar";
+
     foreach ( player in level.players )
     {
         if ( player.team == "axis" )
-			player.radarMode = "normal_radar";	
+            player.radarmode = "normal_radar";
     }
 
-	//setTeamRadarStrength( "axis", 1 );	
-		
-	while( true )
+    for (;;)
     {
         prevPos = finalPlayer.origin;
+        wait 4;
 
-		wait( 4 );
         if ( removeUAV )
         {
             setTeamRadar( "axis", 0 );
             removeUAV = false;
         }
 
-		wait( 6 );		
+        wait 6;
+
         if ( distance( prevPos, finalPlayer.origin ) < 200 )
         {
             setTeamRadar( "axis", 1 );
             removeUAV = true;
-			
-			foreach ( player in level.players )
-				player playLocalSound( "recondrone_tag" );
         }
     }
 }
@@ -650,16 +610,17 @@ endUAVonLateJoiner( finalPlayer )
 	finalPlayer endon( "disconnect" );
 	finalPlayer endon( "eliminated" );
 
-	while( true )
+    for (;;)
     {
         if ( level.infect_teamScores["allies"] > 1 )
         {
             level notify( "infect_lateJoiner" );
-			wait( 0.05 );
+            wait 0.05;
             setTeamRadar( "axis", 0 );
             break;
         }
-		wait( 0.05 );
+
+        wait 0.05;
     }
 }
 
@@ -667,7 +628,6 @@ onPlayerDisconnect()
 {
     level endon( "game_ended" );
     self endon( "eliminated" );
-	
     self waittill( "disconnect" );
 	
 	//	resynch teams
@@ -714,7 +674,6 @@ onPlayerDisconnect()
 			}			
 		}
     }
-
 	//	clear this regardless on the way out
     self.isInitialInfected = undefined;
 }
@@ -741,9 +700,8 @@ onDeadEvent( team )
 
 onTimeLimit()
 {
-	//	survivors win
 	level.finalKillCam_winner = "allies";
-	level thread maps\mp\gametypes\_gamelogic::endGame( "allies", game[ "end_reason" ][ "time_limit_reached" ] );	
+	level thread maps\mp\gametypes\_gamelogic::endGame( "allies", game["strings"]["time_limit_reached"] );	
 }
 
 onSurvivorsEliminated()
@@ -753,33 +711,37 @@ onSurvivorsEliminated()
 	level thread maps\mp\gametypes\_gamelogic::endGame( "axis", game[ "end_reason" ][ "allies_eliminated" ] );	
 }
 
-getTeamSize( team )
+getNumInfected()
 {
-	size = 0;
-	
+	numInfected = 0;
 	foreach ( player in level.players )
 	{
-		// Make sure we don't check for spectators
-		// Also need to check for if they are in killcam, because player session states are set to spectator when killcam happens
-		if ( player.sessionstate == "spectator" && !player.spectatekillcam )
-			continue;
-	
-		if( player.team == team )
-			size++;
+		if ( isdefined( player.team ) &&  player.team == "axis" )
+			numInfected++;
+	}
+	return numInfected;	
 }
 
-	return size;	
+getNumSurvivors()
+{
+	numSurvivors = 0;
+	foreach ( player in level.players )
+	{
+		if ( isdefined( player.team ) && player.team == "allies" )
+			numSurvivors++;
+	}
+	return numSurvivors;	
 }
 
 updateTeamScores()
 {
 	// survivors
-	level.infect_teamScores["allies"] = getTeamSize( "allies" );
+	level.infect_teamScores["allies"] = getNumSurvivors();
 	game["teamScores"]["allies"] = level.infect_teamScores["allies"];
 	setTeamScore( "allies", level.infect_teamScores["allies"] );
 	
 	// infected
-	level.infect_teamScores["axis"] = getTeamSize( "axis" );
+	level.infect_teamScores["axis"] = getNumInfected();
 	game["teamScores"]["axis"] = level.infect_teamScores["axis"];
 	setTeamScore( "axis", level.infect_teamScores["axis"] );
 }
@@ -802,11 +764,11 @@ setSpecialLoadouts()
     level.infect_loadouts["axis"]["loadoutKillstreak1"] = "none";
     level.infect_loadouts["axis"]["loadoutKillstreak2"] = "none";
     level.infect_loadouts["axis"]["loadoutKillstreak3"] = "none";
-    level.infect_loadouts["axis"]["loadoutDeathstreak"] = "specialty_grenadepulldeath";
+    level.infect_loadouts["axis"]["loadoutDeathstreak"] = "none";
 
-    level.infect_loadouts["axis_initial"]["loadoutPrimary"] = "scar";
-    level.infect_loadouts["axis_initial"]["loadoutPrimaryAttachment"] = "reflex";
-    level.infect_loadouts["axis_initial"]["loadoutPrimaryAttachment2"] = "xmags";
+    level.infect_loadouts["axis_initial"]["loadoutPrimary"] = "throwingknife";
+    level.infect_loadouts["axis_initial"]["loadoutPrimaryAttachment"] = "none";
+    level.infect_loadouts["axis_initial"]["loadoutPrimaryAttachment2"] = "none";
     level.infect_loadouts["axis_initial"]["loadoutPrimaryCamo"] = "none";
     level.infect_loadouts["axis_initial"]["loadoutSecondary"] = "none";
     level.infect_loadouts["axis_initial"]["loadoutSecondaryAttachment"] = "none";
@@ -820,7 +782,7 @@ setSpecialLoadouts()
     level.infect_loadouts["axis_initial"]["loadoutKillstreak1"] = "none";
     level.infect_loadouts["axis_initial"]["loadoutKillstreak2"] = "none";
     level.infect_loadouts["axis_initial"]["loadoutKillstreak3"] = "none";
-    level.infect_loadouts["axis_initial"]["loadoutDeathstreak"] = "specialty_grenadepulldeath";
+    level.infect_loadouts["axis_initial"]["loadoutDeathstreak"] = "none";
     
     level.infect_loadouts["allies"]["loadoutPrimary"] = "spas12";
     level.infect_loadouts["allies"]["loadoutPrimaryAttachment"] = "xmags";

iw4x/iw4x_00/maps/mp/mp_shipment.gsc

@@ -1,165 +0,0 @@
-main()
-{
-	maps\mp\mp_shipment_fx::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" );
-
-	ambientPlay("ambient_trainer_ext2"); //TODO: get proper ambient
-
-	game["attackers"] = "axis";
-	game["defenders"] = "allies";
-
-	setDvar( "r_specularcolorscale", "1.7" );
-	setDvar( "r_diffusecolorscale", "1.3" );
-
-	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/maps/mp/mp_shipment_fx.gsc

@@ -1,10 +0,0 @@
-main()
-{
-
-	level._effect[ "bird_seagull_flock_large" ]		= loadfx( "misc/bird_seagull_flock_large" );
-	level._effect[ "cloud_bank_far" ]				= loadfx( "weather/jeepride_cloud_bank_far" );
-	level._effect[ "mist_hunted_fav" ]					= loadfx( "weather/mist_hunted_fav" );
-	
-	if ( !getdvarint( "clientSideEffects" ) )
-		maps\createfx\mp_shipment_fx::main();
-}

iw4x/iw4x_00/mp/basemaps.arena

@@ -365,7 +365,7 @@
 }
 
 {
-  map           "mp_crossfire"
+  map           "mp_cross_fire"
   longname      "MPUI_CROSSFIRE"
   gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
   description   "MPUI_DESC_MAP_CROSSFIRE"
@@ -373,7 +373,8 @@
   mapoverlay    "compass_overlay_map_blank "
   allieschar    "iw3_usmc_desert"
   axischar      "iw3_opfor_desert"
-  environment   "forest"
+  environment   "iw3"
+  useteamzones "true"
 }
 
 {
@@ -385,7 +386,8 @@
   mapoverlay    "compass_overlay_map_blank "
   allieschar    "iw3_sas_woodland"
   axischar      "iw3_spetsnaz_woodland"
-  environment   "forest"
+  environment   "iw3"
+  useteamzones "true"
 }
 
 {
@@ -397,7 +399,8 @@
   mapoverlay    "compass_overlay_map_blank "
   allieschar    "iw3_sas_woodland"
   axischar      "iw3_spetsnaz_woodland"
-  environment   "forest"
+  useteamzones "true"
+  environment   "iw3"
 }
 
 {
@@ -409,7 +412,8 @@
   mapoverlay    "compass_overlay_map_blank "
   allieschar    "iw3_sas_woodland"
   axischar      "iw3_spetsnaz_woodland"
-  environment   "forest"
+  environment   "iw3"
+  useteamzones "true"
 }
 
 {
@@ -434,7 +438,7 @@
   mapoverlay    "compass_overlay_map_blank "
   allieschar    "iw3_usmc_desert"
   axischar      "iw3_opfor_desert"
-  environment   "forest"
+  environment   "iw3"
 }
 
 {
@@ -511,7 +515,7 @@
   mapoverlay    "compass_overlay_map_blank "
   allieschar    "iw3_sas_woodland"
   axischar      "iw3_spetsnaz_woodland"
-  environment   "forest"
+  environment   "iw3"
 }
 
 {
@@ -562,7 +566,7 @@
   mapoverlay    "compass_overlay_map_blank "
   allieschar    "iw3_usmc_desert"
   axischar      "iw3_opfor_desert"
-  environment   "forest"
+  environment   "iw3"
   useteamzones  "true"
 }
 
@@ -575,7 +579,7 @@
   mapoverlay    "compass_overlay_map_blank "
   allieschar    "iw3_sas_woodland"
   axischar      "iw3_spetsnaz_woodland"
-  environment   "forest"
+  environment   "iw3"
   useteamzones  "true"
 }
 
@@ -588,7 +592,7 @@
   mapoverlay    "compass_overlay_map_blank "
   allieschar    "iw3_sas_woodland"
   axischar      "iw3_spetsnaz_woodland"
-  environment   "forest"
+  environment   "iw3"
   useteamzones  "true"
 }
 
@@ -601,7 +605,7 @@
   mapoverlay    "compass_overlay_map_blank "
   allieschar    "iw3_sas_woodland"
   axischar      "iw3_spetsnaz_woodland"
-  environment   "forest"
+  environment   "iw3"
   useteamzones  "true"
 }
 
@@ -629,7 +633,7 @@
   mapoverlay    "compass_overlay_map_blank "
   allieschar    "iw3_sas_urban"
   axischar      "iw3_spetsnaz_urban"
-  environment   "forest"
+  environment   "iw3"
   useteamzones  "true"
 }
 
@@ -643,7 +647,7 @@
   mapoverlay    "compass_overlay_map_blank "
   allieschar  "iw3_usmc_desert"
   axischar    "iw3_opfor_desert"
-  environment   "forest"
+  environment   "iw3"
   useteamzones  "true"
 }
 
@@ -656,7 +660,7 @@
   mapoverlay    "compass_overlay_map_blank "
   allieschar    "iw3_usmc_desert"
   axischar      "iw3_opfor_desert"
-  environment   "forest"
+  environment   "iw3"
   useteamzones  "true"
 }
 
@@ -669,7 +673,7 @@
   mapoverlay    "compass_overlay_map_blank "
   allieschar    "iw3_usmc_desert"
   axischar      "iw3_opfor_desert"
-  environment   "forest"
+  environment   "iw3"
   useteamzones  "true"
 }
 
@@ -683,7 +687,7 @@
   mapoverlay    "compass_overlay_map_blank "
   allieschar    "iw3_usmc_desert"
   axischar      "iw3_opfor_desert"
-  environment   "forest"
+  environment   "iw3"
   useteamzones  "true"
 }
 

iw4x/iw4x_00/ui_mp/auconfirm.menu

@@ -250,7 +250,7 @@
 			action
 			{
 				play "mouse_click";
-				exec "getautoupdate";
+				uiScript "getAutoUpdate";
 			}
 			onFocus
 			{

iw4x/iw4x_00/ui_mp/bg.inc

@@ -34,7 +34,7 @@ itemDef
 	forecolor				0 0 0 0.4
 	background				"white"
 	textscale				0.55
-	visible					when ((dvarBool("cl_ingame") || dvarBool("sv_running")))
+	visible					when ( dvarBool("cl_ingame") || dvarBool("sv_running") )
 }
 itemDef
 {

iw4x/iw4x_00/ui_mp/cac_popup.menu

@@ -10,7 +10,7 @@
 		style 1
 		foreColor 1 1 1 1
 		backColor 1 1 1 1
-		background white
+		background "white"
 		exp rect Y ( localvarfloat( "ui_cac_popup_ypos" )  )
 		exp rect H ( CALCULATED_HEIGHT )
 		fadeCycle 1
@@ -66,7 +66,7 @@
 			background white
 			decoration
 			visible 1
-			exp rect H (  )
+			exp rect H ( CALCULATED_HEIGHT )
 		}
 		itemDef
 		{

iw4x/iw4x_00/ui_mp/connect.menu

@@ -258,7 +258,9 @@
 			text "@MENU_INTEL"
 			visible when ( dvarbool( "wideScreen" ) )
 		}
-		/*itemDef
+
+#ifdef DRAW_IW_LOGO
+		itemDef
 		{
 			//rect -104 -56 128 64 3 3
 			rect -170 -66 128 64 3 3
@@ -280,6 +282,7 @@
 			background "logo_iw"
 			textscale 0.55
 			visible when ( !dvarbool( "wideScreen" ) )
-		}*/
+		}
+#endif
 	}
 }

iw4x/iw4x_00/ui_mp/controls_multi.menu

@@ -40,6 +40,7 @@
 #define ON_MENU_ESC \
 	close self;
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -71,3 +72,4 @@ menuDef
 
 		ITEM_BUTTON_BACK(ON_MENU_ESC)
 	}
+}

iw4x/iw4x_00/ui_mp/createserver.menu

@@ -274,6 +274,7 @@
 		open										"settings_quick_gtnw"; \
 	}
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -320,3 +321,4 @@ menuDef
 
 		ITEM_BUTTON_FRIENDS(-120)
 	}
+}

iw4x/iw4x_00/ui_mp/dpad_hd.menu

@@ -42,7 +42,6 @@
 			textScale 0.3333
 			textStyle 3
 			textFont 10
-			feeder 0
 			visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) )
 		}
 		itemDef
@@ -67,7 +66,6 @@
 			textScale 0.25
 			textStyle 6
 			textFont 6
-			feeder 0
 			visible 1
 			exp text ( "^3" + keybinding( "+actionslot 1" )  )
 			visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 1 ) )
@@ -93,7 +91,6 @@
 			textScale 0.3333
 			textStyle 3
 			textFont 10
-			feeder 0
 			visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) )
 		}
 		itemDef
@@ -118,7 +115,6 @@
 			textScale 0.25
 			textStyle 6
 			textFont 6
-			feeder 0
 			visible 1
 			exp text ( "^3" + keybinding( "+actionslot 3" )  )
 			visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 3 ) )
@@ -144,7 +140,6 @@
 			textScale 0.3333
 			textStyle 3
 			textFont 10
-			feeder 0
 			visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) )
 		}
 		itemDef
@@ -169,7 +164,6 @@
 			textScale 0.25
 			textStyle 6
 			textFont 6
-			feeder 0
 			visible 1
 			exp text ( "^3" + keybinding( "+actionslot 4" )  )
 			visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 4 ) )

iw4x/iw4x_00/ui_mp/iw4x_credits.menu

@@ -92,6 +92,7 @@
 
 #define MESSAGE_CREDITS												"@IW4X_CREDITS"
 
+{
 	menuDef
 	{
 		name															MENU_NAME
@@ -115,3 +116,4 @@ menuDef
 
 		ITEM_BUTTON_BACK(close self;)
 	}
+}

iw4x/iw4x_00/ui_mp/main_text.menu

@@ -18,7 +18,7 @@
 	setLocalVarString				ui_hint_text "";
 
 #define CHECK_FOR_UPDATE_ACTION \
-	exec							"checkforupdate"; \
+	uiScript						"checkForUpdate"; \
 	open							"auconfirm";
 
 #define CREATE_GAME_ACTION \
@@ -96,13 +96,11 @@
 		MENU_CHOICE_BUTTON_VIS(7, button_7, "@MENU_MODS_CAPS", open mods_menu;, "@MPUI_DESC_MODS", 1)
 		MENU_CHOICE_BUTTON_VIS(8, button_8, "@MENU_OPTIONS_CAPS", open pc_options_video;, "@MPUI_DESC_OPTIONS", 1)
 		MENU_CHOICE_HORIZONTAL_LINE_VIS(9, 1)
-		MENU_CHOICE_BUTTON_VIS(9, button_9, "@MENU_STORE_CAPS", uiScript "downloadDLC" 1, "@MPUI_DESC_STORE", 1)
-		MENU_CHOICE_NEWICON_VIS(9, when(!dvarBool(isDlcInstalled_All)))
-		MENU_CHOICE_BUTTON_VIS(10, button_10, "@MENU_SP_CREDITS_CAPS", open iw4x_credits;, "@NULL_EMPTY", 1)
-		MENU_CHOICE_BUTTON_VIS(11, button_11, "@MENU_VISIT_WEBSITE_CAPS", uiScript "visitWebsite", "@NULL_EMPTY", 1)
-		MENU_CHOICE_HORIZONTAL_LINE_VIS(12, 1)
-		MENU_CHOICE_BUTTON_VIS(12, button_12, "@MENU_MAIN_MENU_CAPS", open single_popmenu;, "@MENU_SP_DESC_SINGLEPLAYER", 1)
-		MENU_CHOICE_BUTTON_VIS(13, button_13, "@MENU_QUIT_CAPS", open quit_popmenu;, "@MPUI_DESC_QUIT", 1)
+		MENU_CHOICE_BUTTON_VIS(9, button_9, "@MENU_SP_CREDITS_CAPS", open iw4x_credits;, "@NULL_EMPTY", 1)
+		MENU_CHOICE_BUTTON_VIS(10, button_10, "@MENU_VISIT_WEBSITE_CAPS", uiScript "visitWebsite", "@NULL_EMPTY", 1)
+		MENU_CHOICE_HORIZONTAL_LINE_VIS(11, 1)
+		MENU_CHOICE_BUTTON_VIS(11, button_11, "@MENU_MAIN_MENU_CAPS", open single_popmenu;, "@MENU_SP_DESC_SINGLEPLAYER", 1)
+		MENU_CHOICE_BUTTON_VIS(12, button_12, "@MENU_QUIT_CAPS", open quit_popmenu;, "@MPUI_DESC_QUIT", 1)
 
 		ITEM_BUTTON_FRIENDS(-250)
 

iw4x/iw4x_00/ui_mp/menu_online_barracks.menu

@@ -73,6 +73,7 @@
 		exp											text (localvarstring("ui_hint_text")) \
 	}
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -230,3 +231,4 @@ menuDef
 		ITEM_BUTTON_FRIENDS(-120)
 		ITEM_BUTTON_BACK(close self;)
 	}
+}

iw4x/iw4x_00/ui_mp/menu_xboxlive_lobby.menu

@@ -153,9 +153,9 @@
 	ON_MENU_KEY_K_APAD_RIGHT
 
 #define ON_MENU_KEY_K_F1 \
-	open											"popup_summary"; \
-	play											CHOICE_CLICK_SOUND;
+	open											"popup_summary";
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -261,3 +261,4 @@ menuDef
 		ITEM_BUTTON_SUMMARY_VIS(1)
 		ITEM_BUTTON_BACK(ON_MENU_ESC)
 	}
+}

iw4x/iw4x_00/ui_mp/menu_xboxlive_privatelobby.menu

@@ -9,3 +9,4 @@
 			open "createserver";
 		}
 	}
+}

iw4x/iw4x_00/ui_mp/mods_menu.menu

@@ -19,7 +19,7 @@
 	setLocalVarString								ui_info_name ""; \
 	setLocalVarString								ui_info_desc ""; \
 	setLocalVarString								ui_info_icon ""; \
-	uiScript										"LoadMods";
+	uiScript										"LoadMods"; \
 	setFocus										"modlist";
 
 #define MENU_MODS_BUTTON_VIS(nameArg, yPos, textArg, actionArg, visArg) \
@@ -71,6 +71,7 @@
 		exp rect x (posX) \
 	}
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -125,3 +126,4 @@ menuDef
 
 		ITEM_BUTTON_BACK(close self;)
 	}
+}

iw4x/iw4x_00/ui_mp/pc_join_unranked.menu

@@ -24,12 +24,12 @@
 	close															self;
 
 #define ON_MENU_KEY_F5 \
-	play															CHOICE_CLICK_SOUND; \
 	uiScript														"RefreshServers";
 
 #define ON_MENU_KEY_ENTER \
 	uiScript														"JoinServer";
 
+{
 	menuDef
 	{
 		name															MENU_NAME
@@ -62,3 +62,4 @@ menuDef
 		BUTTON_FOOTER(86, 100, "serverinfo", "@MENU_SERVER_INFO_CAPS", open "serverinfo_popmenu";)
 		BUTTON_FOOTER(206, 100, "joinserver", "@MENU_JOIN_SERVER_CAPS", uiScript "JoinServer";)
 	}
+}

iw4x/iw4x_00/ui_mp/pc_options_actions.menu

@@ -43,6 +43,7 @@
 #define ON_GPAD_USED when(dvarBool("gpad_in_use") == 1)
 #define ON_GPAD_UNUSED when(dvarBool("gpad_in_use") == 0)
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -89,3 +90,4 @@ menuDef
 
 		ITEM_BUTTON_BACK(ON_MENU_ESC)
 	}
+}

iw4x/iw4x_00/ui_mp/pc_options_advanced_video.menu

@@ -43,6 +43,7 @@
 #define ON_MENU_ESC \
 	close											self;
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -89,3 +90,4 @@ menuDef
 
 		ITEM_BUTTON_BACK(ON_MENU_ESC)
 	}
+}

iw4x/iw4x_00/ui_mp/pc_options_audio.menu

@@ -56,6 +56,7 @@
 	execnow											"profile_menuDvarsFinish; resetViewport"; \
 	setLocalVarString								ui_hint_text "@NULL_EMPTY";
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -82,3 +83,4 @@ menuDef
 		PC_OPTIONS_DVARYESNO(2, "@MPUI_ENABLE_VOICE_CHAT", "cl_voice", ;, when(0))
 		PC_OPTIONS_KEYBINDING(3, "@MENU_VOICE_CHAT_BUTTON", "+talk")
 	}
+}

iw4x/iw4x_00/ui_mp/pc_options_controls.menu

@@ -56,6 +56,7 @@
 	execnow											"profile_menuDvarsFinish; resetViewport"; \
 	setLocalVarString								ui_hint_text "@NULL_EMPTY";
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -120,3 +121,4 @@ menuDef
 			}
 		}
 	}
+}

iw4x/iw4x_00/ui_mp/pc_options_game.menu

@@ -54,6 +54,7 @@
 	execnow											"profile_menuDvarsFinish; resetViewport"; \
 	setLocalVarString								ui_hint_text "@NULL_EMPTY";
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -84,3 +85,4 @@ menuDef
 		PC_OPTIONS_EDITFIELD_RAW(3, "@MENU_DEMOS_KEEP", "cl_demosKeep", 3, "@MPUI_DESC_DEMOS_KEEP", 1)
 		PC_OPTIONS_DVARYESNO(4, "@MENU_COLORBLIND_MODE", "r_colorBlindTeams", ;, when(0))
 	}
+}

iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu

@@ -80,6 +80,7 @@
         execnow                                     "bindgpbuttonsconfigs"; \
     }
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -109,7 +110,7 @@ menuDef
 			{"@MENU_DEFAULT"; "thumbstick_default";
 			"@MENU_SOUTHPAW"; "thumbstick_southpaw";
 			"@MENU_LEGACY"; "thumbstick_legacy";
-		"@MENU_LEGACY_SOUTHPAW"; "thumbstick_legacysouthpaw"}, execNow "bindgpsticksconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED)
+			"@MENU_LEGACY_SOUTHPAW"; "thumbstick_legacysouthpaw"}, execNow "bindgpsticksconfigs";, "@MENU_DESC_THUMBSTICK_LAYOUT", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
 		PC_OPTIONS_STRLIST_RAW(3, "@MENU_BUTTON_LAYOUT", "gpad_buttonConfig", 
 			{"@MENU_DEFAULT"; "buttons_default";
 			"@MENU_TACTICAL"; "buttons_tactical";
@@ -118,7 +119,7 @@ menuDef
 			"@MENU_DEFAULT_ALT"; "buttons_default_alt";
 			"@MENU_TACTICAL_ALT"; "buttons_tactical_alt";
 			"@MENU_LEFTY_ALT"; "buttons_lefty_alt";
-		"@MENU_NOMAD_ALT"; "buttons_nomad_alt"}, execNow "bindgpbuttonsconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED)
+			"@MENU_NOMAD_ALT"; "buttons_nomad_alt"}, execNow "bindgpbuttonsconfigs";, "@MENU_DESC_BUTTON_LAYOUT", 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)
 		PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_LOCKON_ENABLED", "gpad_lockon_enabled", ;, "@MPUI_DESC_LOCKON_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
@@ -128,5 +129,6 @@ menuDef
 			{"@MENU_SENSITIVITY_LOW_CAPS" SENSITIVITY_1 "@MENU_SENSITIVITY_MEDIUM_CAPS" SENSITIVITY_2 "3" SENSITIVITY_3
 			"@MENU_SENSITIVITY_HIGH_CAPS" SENSITIVITY_4 "5" SENSITIVITY_5 "6" SENSITIVITY_6
 			"@MENU_SENSITIVITY_VERY_HIGH_CAPS" SENSITIVITY_7 "8" SENSITIVITY_8 "9" SENSITIVITY_9 "@MENU_SENSITIVITY_INSANE_CAPS" SENSITIVITY_10}, 
-		;, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED)
+			;, "@MENU_DESC_LOOK_SENSITIVITY_PRESET", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
+	}
 }

iw4x/iw4x_00/ui_mp/pc_options_look.menu

@@ -40,6 +40,7 @@
 #define ON_MENU_ESC \
 	close											self;
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -90,3 +91,4 @@ menuDef
 
 		ITEM_BUTTON_BACK(ON_MENU_ESC)
 	}
+}

iw4x/iw4x_00/ui_mp/pc_options_movement.menu

@@ -40,6 +40,7 @@
 #define ON_MENU_ESC \
 	close											self;
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -86,3 +87,4 @@ menuDef
 
 		ITEM_BUTTON_BACK(ON_MENU_ESC)
 	}
+}

iw4x/iw4x_00/ui_mp/pc_options_multi.menu

@@ -58,6 +58,7 @@
 	execnow											"profile_menuDvarsFinish; resetViewport"; \
 	setLocalVarString								ui_hint_text "@NULL_EMPTY";
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -83,17 +84,18 @@ menuDef
 
 		PC_OPTIONS_SEPERATOR(0)
 
-	PC_OPTIONS_FLOATLIST_RAW(1, "@MENU_MAXPACKETS", "cl_maxpackets", {"30" 30 "100" 100 "125" 125}, ;, ;, when(0), 1)
-	PC_OPTIONS_FLOATLIST_RAW(2, "@MENU_SNAPS", "snaps", {"20" 20 "30" 30}, ;, ;, when(0), 1)
+		PC_OPTIONS_FLOATLIST_RAW(1, "@MENU_MAXPACKETS", "cl_maxpackets", {"30" 30 "100" 100 "125" 125}, ;, "@MENU_DESC_MAXPACKETS", when(0), 1)
+		PC_OPTIONS_FLOATLIST_RAW(2, "@MENU_SNAPS", "snaps", {"20" 20 "30" 30}, ;, "@MENU_DESC_SNAPS", when(0), 1)
 
 		PC_OPTIONS_SEPERATOR(2)
 
 		PC_OPTIONS_DVARYESNO(3, "@MENU_LAGOMETER", "drawLagometer", ;, when(0))
-	PC_OPTIONS_STRLIST_RAW(4, "@MENU_DRAWFPS", "cg_drawFPS", {"Off"; "Off"; "Simple"; "Simple"; "SimpleRanges"; "SimpleRanges"; "Verbose"; "Verbose"; "Verbose+Viewpos"; "Verbose+Viewpos"}, ;, ;, when(0), 1)
-	PC_OPTIONS_DVARYESNO(5, "@MENU_FPSLABELS", "cg_drawFPSLabels", ;, when(0))
+		PC_OPTIONS_STRLIST_RAW(4, "@MENU_DRAWFPS", "cg_drawFPS", {"Off"; "Off"; "Simple"; "Simple"; "SimpleRanges"; "SimpleRanges"; "Verbose"; "Verbose"; "Verbose+Viewpos"; "Verbose+Viewpos"}, ;, "@MENU_DESC_DRAWFPS", when(0), 1)
+		PC_OPTIONS_DVARYESNO(5, "@MENU_FPSLABELS", "cg_drawFPSLabels", "@MENU_DESC_FPSLABELS", when(0))
 
 		PC_OPTIONS_SEPERATOR(5)
 
 		PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_STREAMFRIENDLY_UI", "ui_streamFriendly", ;, "@MPUI_DESC_STREAM_FRIENDLY_UI", when(0), 1)
-	PC_OPTIONS_FLOATLIST_RAW(7, "@MENU_FRIENDNOTIFY", "cl_notifyFriendState", {"Always" -1 "Never" 0 "in Menu" 1}, ;, "@MPUI_DESC_FRIENDNOTIFY", when(dvarBool("ui_streamFriendly")), 1)
+		PC_OPTIONS_DVARYESNO(7, "@MENU_FRIENDNOTIFY", "cl_notifyFriendState", "@MPUI_DESC_FRIENDNOTIFY", when(0))
+	}
 }

iw4x/iw4x_00/ui_mp/pc_options_video.menu

@@ -67,6 +67,7 @@
 	execnow											"profile_menuDvarsFinish; resetViewport"; \
 	setLocalVarString								ui_hint_text "@NULL_EMPTY";
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -136,3 +137,4 @@ menuDef
 			}
 		}
 	}
+}

iw4x/iw4x_00/ui_mp/popup_cac_primary_camo.menu

@@ -15,7 +15,7 @@
 		allowedBinding "+talk"
 		visible when ( localvarint( "ui_tabDepth" ) == localvarint( "ui_popup_cac_primary_camo_tabDepth" ) )
 		exp rect y ( localvarfloat( "ui_popupYPos" ) + localvarint( "ui_tabDepth" ) * 20 )
-		execKey 168
+		execKeyInt 168
 		{
 			if ( localvarstring( "ui_selected_ref" ) != "none" && !isitemunlocked( getplayerdata( "customClasses" , localvarint( "classIndex" ) , "weaponSetups" , 0 , "weapon" ) + " " + localvarstring( "ui_selected_ref" ) ) )
 			{

iw4x/iw4x_00/ui_mp/popup_customclan.menu

@@ -47,6 +47,7 @@
 #define ON_MENU_ESC \
 	close											self;
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -69,3 +70,4 @@ menuDef
 
 		POPUP_BUTTON_FOOTER(64, "@MENU_CLOSE", close self;)
 	}
+}

iw4x/iw4x_00/ui_mp/popup_customtitle.menu

@@ -47,6 +47,7 @@
 #define ON_MENU_ESC \
 	close											self;
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -69,3 +70,4 @@ menuDef
 
 		POPUP_BUTTON_FOOTER(64, "@MENU_CLOSE", close self;)
 	}
+}

iw4x/iw4x_00/ui_mp/popup_friends.menu

@@ -26,6 +26,7 @@
 #define ON_EXEC_KEY_F \
 	escape											self;
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -71,3 +72,4 @@ menuDef
 		}
 		POPUP_BUTTON_FOOTER(350, "@MENU_CLOSE", close self;)
 	}
+}

iw4x/iw4x_00/ui_mp/popup_joinpassword.menu

@@ -47,6 +47,8 @@
 #define ON_MENU_ESC \
 	close											self;
 
+
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -69,3 +71,4 @@ menuDef
 
 		POPUP_BUTTON_FOOTER(64, "@MENU_OK", close self;)
 	}
+}

iw4x/iw4x_00/ui_mp/popup_playername.menu

@@ -49,6 +49,7 @@
 #define ON_MENU_ESC \
 	close											self;
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -71,3 +72,4 @@ menuDef
 
 		POPUP_BUTTON_FOOTER(64, "@MENU_CLOSE", exec "setfromdvar name ui_name"; close self;)
 	}
+}

iw4x/iw4x_00/ui_mp/popup_serverpassword.menu

@@ -49,6 +49,7 @@
 #define ON_MENU_ESC \
 	close											self;
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -71,3 +72,4 @@ menuDef
 
 		POPUP_BUTTON_FOOTER(64, "@MENU_OK", close self;)
 	}
+}

iw4x/iw4x_00/ui_mp/scriptmenus/changegametype.menu

@@ -81,7 +81,7 @@
 			elementtype LISTBOX_TEXT
 			elementwidth 120
 			elementheight 24
-			columns 1 2 190 25
+			columns 1 2 190 25 0
 			mouseEnter 
 			{
 				setitemcolor "maplist2";

iw4x/iw4x_00/ui_mp/scriptmenus/changemap.menu

@@ -83,7 +83,7 @@
 			bordercolor 1 1 1 0.15
 			outlinecolor 1 1 1 0.2
 			feeder FEEDER_ALLMAPS
-			columns 1 2 190 25
+			columns 1 2 190 25 0
 			mouseEnter 
 			{
 				setitemcolor "maplist";

iw4x/iw4x_00/ui_mp/scriptmenus/kickplayer.menu

@@ -80,7 +80,7 @@
 			bordercolor 1 1 1 0.15
 			outlinecolor 1 1 1 0.2
 			feeder FEEDER_PLAYER_LIST
-			columns 1 2 190 25
+			columns 1 2 190 25 0
 			mouseEnter 
 			{
 				setitemcolor "maplist";

iw4x/iw4x_00/ui_mp/serverinfo_popmenu.menu

@@ -109,58 +109,6 @@
 #define SV_INFO_TABLE_WIDTH							496
 #define SV_INFO_TABLE_HEIGHT						160
 
-#define SV_INFO_TABLE_HEADER \
-	itemDef \
-	{ \
-		name										"num" \
-		rect										(SV_INFO_TABLE_POS_X + 4) (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0 \
-		foreColor									CHOICE_TEXTCOLOR \
-		textFont									UI_FONT_NORMAL \
-		textScale									0.3 \
-		textAlignX									4 \
-		decoration									\
-		visible										1 \
-		text										"#" \
-	} \
-	itemDef \
-	{ \
-		name										"name" \
-		rect										88 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0 \
-		foreColor									CHOICE_TEXTCOLOR \
-		textFont									UI_FONT_NORMAL \
-		textScale									0.3 \
-		textAlignX									4 \
-		decoration									\
-		visible										1 \
-		text										"@MENU_NAME" \
-	} \
-	itemDef \
-	{ \
-		name										"score" \
-		rect										353 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0 \
-		foreColor									CHOICE_TEXTCOLOR \
-		textFont									UI_FONT_NORMAL \
-		textScale									0.3 \
-		textAlignX									4 \
-		decoration									\
-		visible										1 \
-		text										"@MPUI_SCORE" \
-	} \
-	itemDef \
-	{ \
-		name										"ping" \
-		rect										455 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0 \
-		foreColor									CHOICE_TEXTCOLOR \
-		textFont									UI_FONT_NORMAL \
-		textScale									0.3 \
-		textAlignX									4 \
-		decoration									\
-		visible										1 \
-		text										"@MENU_PING" \
-	}
-
-#define MENU_NAME									"serverinfo_popmenu"
-
 #define KEYINT_F5									171
 
 #define POPMENU_POS_X								-250
@@ -184,9 +132,10 @@
 #define ON_KEY_PRESS_F5 \
 	uiScript										"ServerStatus";
 
+{
 	menuDef
 	{
-	name											MENU_NAME
+		name											"serverinfo_popmenu"
 		rect											POPMENU_RECT
 		popup
 		legacySplitScreenScale
@@ -215,7 +164,53 @@ menuDef
 
 		SV_INFO_SECURITY_LEVEL_VIS(6, 1)
 
-	SV_INFO_TABLE_HEADER
+		itemDef
+		{
+			name										"num"
+			rect										(SV_INFO_TABLE_POS_X + 4) (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0
+			foreColor									CHOICE_TEXTCOLOR
+			textFont									UI_FONT_NORMAL
+			textScale									0.3
+			textAlignX									4
+			visible										1
+			text										"#"
+		}
+
+		itemDef
+		{
+			name										"name"
+			rect										88 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0
+			foreColor									CHOICE_TEXTCOLOR
+			textFont									UI_FONT_NORMAL
+			textScale									0.3
+			textAlignX									4
+			visible										1
+			text										"@MENU_NAME"
+		}
+
+		itemDef
+		{
+			name										"score"
+			rect										353 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0
+			foreColor									CHOICE_TEXTCOLOR
+			textFont									UI_FONT_NORMAL
+			textScale									0.3
+			textAlignX									4
+			visible										1
+			text										"@MPUI_SCORE"
+		}
+
+		itemDef
+		{
+			name										"ping"
+			rect										455 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0
+			foreColor									CHOICE_TEXTCOLOR
+			textFont									UI_FONT_NORMAL
+			textScale									0.3
+			textAlignX									4
+			visible										1
+			text										"@MENU_PING"
+		}
 
 		itemDef
 		{
@@ -244,3 +239,4 @@ menuDef
 		POPUP_BUTTON_FOOTER(330, "@PLATFORM_REFRESH", uiScript "ServerStatus";)
 		POPUP_BUTTON_FOOTER(350, "@MENU_CLOSE", close self;)
 	}
+}

iw4x/iw4x_00/ui_mp/settings_gametype.menu

@@ -56,7 +56,6 @@
 			textScale 0.55
 			textStyle 0
 			textFont 0
-			feeder 0
 			visible 1
 		}
 		itemDef
@@ -81,7 +80,6 @@
 			textScale 0.55
 			textStyle 0
 			textFont 0
-			feeder 0
 			visible 1
 			exp rect x ( ( 0 - 107 ) - ( ( float( milliseconds( ) % 60000 ) / 60000 ) * ( 854 ) )  )
 		}
@@ -107,7 +105,6 @@
 			textScale 0.55
 			textStyle 0
 			textFont 0
-			feeder 0
 			visible 1
 			exp rect x ( ( - 107 + 854 ) + ( ( float( milliseconds( ) % 50000 ) / 50000 ) * ( 854 ) )  )
 		}
@@ -133,7 +130,6 @@
 			textScale 0.55
 			textStyle 0
 			textFont 0
-			feeder 0
 			visible 1
    		    exp forecolor a ( ( ( ( sin milliseconds( ) / 1500 ) + 1 ) * 0.250000 ) + 0.250000  )
 		}
@@ -159,7 +155,6 @@
 			textScale 0.55
 			textStyle 0
 			textFont 0
-			feeder 0
 			visible 1
      		exp forecolor a ( ( ( ( sin milliseconds( ) / 480 ) + 1 ) * 0.250000 ) + 0.250000  )
 		}
@@ -184,7 +179,6 @@
 			textScale 0.44
 			textStyle 0
 			textFont 9
-			feeder 0
 			text "@MENU_CHOOSE_GAME_MODE_CAP"
 			visible 1
 		}
@@ -210,7 +204,6 @@
 			textScale 0.55
 			textStyle 0
 			textFont 0
-			feeder 0
 			visible 1
 		}
 		itemDef
@@ -235,7 +228,6 @@
 			textScale 0.55
 			textStyle 0
 			textFont 0
-			feeder 0
 			visible 1
 		}
 		itemDef
@@ -260,7 +252,6 @@
 			textScale 0.55
 			textStyle 0
 			textFont 0
-			feeder 0
 			visible 1
 		}
 		itemDef
@@ -285,7 +276,6 @@
 			textScale 0.55
 			textStyle 0
 			textFont 0
-			feeder 0
 			visible 1
 		}
 		itemDef
@@ -310,7 +300,6 @@
 			textScale 0.55
 			textStyle 0
 			textFont 0
-			feeder 0
 			visible 1
 		}
 		itemDef
@@ -335,7 +324,6 @@
 			textScale 0.55
 			textStyle 0
 			textFont 0
-			feeder 0
 			visible 1
 		}
 		itemDef
@@ -360,7 +348,6 @@
 			textScale 0.55
 			textStyle 0
 			textFont 0
-			feeder 0
 			visible 1
 		}
 		itemDef
@@ -385,7 +372,6 @@
 			textScale 0.55
 			textStyle 0
 			textFont 0
-			feeder 0
 			visible 1
 		}
 		itemDef
@@ -410,7 +396,6 @@
 			textScale 0.55
 			textStyle 0
 			textFont 0
-			feeder 0
 			visible 1
 		}
 		
@@ -445,7 +430,6 @@
 			textScale 0.375 \
 			textStyle 0 \
 			textFont 3 \
-			feeder 0 \
 			visible 1 \
 			visible visArg \
 			exp text ( "@" + tablelookup( "mp/gameTypesTable.csv" , 0 ,  textArg , 1 ) + "_CAPS"  ) \
@@ -502,7 +486,6 @@
 			textStyle 0 \
 			textFont 3 \
 			text textArg \
-			feeder 0 \
 			visible 1 \
 			visible visArg \
 			onFocus \
@@ -617,7 +600,6 @@
 			textScale 0.375
 			textStyle 0
 			textFont 3
-			feeder 0
 			text "@PLATFORM_BACK_CAPS"
 			visible 1
 			onFocus
@@ -659,7 +641,6 @@
 			textScale 0.55
 			textStyle 0
 			textFont 0
-			feeder 0
 			visible 1
 		}
 		itemDef
@@ -683,7 +664,6 @@
 			textScale 0.375
 			textStyle 0
 			textFont 9
-			feeder 0
 			visible 1
 			exp text ( localvarstring( "ui_info_name" )  )
 		}
@@ -709,7 +689,6 @@
 			textScale 0.375
 			textStyle 0
 			textFont 3
-			feeder 0
 			visible 1
 			exp text ( localvarstring( "ui_info_desc" )  )
 		}

iw4x/iw4x_00/ui_mp/theater_menu.menu

@@ -211,6 +211,7 @@
 #define ON_MENU_ESC \
 	close											self;
 
+{
 	menuDef
 	{
 		name											MENU_NAME
@@ -263,3 +264,4 @@ menuDef
 
 		ITEM_BUTTON_BACK(close self;)
 	}
+}

iw4x/iw4x_00/vision/mp_shipment.vision

@@ -1,19 +1,14 @@
 r_glow                    "0"
-r_glowRadius0             "12"
-r_glowBloomCutoff         "0.85"
+r_glowRadius0             "0"
+r_glowBloomCutoff         "0.231778"
 r_glowBloomDesaturation   "0"
-r_glowBloomIntensity0     "0.5"
+r_glowBloomIntensity0     "0"
 
 r_filmEnable				"1"
-r_filmContrast            "0.98"
-r_filmBrightness          "0.1"
-r_filmDesaturation        "0.38"
-//r_filmDesaturationDark    "0.3"
+r_filmContrast				"0.87104"
+r_filmBrightness			"0"
+r_filmDesaturation			"0.352396"
 r_filmInvert				"0"
-r_filmLightTint				"1.10838 1.16717 1.15409"
-//r_filmMediumTint          "0.73 0.93 1.09"
-r_filmDarkTint				"0.7 0.948125 1"
+r_filmLightTint				"1.10838 1.10717 1.15409"
+r_filmDarkTint				"0.7 0.928125 1"
 
-r_primaryLightUseTweaks              "1"
-r_primaryLightTweakDiffuseStrength   "1"
-r_primaryLightTweakSpecularStrength  "1"