Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DayV-git wants to merge 5 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
986a277
tweak(challenge): Increase max number of general's challenge entry po…
DayV-git Sep 21, 2025
5ac8d9a
tweak(challenge): Remove comments and tidy
DayV-git Oct 4, 2025
6398c9f
tweak(challenge): Refactor general position handling to dynamically a…
DayV-git Jan 25, 2026
daad0af
Merge branch 'main' into feat/increase-gen-challenges
DayV-git Jan 25, 2026
2755dd3
fix(challenge): Replace NULL with nullptr
DayV-git Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Include/GameClient/ChallengeGenerals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,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 /////////////////////////////////////////////////////////////////////////////
class Image;
Expand Down
163 changes: 104 additions & 59 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static NameKeyType bioNameEntryID = NAMEKEY_INVALID;
static NameKeyType bioDOBEntryID = NAMEKEY_INVALID;
static NameKeyType bioBirthplaceEntryID = NAMEKEY_INVALID;
static NameKeyType bioStrategyEntryID = NAMEKEY_INVALID;
static NameKeyType buttonGeneralPositionID[NUM_GENERALS] = {NAMEKEY_INVALID};
static NameKeyType *buttonGeneralPositionID = nullptr;
static NameKeyType backdropID = NAMEKEY_INVALID;
static NameKeyType bioParentID = NAMEKEY_INVALID;

Expand All @@ -84,7 +84,7 @@ static GameWindow *bioLine1Entry = nullptr;
static GameWindow *bioLine2Entry = nullptr;
static GameWindow *bioLine3Entry = nullptr;
static GameWindow *bioLine4Entry = nullptr;
static GameWindow *buttonGeneralPosition[NUM_GENERALS] = {nullptr};
static GameWindow **buttonGeneralPosition = nullptr;
static GameWindow *backdrop = nullptr;
static GameWindow *bioParent = nullptr;

Expand All @@ -101,6 +101,9 @@ static Int lastButtonIndex = -1;
Int lastHilitedIndex = -1;
Bool isAutoSelecting = FALSE;

// TheSuperHackers @tweak DayV 15/11/2025 Dynamically find number of challenge generals.
static Int g_numGenerals = 0;

// for use by the teletype style bio text display
UnicodeString bioLine1;
UnicodeString bioLine2;
Expand Down Expand Up @@ -128,12 +131,12 @@ static Bool hasPlayedIntroAudio = FALSE;
//-------------------------------------------------------------------------------------------------
Int findPositionButton( Int controlID )
{
for (Int i = 0; i < NUM_GENERALS; i++)
{
if (controlID == buttonGeneralPositionID[i])
return i;
}
return -1;
for (Int i = 0; i < g_numGenerals; i++)
{
if (buttonGeneralPositionID && controlID == buttonGeneralPositionID[i])
return i;
}
return -1;
}


