Skip to content

GUI: Add null checks for TheMappedImageCollection before using it #84

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
+81 −42
Open

GUI: Add null checks for TheMappedImageCollection before using it #84

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
23 changes: 19 additions & 4 deletions Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,10 @@ void ShellGameLoadScreen::init( GameInfo *game )

if(m_loadScreen && firstLoad && TheGameLODManager && TheGameLODManager->didMemPass())
{
m_loadScreen->winSetEnabledImage(0, TheMappedImageCollection->findImageByName("TitleScreen"));
if (TheMappedImageCollection)
{
m_loadScreen->winSetEnabledImage(0, TheMappedImageCollection->findImageByName("TitleScreen"));
}
TheWritableGlobalData->m_breakTheMovie = FALSE;

GameWindow *win = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "ShellGameLoadScreen.wnd:StaticTextLegal" ) ));
Expand Down Expand Up @@ -720,7 +723,11 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
pt = ThePlayerTemplateStore->getNthPlayerTemplate(lSlot->getPlayerTemplate());
else
pt = ThePlayerTemplateStore->findPlayerTemplate( TheNameKeyGenerator->nameToKey("FactionObserver") );
const Image *loadScreenImage = TheMappedImageCollection->findImageByName(pt->getLoadScreen());
const Image *loadScreenImage = NULL;
if (TheMappedImageCollection)
{
loadScreenImage = TheMappedImageCollection->findImageByName(pt->getLoadScreen());
}


AsciiString musicName = pt->getLoadScreenMusic();
Expand Down Expand Up @@ -956,7 +963,11 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
pt = ThePlayerTemplateStore->getNthPlayerTemplate(lSlot->getPlayerTemplate());
else
pt = ThePlayerTemplateStore->findPlayerTemplate( TheNameKeyGenerator->nameToKey("FactionObserver") );
const Image *loadScreenImage = TheMappedImageCollection->findImageByName(pt->getLoadScreen());
const Image *loadScreenImage = NULL;
if (TheMappedImageCollection)
{
loadScreenImage = TheMappedImageCollection->findImageByName(pt->getLoadScreen());
}
if(loadScreenImage)
m_loadScreen->winSetEnabledImage(0, loadScreenImage);

Expand Down Expand Up @@ -1047,7 +1058,11 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
Bool isPreorder = TheGameSpyInfo->didPlayerPreorder(stats.id);
Int rankPoints = CalculateRank(stats);
Int favSide = GetFavoriteSide(stats);
const Image *preorderImg = TheMappedImageCollection->findImageByName("OfficersClubsmall");
const Image *preorderImg = NULL;
if (TheMappedImageCollection)
{
preorderImg = TheMappedImageCollection->findImageByName("OfficersClubsmall");
}
if (!isPreorder)
preorderImg = NULL;
const Image *rankImg = LookupSmallRankImage(favSide, rankPoints);
Expand Down
100 changes: 62 additions & 38 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,22 +512,25 @@ void SinglePlayerLoadScreen::init( GameInfo *game )
// and set the background image
AsciiString campaignName = TheCampaignManager->getCurrentCampaign()->m_name;
GameWindow *backgroundWin = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "SinglePlayerLoadScreen.wnd:ParentSinglePlayerLoadScreen" ) ));
if (campaignName.compareNoCase("USA") == 0)
if (TheMappedImageCollection)
{
backgroundWin->winSetEnabledImage( 0, TheMappedImageCollection->findImageByName("MissionLoad_USA") );
m_progressBar->winSetEnabledImage( 6, TheMappedImageCollection->findImageByName("LoadingBar_ProgressCenter2") );
}
else if (campaignName.compareNoCase("GLA") == 0)
{
backgroundWin->winSetEnabledImage( 0, TheMappedImageCollection->findImageByName("MissionLoad_GLA") );
m_progressBar->winSetEnabledImage( 6, TheMappedImageCollection->findImageByName("LoadingBar_ProgressCenter3") );
}
else if (campaignName.compareNoCase("China") == 0)
{
backgroundWin->winSetEnabledImage( 0, TheMappedImageCollection->findImageByName("MissionLoad_China") );
m_progressBar->winSetEnabledImage( 6, TheMappedImageCollection->findImageByName("LoadingBar_ProgressCenter1") );
if (campaignName.compareNoCase("USA") == 0)
{
backgroundWin->winSetEnabledImage( 0, TheMappedImageCollection->findImageByName("MissionLoad_USA") );
m_progressBar->winSetEnabledImage( 6, TheMappedImageCollection->findImageByName("LoadingBar_ProgressCenter2") );
}
else if (campaignName.compareNoCase("GLA") == 0)
{
backgroundWin->winSetEnabledImage( 0, TheMappedImageCollection->findImageByName("MissionLoad_GLA") );
m_progressBar->winSetEnabledImage( 6, TheMappedImageCollection->findImageByName("LoadingBar_ProgressCenter3") );
}
else if (campaignName.compareNoCase("China") == 0)
{
backgroundWin->winSetEnabledImage( 0, TheMappedImageCollection->findImageByName("MissionLoad_China") );
m_progressBar->winSetEnabledImage( 6, TheMappedImageCollection->findImageByName("LoadingBar_ProgressCenter1") );
}
// else leave the default background screen
}
// else leave the default background screen


if(TheGameLODManager && TheGameLODManager->didMemPass())
Expand Down Expand Up @@ -1198,7 +1201,10 @@ void ShellGameLoadScreen::init( GameInfo *game )

