Fixed crash that I caused. Fixed admin password dialog box not supporting all characters. Changed version.

Author: eezstreet

README.md

@@ -760,6 +760,7 @@ This is a quick fix patch to address some bugs.
  - Fixed SEF bug: Crash in multiplayer when using certain loadouts
  - Fixed SEF bug: Weird leg movement speed in multiplayer when using certain loadouts
  - Fixed TSS bug: Can sometimes reload the same magazine back into the weapon, in certain conditions
+ - Fixed TSS bug: The password dialog box (on Admin Login) didn't support all characters
 
 
 #### v6.1

Source/Game/SwatGame/Classes/LoadOut/LoadOut.uc

@@ -32,6 +32,8 @@ simulated function Initialize(DynamicLoadOutSpec DynamicSpec, bool IsSuspect)
  	if (Level.GetEngine().EnableDevTools)
 	    log(self.Name$" >>> Initialize( "$DynamicSpec$" )");
 
+	mplog(self.Name$" >>> Initialize("$DynamicSpec$")");
+
 //     if( DynamicSpec != None )
 //     {
 //         log(self.Name$" ... Dynamic Loadout spec:");
@@ -44,17 +46,19 @@ simulated function Initialize(DynamicLoadOutSpec DynamicSpec, bool IsSuspect)
     if( DynamicSpec != None )
     {
         MutateLoadOutSpec( DynamicSpec, IsSuspect );
-
+		mplog(self.name$"...MutateLoadOutSpec");
         //log(self.Name$" ... After mutation:");
         //PrintLoadOutSpecToMPLog();
     }
 
     ValidateLoadOutSpec(IsSuspect, DynamicSpec);
+	mplog(self.name$"...ValidateLoadOutSpec");
 
     //log(self.Name$" ... After validation:");
     //PrintLoadOutSpecToMPLog();
 
     SpawnEquipmentFromLoadOutSpec(DynamicSpec);
+	mplog(self.name$"...SpawnEquipmentFromLoadOutSpec");
 
     //log(self.Name$" ... Spawned equipment:");
     //PrintLoadOutToMPLog();
@@ -112,13 +116,15 @@ simulated function bool ValidateLoadOutSpec(bool IsSuspect, DynamicLoadoutSpec D
     PrimaryAmmo = class<SwatAmmo>(LoadOutSpec[1]);
     SecondaryAmmo = class<SwatAmmo>(LoadOutSpec[3]);
 
+	mplog(self.name$"...ValidateLoadOutSpec...");
     if(DynamicSpec.GetPrimaryAmmoCount() < PrimaryAmmo.default.MinReloadsToCarry) {
       DynamicSpec.SetPrimaryAmmoCount(PrimaryAmmo.default.MinReloadsToCarry);
     }
     if(DynamicSpec.GetSecondaryAmmoCount() < SecondaryAmmo.default.MinReloadsToCarry) {
       DynamicSpec.SetSecondaryAmmoCount(SecondaryAmmo.default.MinReloadsToCarry);
     }
 
+	mplog(self.name$"...ValidateLoadOutSpec::SetPrimary/SecondaryAmmo counts");
     if(GetTotalWeight() > GetMaximumWeight() || GetTotalBulk() > GetMaximumBulk()) {
       // We are overweight. We need to completely respawn our gear from scratch.
       AssertWithDescription(false, "Loadout "$self$" exceeds maximum weight. It's getting reset to the default equipment.");
@@ -131,6 +137,7 @@ simulated function bool ValidateLoadOutSpec(bool IsSuspect, DynamicLoadoutSpec D
       }
       return true;
     }
+	mplog(self.name$"...ValidateLoadOutSpec: checked max weight");
 
     for( i = 0; i < Pocket.EnumCount; i++ )
     {
@@ -716,7 +723,7 @@ function float GetTotalWeight() {
 	local float minimum;
 
 	total = 0.0;
-	minimum = GetTotalWeight();
+	minimum = GetMinimumWeight();
 
 	for(i = 0; i < Pocket.EnumCount; i++) {
 	   	if(PocketEquipment[i] == None)

Source/Game/SwatGame/Classes/SwatGameInfo.uc

@@ -1095,7 +1095,7 @@ function AddDefaultInventory(Pawn inPlayerPawn)
             else
                 LoadOut = Spawn(class'OfficerLoadOut', PlayerPawn, 'EmptyMultiplayerSuspectLoadOut' );
 
-            log( "...In AddDefaultInventory(): loadout's owner="$LoadOut.Owner );
+            mplog( "...In AddDefaultInventory(): loadout's owner="$LoadOut.Owner );
             assert(LoadOut != None);
 
             // First, set all the pocket items in the NetPlayer loadout spec, so
@@ -1121,22 +1121,30 @@ function AddDefaultInventory(Pawn inPlayerPawn)
             // Alter it *ex post facto* to have the correct ammo counts
             LoadOutSpec.SetPrimaryAmmoCount(RepoPlayerItem.GetPrimaryAmmoCount());
             LoadOutSpec.SetSecondaryAmmoCount(RepoPlayerItem.GetSecondaryAmmoCount());
+
+			mplog("...Set ammo counts to "$RepoPlayerItem.GetPrimaryAmmoCount()$" and "$RepoPlayerItem.GetSecondaryAmmoCount());
         }
 
 		IsSuspect = theNetPlayer.GetTeamNumber() == 1;
     }
 
     LoadOut.Initialize( LoadOutSpec, IsSuspect );
 
+	mplog("LoadOut.Initialize()");
+
     PlayerPawn.ReceiveLoadOut(LoadOut);
 
+	mplog("PlayerPawn.ReceiveLoadOut");
+
     // We have to do this after ReceiveLoadOut() because that's what sets the
     // Replicated Skins.
     if ( Level.NetMode != NM_Standalone )
         theNetPlayer.InitializeReplicatedCounts();
 
     //TMC TODO do this stuff in the PlayerPawn (legacy support)
 	SetPlayerDefaults(PlayerPawn);
+
+	mplog("PlayerPawn - SetPlayerDefaults");
 }
 
 exec function MissionStatus()

System/SwatGui.ini

@@ -1,10 +1,10 @@
 [Version]
 ModName="SEF"
-ChangeNumber=6.1
+ChangeNumber=6.2
 ChangeTime="00:00:00"
 ChangeDate="2017/10/26"
-BuildTime="Thu Oct 26 2017"
+BuildTime="Sat Oct 28 2017"
 
 [SwatGui.ModInfo]
 ModName="[b]SWAT: Elite Force[\b]"
-ChangeNumber="v6.1 ([c=00FF00][b]Release[\b][\c])"
+ChangeNumber="v6.2 ([c=00FFFF][b]Test 2[\b][\c])"