Expand All @@ -142,11 +145,17 @@ Int findPositionButton( Int controlID )
//-------------------------------------------------------------------------------------------------
void setEnabledButtons()
{
for (Int i = 0; i < NUM_GENERALS; i++)
{
const GeneralPersona* generals = TheChallengeGenerals->getChallengeGenerals();
buttonGeneralPosition[i]->winEnable(generals[i].isStartingEnabled());
buttonGeneralPosition[i]->winHide(! generals[i].isStartingEnabled());
if (!buttonGeneralPosition || g_numGenerals <= 0)
return;

for (Int i = 0; i < g_numGenerals; i++)
{
if (!buttonGeneralPosition[i])
continue;

const GeneralPersona* generals = TheChallengeGenerals->getChallengeGenerals();
buttonGeneralPosition[i]->winEnable(generals[i].isStartingEnabled());
buttonGeneralPosition[i]->winHide(! generals[i].isStartingEnabled());

Int templateNum = ThePlayerTemplateStore->getTemplateNumByName(generals[i].getPlayerTemplateName());
const PlayerTemplate *playerTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(templateNum);
Expand Down Expand Up @@ -174,8 +183,8 @@ void setEnabledButtons()
//-------------------------------------------------------------------------------------------------
void setGeneralCampaign( Int buttonIndex )
{
if (buttonIndex < 0 || buttonIndex >= NUM_GENERALS)
return;
if (buttonIndex < 0 || buttonIndex >= g_numGenerals)
return;

// determine which general and player template is selected and store it
const GeneralPersona* generals = TheChallengeGenerals->getChallengeGenerals();
Expand All @@ -197,8 +206,8 @@ void setGeneralCampaign( Int buttonIndex )
//-------------------------------------------------------------------------------------------------
void setGeneralBio( Int buttonIndex )
{
if (buttonIndex < 0 || buttonIndex >= NUM_GENERALS)
return;
if (buttonIndex < 0 || buttonIndex >= g_numGenerals)
return;

// this is hidden until the a bio is set
// @todo: use a fancy transition
Expand Down Expand Up @@ -228,41 +237,41 @@ void setGeneralBio( Int buttonIndex )
//-------------------------------------------------------------------------------------------------
void updateButtonSequence(Int stepsPerUpdate)
{
const static Int cleanupStates = 2;
if (buttonSequenceStep > NUM_GENERALS + cleanupStates)
return;
const static Int cleanupStates = 2;
if (buttonSequenceStep > g_numGenerals + cleanupStates)
return;

const GeneralPersona* generals = TheChallengeGenerals->getChallengeGenerals();

for (Int i = 0; i < stepsPerUpdate; i++)
{
// selected look
Int pos = buttonSequenceStep;
if (pos < NUM_GENERALS && !buttonGeneralPosition[pos]->winIsHidden())
{
Int templateNum = ThePlayerTemplateStore->getTemplateNumByName(generals[pos].getPlayerTemplateName());
const PlayerTemplate *playerTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(templateNum);
if (playerTemplate)
GadgetCheckBoxSetEnabledImage( buttonGeneralPosition[pos], TheMappedImageCollection->findImageByName( playerTemplate->getMedallionSelected() ) );
}

// mouseover look
if (--pos > 0 && pos < NUM_GENERALS && !buttonGeneralPosition[pos]->winIsHidden())
{
Int templateNum = ThePlayerTemplateStore->getTemplateNumByName(generals[pos].getPlayerTemplateName());
const PlayerTemplate *playerTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(templateNum);
if (playerTemplate)
GadgetCheckBoxSetEnabledImage( buttonGeneralPosition[pos], TheMappedImageCollection->findImageByName( playerTemplate->getMedallionHilite() ) );
}

// regular look
if (--pos > 0 && pos < NUM_GENERALS && !buttonGeneralPosition[pos]->winIsHidden())
{
Int templateNum = ThePlayerTemplateStore->getTemplateNumByName(generals[pos].getPlayerTemplateName());
const PlayerTemplate *playerTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(templateNum);
if (playerTemplate)
GadgetCheckBoxSetEnabledImage( buttonGeneralPosition[pos], TheMappedImageCollection->findImageByName( playerTemplate->getMedallionNormal() ) );
}
for (Int i = 0; i < stepsPerUpdate; i++)
{
// selected look
Int pos = buttonSequenceStep;
if (pos < g_numGenerals && buttonGeneralPosition[pos] && !buttonGeneralPosition[pos]->winIsHidden())
{
Int templateNum = ThePlayerTemplateStore->getTemplateNumByName(generals[pos].getPlayerTemplateName());
const PlayerTemplate *playerTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(templateNum);
if (playerTemplate)
GadgetCheckBoxSetEnabledImage( buttonGeneralPosition[pos], TheMappedImageCollection->findImageByName( playerTemplate->getMedallionSelected() ) );
}

// mouseover look
if (--pos > 0 && pos < g_numGenerals && buttonGeneralPosition[pos] && !buttonGeneralPosition[pos]->winIsHidden())
{
Int templateNum = ThePlayerTemplateStore->getTemplateNumByName(generals[pos].getPlayerTemplateName());
const PlayerTemplate *playerTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(templateNum);
if (playerTemplate)
GadgetCheckBoxSetEnabledImage( buttonGeneralPosition[pos], TheMappedImageCollection->findImageByName( playerTemplate->getMedallionHilite() ) );
}

// regular look
if (--pos > 0 && pos < g_numGenerals && buttonGeneralPosition[pos] && !buttonGeneralPosition[pos]->winIsHidden())
{
Int templateNum = ThePlayerTemplateStore->getTemplateNumByName(generals[pos].getPlayerTemplateName());
const PlayerTemplate *playerTemplate = ThePlayerTemplateStore->getNthPlayerTemplate(templateNum);
if (playerTemplate)
GadgetCheckBoxSetEnabledImage( buttonGeneralPosition[pos], TheMappedImageCollection->findImageByName( playerTemplate->getMedallionNormal() ) );
}

buttonSequenceStep++;
}
Expand Down Expand Up @@ -359,18 +368,42 @@ void ChallengeMenuInit( WindowLayout *layout, void *userData )
bioParentID = TheNameKeyGenerator->nameToKey( "ChallengeMenu.wnd:GeneralsBioParent" );
bioParent = TheWindowManager->winGetWindowFromId( parentMenu, bioParentID);

AsciiString strButtonName;
for (Int i = 0; i < NUM_GENERALS; i++)
{
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 ));
Copy link

@xezon xezon Sep 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Author

@DayV-git DayV-git Oct 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I know how to do this properly but will give it a go. Everything else has been fixed

Copy link

@xezon xezon Oct 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We believe in you 🙏


// start all buttons hidden, then expose them later if there is a general for this spot
buttonGeneralPosition[i]->winHide( TRUE );
AsciiString strButtonName;
g_numGenerals = 0;
while (true)
{
strButtonName.format("ChallengeMenu.wnd:GeneralPosition%d", g_numGenerals);
NameKeyType key = TheNameKeyGenerator->nameToKey(strButtonName);
GameWindow *win = TheWindowManager->winGetWindowFromId(parentMenu, key);

if (!win)
break;
++g_numGenerals;
}

if (g_numGenerals > 0)
{
buttonGeneralPositionID = new NameKeyType[g_numGenerals];
buttonGeneralPosition = new GameWindow*[g_numGenerals];
}
else
{
buttonGeneralPositionID = nullptr;
buttonGeneralPosition = nullptr;
}

for (Int i = 0; i < g_numGenerals; i++)
{
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
if (buttonGeneralPosition[i])
buttonGeneralPosition[i]->winHide( TRUE );
}

// set defaults
bioParent->winHide(TRUE);
buttonPlay->winHide(TRUE);
Expand Down Expand Up @@ -461,6 +494,18 @@ void ChallengeMenuShutdown( WindowLayout *layout, void *userData )

buttonSequenceStep = 0;

if (buttonGeneralPosition)
{
delete [] buttonGeneralPosition;
buttonGeneralPosition = nullptr;
}
if (buttonGeneralPositionID)
{
delete [] buttonGeneralPositionID;
buttonGeneralPositionID = nullptr;
}
g_numGenerals = 0;

Bool popImmediate = *(Bool *)userData;
if( popImmediate )
{
Expand Down
Loading