tweak(challenge): Increase max number of general's challenge entry points to 32 #1615
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xezon
reviewed
Sep 22, 2025
GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp
Outdated
Show resolved
Hide resolved
| 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 )); |
There was a problem hiding this comment.
I think this implementation can be better. On runtime we can determine the number of generals challenges like so:
NumGenerals = 0;
while (true)
{
strButtonName.format("ChallengeMenu.wnd:GeneralPosition%d", NumGenerals);
NameKey nameKey = TheNameKeyGenerator->nameToKey( strButtonName );
GameWindow* window = TheWindowManager->winGetWindowFromId( parentMenu, nameKey );
++numGenerals;
if (window == NULL)
break;
}
buttonGeneralPositionID = new GameWindow*[NumGenerals];
buttonGeneralPosition = new GameWindow*[NumGenerals];
for (Int i = 0; i < NumGenerals; ++i)
{
strButtonName.format("ChallengeMenu.wnd:GeneralPosition%d", i);
buttonGeneralPositionID[i] = TheNameKeyGenerator->nameToKey( strButtonName );
buttonGeneralPosition[i] = TheWindowManager->winGetWindowFromId( parentMenu, nameKey );
}This way there needs to be no number cap.
There was a problem hiding this comment.
I'm not sure I know how to do this properly but will give it a go. Everything else has been fixed
Skyaero42
requested changes
Sep 22, 2025
GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Increases maximum number of potential generals challenges (visible on menu) to 32. This allows for mods where the number of player templates is unchanged, but there are variations of general's challenges for each faction.
The choice of 32 was an arbitrary nice number. Current use case would be 15.
Increase of
NUM_GENERALSis coupled with skipping button logic wherebuttonGeneralPositionhas null entries.