Implement ValveSoftware#1434

Author: Bitl

src/game/server/tf/tf_player.cpp

@@ -7129,20 +7129,46 @@ void CTFPlayer::HandleCommand_JoinClass( const char *pClassName, bool bAllowSpaw
 	}
 	else
 	{
+#ifdef BDSBASE
+		int iChoices = 0;
+		int iClasses[TF_LAST_NORMAL_CLASS - 1] = {}; // -1 to remove the civilian from the randomness
+		int iCurrentClass = GetPlayerClass()->GetClassIndex();
+
+		for (iClass = TF_FIRST_NORMAL_CLASS; iClass < TF_LAST_NORMAL_CLASS; iClass++)
+		{
+			if (iClass != iCurrentClass && TFGameRules()->CanPlayerChooseClass(this, iClass))
+			{
+				iClasses[iChoices++] = iClass;
+			}
+		}
+
+		if (!iChoices)
+		{
+			if (TFGameRules()->CanPlayerChooseClass(this, iCurrentClass))
+				return;
+
+			// We failed to find a random class. Bring up the class menu again.
+			ShowViewPortPanel((GetTeamNumber() == TF_TEAM_RED) ? PANEL_CLASS_RED : PANEL_CLASS_BLUE);
+			return;
+		}
+
+		iClass = iClasses[random->RandomInt(0, iChoices - 1)];
+#else
 		int iTries = 20;
 		// The player has selected Random class...so let's pick one for them.
-		do{
+		do {
 			// Don't let them be the same class twice in a row
-			iClass = random->RandomInt( TF_FIRST_NORMAL_CLASS, TF_LAST_NORMAL_CLASS - 1 ); // -1 to remove the civilian from the randomness
+			iClass = random->RandomInt(TF_FIRST_NORMAL_CLASS, TF_LAST_NORMAL_CLASS - 1); // -1 to remove the civilian from the randomness
 			iTries--;
-		} while( iClass == GetPlayerClass()->GetClassIndex() || (iTries > 0 && !TFGameRules()->CanPlayerChooseClass(this,iClass)) );
+		} while (iClass == GetPlayerClass()->GetClassIndex() || (iTries > 0 && !TFGameRules()->CanPlayerChooseClass(this, iClass)));
 
-		if ( iTries <= 0 )
+		if (iTries <= 0)
 		{
 			// We failed to find a random class. Bring up the class menu again.
-			ShowViewPortPanel( ( GetTeamNumber() == TF_TEAM_RED ) ? PANEL_CLASS_RED : PANEL_CLASS_BLUE );
+			ShowViewPortPanel((GetTeamNumber() == TF_TEAM_RED) ? PANEL_CLASS_RED : PANEL_CLASS_BLUE);
 			return;
 		}
+#endif
 	}
 
 	if ( TFGameRules() && TFGameRules()->State_Get() == GR_STATE_RND_RUNNING )