Merge branch 'develop' into patch-1

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

@@ -961,6 +961,7 @@ thermalVision()
 	self visionSetThermalForPlayer( game["thermal_vision"], 1 );
 
 	self notifyOnPlayerCommand( "switch thermal", "+activate" );
+	self notifyOnPlayerCommand( "switch thermal", "+usereload" );
 
 	for (;;)
 	{

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

@@ -390,7 +390,7 @@ heliRide( lifeId, chopper )
 	chopper VehicleTurretControlOn( self );
 	
 	self PlayerLinkWeaponviewToDelta( chopper, "tag_player", 1.0, 180, 180, 0, 180, true );
-	self setPlayerAngles( level.ac130 getTagAngles( "tag_player" ) );													   
+	self setPlayerAngles( level.ac130 getTagAngles( "tag_player" ) );
 	
 	chopper.gunner = self;	
 
@@ -422,6 +422,7 @@ thermalVision( chopper )
 	self visionSetThermalForPlayer( game["thermal_vision"], 3 );
 
 	self notifyOnPlayerCommand( "switch thermal", "+activate" );
+	self notifyOnPlayerCommand( "switch thermal", "+usereload" );
 
 	for (;;)
 	{
@@ -1369,7 +1370,6 @@ heli_explode( altStyle )
 
 	// give "death" notify time to process
 	wait ( 0.05 );
-
 	// g_getplayervieworigin fix
 	// we hide this helicopter then delete it
 
@@ -2058,7 +2058,7 @@ heli_leave()
 	
 	// give "death" notify time to process
 	wait ( 0.05 );
-
+	
 	// g_getplayervieworigin fix
 	// we hide this helicopter then delete it
 	if (isDefined(self))
@@ -2209,4 +2209,4 @@ deleteAfterTime( delay )
 	wait ( delay );
 	
 	self delete();
-}
+}