fix bot roster with class limits

mastercoms · mastercoms · commit 06e4bec61f25 · 2026-02-26T00:47:50.000-05:00
diff --git a/src/game/server/tf/bot/tf_bot.cpp b/src/game/server/tf/bot/tf_bot.cpp
@@ -1173,7 +1173,7 @@ ETFClass CTFBot::GetPresetClassToSpawn() const
 	{
 		ETFClass iClass = desiredRoster[i];
 
-		if ( currentRoster.m_count[ iClass ] > classCount[ iClass ] )
+		if ( currentRoster.m_count[ iClass ] > classCount[ iClass ] || !TFGameRules()->CanBotChooseClass( const_cast< CTFBot * >( this ), iClass ) )
 		{
 			// if we have enough of this class, skip it
 			classCount[ iClass ]++;
@@ -1229,6 +1229,10 @@ const char *CTFBot::GetNextSpawnClassname( void )
 	{
 		iNextClass = (ETFClass)GetClassIndexFromString( pszForceClass );
 	}
+	if ( !TFGameRules()->CanPlayerChooseClass( const_cast< CTFBot * >( this ), iNextClass ) )
+	{
+		iNextClass = TF_CLASS_UNDEFINED;
+	}
 
 	if ( m_iReservedPlayerClass != TF_CLASS_UNDEFINED )
 	{

Original file line number	Diff line number	Diff line change
`@@ -1173,7 +1173,7 @@ ETFClass CTFBot::GetPresetClassToSpawn() const`
`1173`	`1173`	`{`
`1174`	`1174`	`ETFClass iClass = desiredRoster[i];`
`1175`	`1175`
`1176`		`- if ( currentRoster.m_count[ iClass ] > classCount[ iClass ] )`
	`1176`	`+ if ( currentRoster.m_count[ iClass ] > classCount[ iClass ] \|\| !TFGameRules()->CanBotChooseClass( const_cast< CTFBot * >( this ), iClass ) )`
`1177`	`1177`	`{`
`1178`	`1178`	`// if we have enough of this class, skip it`
`1179`	`1179`	`classCount[ iClass ]++;`
`@@ -1229,6 +1229,10 @@ const char *CTFBot::GetNextSpawnClassname( void )`
`1229`	`1229`	`{`
`1230`	`1230`	`iNextClass = (ETFClass)GetClassIndexFromString( pszForceClass );`
`1231`	`1231`	`}`
	`1232`	`+ if ( !TFGameRules()->CanPlayerChooseClass( const_cast< CTFBot * >( this ), iNextClass ) )`
	`1233`	`+ {`
	`1234`	`+ iNextClass = TF_CLASS_UNDEFINED;`
	`1235`	`+ }`
`1232`	`1236`
`1233`	`1237`	`if ( m_iReservedPlayerClass != TF_CLASS_UNDEFINED )`
`1234`	`1238`	`{`