Skip to content

GUI: Use AsciiString instead of const char* for nextScreen in WOL menus #92

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
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GUI: Use AsciiString instead of const char* for nextScreen in WOL menus #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ static GameWindow *comboBoxColor = NULL;

static Bool isShuttingDown = false;
static Bool buttonPushed = false;
static const char *nextScreen = NULL;
static AsciiString nextScreen;
static Bool raiseMessageBoxes = false;
static Bool isInInit = FALSE;
static const Image *selectedImage = NULL;
Expand Down Expand Up @@ -736,7 +736,7 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )
}
}

nextScreen = NULL;
nextScreen.clear();
buttonPushed = false;
isShuttingDown = false;
raiseMessageBoxes = true;
Expand Down Expand Up @@ -928,14 +928,14 @@ static void shutdownComplete( WindowLayout *layout )
layout->hide( TRUE );

// our shutdown is complete
TheShell->shutdownComplete( layout, (nextScreen != NULL) );
TheShell->shutdownComplete( layout, nextScreen.isNotEmpty() );

if (nextScreen != NULL)
if (nextScreen.isNotEmpty())
{
TheShell->push(nextScreen);
}

nextScreen = NULL;
nextScreen.clear();

}

Expand Down
10 changes: 5 additions & 5 deletions Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
static Bool isShuttingDown = FALSE;
static Bool buttonPushed = FALSE;
static const char *nextScreen = NULL;
static AsciiString nextScreen;

// window ids ------------------------------------------------------------------------------
static NameKeyType parentWOLWelcomeID = NAMEKEY_INVALID;
Expand Down Expand Up @@ -192,14 +192,14 @@ static void shutdownComplete( WindowLayout *layout )
layout->hide( TRUE );

// our shutdown is complete
TheShell->shutdownComplete( layout, (nextScreen != NULL) );
TheShell->shutdownComplete( layout, nextScreen.isNotEmpty() );

if (nextScreen != NULL)
if (nextScreen.isNotEmpty())
{
TheShell->push(nextScreen);
}

nextScreen = NULL;
nextScreen.clear();

}

Expand Down Expand Up @@ -401,7 +401,7 @@ static Bool raiseMessageBoxes = FALSE;
//-------------------------------------------------------------------------------------------------
void WOLWelcomeMenuInit( WindowLayout *layout, void *userData )
{
nextScreen = NULL;
nextScreen.clear();
buttonPushed = FALSE;
isShuttingDown = FALSE;

Expand Down
10 changes: 5 additions & 5 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ static GameWindow *comboBoxColor = NULL;

static Bool isShuttingDown = false;
static Bool buttonPushed = false;
static const char *nextScreen = NULL;
static AsciiString nextScreen;
static Bool raiseMessageBoxes = false;
static Bool isInInit = FALSE;
static const Image *selectedImage = NULL;
Expand Down Expand Up @@ -860,7 +860,7 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )
}
}

nextScreen = NULL;
nextScreen.clear();
buttonPushed = false;
isShuttingDown = false;
raiseMessageBoxes = true;
Expand Down Expand Up @@ -1291,14 +1291,14 @@ static void shutdownComplete( WindowLayout *layout )
layout->hide( TRUE );

// our shutdown is complete
TheShell->shutdownComplete( layout, (nextScreen != NULL) );
TheShell->shutdownComplete( layout, nextScreen.isNotEmpty() );

if (nextScreen != NULL)
if (nextScreen.isNotEmpty())
{
TheShell->push(nextScreen);
}

nextScreen = NULL;
nextScreen.clear();

}

Expand Down
10 changes: 5 additions & 5 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
// PRIVATE DATA ///////////////////////////////////////////////////////////////////////////////////
static Bool isShuttingDown = FALSE;
static Bool buttonPushed = FALSE;
static const char *nextScreen = NULL;
static AsciiString nextScreen;

// window ids ------------------------------------------------------------------------------
static NameKeyType parentWOLWelcomeID = NAMEKEY_INVALID;
Expand Down Expand Up @@ -195,14 +195,14 @@ static void shutdownComplete( WindowLayout *layout )
layout->hide( TRUE );

// our shutdown is complete
TheShell->shutdownComplete( layout, (nextScreen != NULL) );
TheShell->shutdownComplete( layout, nextScreen.isNotEmpty() );

if (nextScreen != NULL)
if (nextScreen.isNotEmpty())
{
TheShell->push(nextScreen);
}

nextScreen = NULL;
nextScreen.clear();

}

Expand Down Expand Up @@ -492,7 +492,7 @@ void WOLWelcomeMenuInit( WindowLayout *layout, void *userData )
{
updateNumPlayersOnline();

nextScreen = NULL;
nextScreen.clear();
buttonPushed = FALSE;
isShuttingDown = FALSE;

Expand Down
Loading