Skip to content

Commit 146f7ce

Browse files
xezonxezon
committed
fix(loadscreen): Fix missing pointer initialization in constructors of MultiPlayerLoadScreen, GameSpyLoadScreen and remove superfluous code from destructors of LoadScreen classes (#2332)
1 parent d873f65 commit 146f7ce

2 files changed

Lines changed: 6 additions & 132 deletions

File tree

‎Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp‎

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,8 @@ LoadScreen::LoadScreen( void )
132132

133133
LoadScreen::~LoadScreen( void )
134134
{
135-
//if(m_loadScreen)
136-
// delete (m_loadScreen);
137135
if(m_loadScreen)
138136
TheWindowManager->winDestroy( m_loadScreen );
139-
m_loadScreen = nullptr;
140137
}
141138

142139
void LoadScreen::update( Int percent )
@@ -171,24 +168,14 @@ SinglePlayerLoadScreen::SinglePlayerLoadScreen( void )
171168

172169
SinglePlayerLoadScreen::~SinglePlayerLoadScreen( void )
173170
{
174-
m_progressBar = nullptr;
175-
m_percent = nullptr;
176-
m_objectiveWin = nullptr;
177-
for(Int i = 0; i < MAX_OBJECTIVE_LINES; ++i)
178-
m_objectiveLines[i] = nullptr;
179-
180171
delete m_videoBuffer;
181-
m_videoBuffer = nullptr;
182172

183173
if ( m_videoStream )
184174
{
185175
m_videoStream->close();
186-
m_videoStream = nullptr;
187176
}
188177

189178
TheAudio->removeAudioEvent( m_ambientLoopHandle );
190-
m_ambientLoopHandle = 0;
191-
192179
}
193180

194181
void SinglePlayerLoadScreen::moveWindows( Int frame )
@@ -622,8 +609,6 @@ ShellGameLoadScreen::ShellGameLoadScreen( void )
622609

623610
ShellGameLoadScreen::~ShellGameLoadScreen( void )
624611
{
625-
626-
m_progressBar = nullptr;
627612
}
628613

629614
void ShellGameLoadScreen::init( GameInfo *game )
@@ -694,14 +679,6 @@ MultiPlayerLoadScreen::~MultiPlayerLoadScreen( void )
694679
m_mapPreview->winSetUserData(nullptr);
695680
}
696681

697-
for(Int i = 0; i < MAX_SLOTS; ++i)
698-
{
699-
m_progressBars[i] = nullptr;
700-
m_playerNames[i] = nullptr;
701-
m_playerSide[i]= nullptr;
702-
m_playerLookup[i] = -1;
703-
}
704-
705682
TheAudio->removeAudioEvent( AHSV_StopTheMusicFade );
706683
// TheAudio->stopAudio( AudioAffect_Music );
707684
}
@@ -918,18 +895,6 @@ GameSpyLoadScreen::~GameSpyLoadScreen( void )
918895
{
919896
m_mapPreview->winSetUserData(nullptr);
920897
}
921-
922-
for(Int i = 0; i < MAX_SLOTS; ++i)
923-
{
924-
m_progressBars[i] = nullptr;
925-
m_playerNames[i] = nullptr;
926-
m_playerSide[i]= nullptr;
927-
m_playerLookup[i] = -1;
928-
m_playerFavoriteFactions[i]= nullptr;
929-
m_playerTotalDisconnects[i]= nullptr;
930-
m_playerWin[i]= nullptr;
931-
m_playerWinLosses[i]= nullptr;
932-
}
933898
}
934899

935900
extern Int GetAdditionalDisconnectsFromUserFile(Int playerID);
@@ -1228,16 +1193,6 @@ MapTransferLoadScreen::MapTransferLoadScreen( void )
12281193

12291194
MapTransferLoadScreen::~MapTransferLoadScreen( void )
12301195
{
1231-
for(Int i = 0; i < MAX_SLOTS; ++i)
1232-
{
1233-
m_progressBars[i] = nullptr;
1234-
m_playerNames[i] = nullptr;
1235-
m_progressText[i]= nullptr;
1236-
m_playerLookup[i] = -1;
1237-
m_oldProgress[i] = -1;
1238-
}
1239-
m_fileNameText = nullptr;
1240-
m_timeoutText = nullptr;
12411196
}
12421197