if(m_loadScreen && firstLoad && TheGameLODManager && TheGameLODManager->didMemPass())
{
m_loadScreen->winSetEnabledImage(0, TheMappedImageCollection->findImageByName("TitleScreen"));
if (TheMappedImageCollection)
{
m_loadScreen->winSetEnabledImage(0, TheMappedImageCollection->findImageByName("TitleScreen"));
}
TheWritableGlobalData->m_breakTheMovie = FALSE;

GameWindow *win = TheWindowManager->winGetWindowFromId( m_loadScreen,TheNameKeyGenerator->nameToKey( AsciiString( "ShellGameLoadScreen.wnd:StaticTextLegal" ) ));
Expand Down Expand Up @@ -1298,14 +1304,17 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
{
// the main original factions don't have associated generals
AsciiString imageName;
if (pt->getName() == "FactionAmerica")
portrait = TheMappedImageCollection->findImageByName("SAFactionLogoLg_US");
else if (pt->getName() == "FactionGLA")
portrait = TheMappedImageCollection->findImageByName("SUFactionLogoLg_GLA");
else if (pt->getName() == "FactionChina")
portrait = TheMappedImageCollection->findImageByName("SNFactionLogoLg_China");
else
DEBUG_ASSERTCRASH(NULL, ("Unexpected player template"));
if (TheMappedImageCollection)
{
if (pt->getName() == "FactionAmerica")
portrait = TheMappedImageCollection->findImageByName("SAFactionLogoLg_US");
else if (pt->getName() == "FactionGLA")
portrait = TheMappedImageCollection->findImageByName("SUFactionLogoLg_GLA");
else if (pt->getName() == "FactionChina")
portrait = TheMappedImageCollection->findImageByName("SNFactionLogoLg_China");
else
DEBUG_ASSERTCRASH(NULL, ("Unexpected player template"));
}

localName = pt->getDisplayName();
}
Expand Down Expand Up @@ -1383,9 +1392,13 @@ void MultiPlayerLoadScreen::init( GameInfo *game )
// format the progress bar to house colors
AsciiString imageName;
imageName.format("LoadingBar_ProgressCenter%d", slot->getApparentColor());
const Image *houseImage = TheMappedImageCollection->findImageByName(imageName);
if (! houseImage)
houseImage = TheMappedImageCollection->findImageByName("LoadingBar_Progress");
const Image *houseImage = NULL;
if (TheMappedImageCollection)
{
houseImage = TheMappedImageCollection->findImageByName(imageName);
if (! houseImage)
houseImage = TheMappedImageCollection->findImageByName("LoadingBar_Progress");
}
m_progressBars[netSlot]->winSetEnabledImage( 6, houseImage );

UnicodeString name = slot->getName();
Expand Down Expand Up @@ -1577,14 +1590,17 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
{
// the main original factions don't have associated generals
AsciiString imageName;
if (pt->getName() == "FactionAmerica")
portrait = TheMappedImageCollection->findImageByName("SAFactionLogo144_US");
else if (pt->getName() == "FactionGLA")
portrait = TheMappedImageCollection->findImageByName("SUFactionLogo144_GLA");
else if (pt->getName() == "FactionChina")
portrait = TheMappedImageCollection->findImageByName("SNFactionLogo144_China");
else
DEBUG_ASSERTCRASH(NULL, ("Unexpected player template"));
if (TheMappedImageCollection)
{
if (pt->getName() == "FactionAmerica")
portrait = TheMappedImageCollection->findImageByName("SAFactionLogo144_US");
else if (pt->getName() == "FactionGLA")
portrait = TheMappedImageCollection->findImageByName("SUFactionLogo144_GLA");
else if (pt->getName() == "FactionChina")
portrait = TheMappedImageCollection->findImageByName("SNFactionLogo144_China");
else
DEBUG_ASSERTCRASH(NULL, ("Unexpected player template"));
}

localName = pt->getDisplayName();
}
Expand Down Expand Up @@ -1674,9 +1690,13 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
// format the progress bar to house colors
AsciiString imageName;
imageName.format("LoadingBar_ProgressCenter%d", slot->getApparentColor());
const Image *houseImage = TheMappedImageCollection->findImageByName(imageName);
if (! houseImage)
houseImage = TheMappedImageCollection->findImageByName("LoadingBar_Progress");
const Image *houseImage = NULL;
if (TheMappedImageCollection)
{
houseImage = TheMappedImageCollection->findImageByName(imageName);
if (! houseImage)
houseImage = TheMappedImageCollection->findImageByName("LoadingBar_Progress");
}
m_progressBars[netSlot]->winSetEnabledImage( 6, houseImage );

UnicodeString name = slot->getName();
Expand Down Expand Up @@ -1707,7 +1727,11 @@ GameSlot *lSlot = game->getSlot(game->getLocalSlotNum());
Int rankPoints = CalculateRank(stats);
Int favSide = GetFavoriteSide(stats);

const Image *preorderImg = TheMappedImageCollection->findImageByName("OfficersClubsmall");
const Image *preorderImg = NULL;
if (TheMappedImageCollection)
{
preorderImg = TheMappedImageCollection->findImageByName("OfficersClubsmall");
}
if (!isPreorder)
preorderImg = NULL;
const Image *rankImg = LookupSmallRankImage(favSide, rankPoints);
Expand Down
Loading