tweak(challenge): Increase max number of general's challenge entry points to 32

Author: DayV-git

GeneralsMD/Code/GameEngine/Include/GameClient/ChallengeGenerals.h

@@ -39,7 +39,7 @@
 
 // DEFINES ////////////////////////////////////////////////////////////////////////////////////////
 //static const Int NUM_GENERALS = 12;  // ChallengeMenu.wnd dependent
-#define NUM_GENERALS (12)
+#define NUM_GENERALS (32) // TheSuperHackers @tweak DayV 21/09/2025 Increase number of challenge generals.
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp

@@ -144,6 +144,8 @@ void setEnabledButtons()
 {
 	for (Int i = 0; i < NUM_GENERALS; i++)
 	{
+		if (!buttonGeneralPosition[i]) // TheSuperHackers @tweak DayV 21/09/2025 Increase number of challenge generals.
+			continue;
 		const GeneralPersona* generals = TheChallengeGenerals->getChallengeGenerals();
 		buttonGeneralPosition[i]->winEnable(generals[i].isStartingEnabled());
 		buttonGeneralPosition[i]->winHide(! generals[i].isStartingEnabled());
@@ -238,7 +240,8 @@ void updateButtonSequence(Int stepsPerUpdate)
 	{
 		// selected look
 		Int pos = buttonSequenceStep;
-		if (pos < NUM_GENERALS && !buttonGeneralPosition[pos]->winIsHidden())
+		// TheSuperHackers @tweak DayV 21/09/2025 Increase number of challenge generals.
+		if (pos < NUM_GENERALS && buttonGeneralPosition[pos] && !buttonGeneralPosition[pos]->winIsHidden())
 		{
 			Int templateNum = ThePlayerTemplateStore->getTemplateNumByName(generals[pos].getPlayerTemplateName());
 			const PlayerTemplate *playerTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(templateNum);
@@ -247,7 +250,7 @@ void updateButtonSequence(Int stepsPerUpdate)
 		}
 
 		// mouseover look
-		if (--pos > 0 && pos < NUM_GENERALS && !buttonGeneralPosition[pos]->winIsHidden())
+		if (--pos > 0 && pos < NUM_GENERALS && buttonGeneralPosition[pos] && !buttonGeneralPosition[pos]->winIsHidden())
 		{
 			Int templateNum = ThePlayerTemplateStore->getTemplateNumByName(generals[pos].getPlayerTemplateName());
 			const PlayerTemplate *playerTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(templateNum);
@@ -256,7 +259,7 @@ void updateButtonSequence(Int stepsPerUpdate)
 		}
 
 		// regular look
-		if (--pos > 0 && pos < NUM_GENERALS && !buttonGeneralPosition[pos]->winIsHidden())
+		if (--pos > 0 && pos < NUM_GENERALS && buttonGeneralPosition[pos] && !buttonGeneralPosition[pos]->winIsHidden())
 		{
 			Int templateNum = ThePlayerTemplateStore->getTemplateNumByName(generals[pos].getPlayerTemplateName());
 			const PlayerTemplate *playerTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(templateNum);
@@ -365,10 +368,10 @@ void ChallengeMenuInit( WindowLayout *layout, void *userData )
 		strButtonName.format("ChallengeMenu.wnd:GeneralPosition%d", i);
 		buttonGeneralPositionID[i] = TheNameKeyGenerator->nameToKey( strButtonName );
 		buttonGeneralPosition[i] = TheWindowManager->winGetWindowFromId( parentMenu, buttonGeneralPositionID[i] );
-		DEBUG_ASSERTCRASH(buttonGeneralPosition[i], ("Could not find the ButtonGeneralPosition[%d]",i ));
-
-		// start all buttons hidden, then expose them later if there is a general for this spot
-		buttonGeneralPosition[i]->winHide( TRUE );
+		// TheSuperHackers @tweak DayV 21/09/2025 Increase number of challenge generals.
+		if (buttonGeneralPosition[i])
+			// start all buttons hidden, then expose them later if there is a general for this spot
+			buttonGeneralPosition[i]->winHide( TRUE );
 	}
 
 	// set defaults