12431198
void MapTransferLoadScreen::init( GameInfo *game )

‎GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp‎

Lines changed: 6 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,8 @@ LoadScreen::LoadScreen( void )
150150

151151
LoadScreen::~LoadScreen( void )
152152
{
153-
//if(m_loadScreen)
154-
// delete (m_loadScreen);
155153
if(m_loadScreen)
156154
TheWindowManager->winDestroy( m_loadScreen );
157-
m_loadScreen = nullptr;
158155
}
159156

160157
void LoadScreen::update( Int percent )
@@ -192,24 +189,14 @@ SinglePlayerLoadScreen::SinglePlayerLoadScreen( void )
192189

193190
SinglePlayerLoadScreen::~SinglePlayerLoadScreen( void )
194191
{
195-
m_progressBar = nullptr;
196-
m_percent = nullptr;
197-
m_objectiveWin = nullptr;
198-
for(Int i = 0; i < MAX_OBJECTIVE_LINES; ++i)
199-
m_objectiveLines[i] = nullptr;
200-
201192
delete m_videoBuffer;
202-
m_videoBuffer = nullptr;
203193

204194
if ( m_videoStream )
205195
{
206196
m_videoStream->close();
207-
m_videoStream = nullptr;
208197
}
209198

210199
TheAudio->removeAudioEvent( m_ambientLoopHandle );
211-
m_ambientLoopHandle = 0;
212-
213200
}
214201

215202
void SinglePlayerLoadScreen::moveWindows( Int frame )
@@ -687,54 +674,16 @@ ChallengeLoadScreen::ChallengeLoadScreen( void )
687674

688675
ChallengeLoadScreen::~ChallengeLoadScreen( void )
689676
{
690-
m_progressBar = nullptr;
691-
692677
delete m_videoBuffer;
693-
m_videoBuffer = nullptr;
694678

695679
if ( m_videoStream )
696680
{
697681
m_videoStream->close();
698-
m_videoStream = nullptr;
699682
}
700683

701-
m_bioNameLeft = nullptr;
702-
m_bioAgeLeft = nullptr;
703-
m_bioBirthplaceLeft = nullptr;
704-
m_bioStrategyLeft = nullptr;
705-
m_bioBigNameEntryLeft = nullptr;
706-
m_bioNameEntryLeft = nullptr;
707-
m_bioAgeEntryLeft = nullptr;
708-
m_bioBirthplaceEntryLeft = nullptr;
709-
m_bioStrategyEntryLeft = nullptr;
710-
m_bioBigNameEntryRight = nullptr;
711-
m_bioNameRight = nullptr;
712-
m_bioAgeRight = nullptr;
713-
m_bioBirthplaceRight = nullptr;
714-
m_bioStrategyRight = nullptr;
715-
m_bioNameEntryRight = nullptr;
716-
m_bioAgeEntryRight = nullptr;
717-
m_bioBirthplaceEntryRight = nullptr;
718-
m_bioStrategyEntryRight = nullptr;
719-
720-
m_portraitLeft = nullptr;
721-
m_portraitRight = nullptr;
722-
m_portraitMovieLeft = nullptr;
723-
m_portraitMovieRight = nullptr;
724-
725-
// m_overlayReticleCrosshairs = nullptr;
726-
// m_overlayReticleCircleLineOuter = nullptr;
727-
// m_overlayReticleCircleLineInner = nullptr;
728-
m_overlayReticleCircleAlphaOuter = nullptr;
729-
m_overlayReticleCircleAlphaInner = nullptr;
730-
m_overlayVsBackdrop = nullptr;
731-
m_overlayVs = nullptr;
732-
733684
delete m_wndVideoManager;
734-
m_wndVideoManager = nullptr;
735685

736686
TheAudio->removeAudioEvent( m_ambientLoopHandle );
737-
m_ambientLoopHandle = 0;
738687
}
739688

740689
// accepts the number of chars to advance, the window we're concerned with, the total text for final display, and the current position of the readout
@@ -1184,8 +1133,6 @@ ShellGameLoadScreen::ShellGameLoadScreen( void )
11841133

11851134
ShellGameLoadScreen::~ShellGameLoadScreen( void )
11861135
{
1187-
1188-
m_progressBar = nullptr;
11891136
}
11901137

11911138
void ShellGameLoadScreen::init( GameInfo *game )
@@ -1238,6 +1185,9 @@ void ShellGameLoadScreen::update( Int percent )
12381185
MultiPlayerLoadScreen::MultiPlayerLoadScreen( void )
12391186
{
12401187
m_mapPreview = nullptr;
1188+
m_portraitLocalGeneral = nullptr;
1189+
m_featuresLocalGeneral = nullptr;
1190+
m_nameLocalGeneral = nullptr;
12411191

12421192
for(Int i = 0; i < MAX_SLOTS; ++i)
12431193
{
@@ -1256,18 +1206,6 @@ MultiPlayerLoadScreen::~MultiPlayerLoadScreen( void )
12561206
m_mapPreview->winSetUserData(nullptr);
12571207
}
12581208

1259-
for(Int i = 0; i < MAX_SLOTS; ++i)
1260-
{
1261-
m_progressBars[i] = nullptr;
1262-
m_playerNames[i] = nullptr;
1263-
m_playerSide[i]= nullptr;
1264-
m_playerLookup[i] = -1;
1265-
}
1266-
1267-
m_portraitLocalGeneral = nullptr;
1268-
m_featuresLocalGeneral = nullptr;
1269-
m_nameLocalGeneral = nullptr;
1270-
12711209
TheAudio->removeAudioEvent( AHSV_StopTheMusicFade );
12721210
// TheAudio->stopAudio( AudioAffect_Music );
12731211
}
@@ -1498,6 +1436,9 @@ GameSpyLoadScreen::GameSpyLoadScreen( void )
14981436
{
14991437

15001438
m_mapPreview = nullptr;
1439+
m_portraitLocalGeneral = nullptr;
1440+
m_featuresLocalGeneral = nullptr;
1441+
m_nameLocalGeneral = nullptr;
15011442

15021443
for(Int i = 0; i < MAX_SLOTS; ++i)
15031444
{
@@ -1523,18 +1464,6 @@ GameSpyLoadScreen::~GameSpyLoadScreen( void )
15231464
{
15241465
m_mapPreview->winSetUserData(nullptr);
15251466
}
1526-
1527-
for(Int i = 0; i < MAX_SLOTS; ++i)
1528-
{
1529-
m_progressBars[i] = nullptr;
1530-
m_playerNames[i] = nullptr;
1531-
m_playerSide[i]= nullptr;
1532-
m_playerLookup[i] = -1;
1533-
m_playerFavoriteFactions[i]= nullptr;
1534-
m_playerTotalDisconnects[i]= nullptr;
1535-
m_playerWin[i]= nullptr;
1536-
m_playerWinLosses[i]= nullptr;
1537-
}
15381467
}
15391468

15401469
extern Int GetAdditionalDisconnectsFromUserFile(Int playerID);
@@ -1873,16 +1802,6 @@ MapTransferLoadScreen::MapTransferLoadScreen( void )
18731802

18741803
MapTransferLoadScreen::~MapTransferLoadScreen( void )
18751804
{
1876-
for(Int i = 0; i < MAX_SLOTS; ++i)
1877-
{
1878-
m_progressBars[i] = nullptr;
1879-
m_playerNames[i] = nullptr;
1880-
m_progressText[i]= nullptr;
1881-
m_playerLookup[i] = -1;
1882-
m_oldProgress[i] = -1;
1883-
}
1884-
m_fileNameText = nullptr;
1885-
m_timeoutText = nullptr;
18861805
}
18871806

18881807
void MapTransferLoadScreen::init( GameInfo *game )

0 commit comments

Comments
 (0)