Skip to content

Commit 5eaa6aa

Browse files
xezonxezon
authored
refactor: Remove superfluous null tests before calls to deleteInstance() (#1529)
1 parent 8723184 commit 5eaa6aa

File tree

108 files changed

+582
-1179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+582
-1179
lines changed

‎Core/GameEngine/Source/Common/Audio/GameAudio.cpp‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,9 @@ AudioManager::~AudioManager()
184184
AudioEventInfoHashIt it;
185185
for (it = m_allAudioEventInfo.begin(); it != m_allAudioEventInfo.end(); ++it) {
186186
AudioEventInfo *eventInfo = (*it).second;
187-
if (eventInfo) {
188-
deleteInstance(eventInfo);
189-
eventInfo = NULL;
190-
}
187+
deleteInstance(eventInfo);
191188
}
189+
m_allAudioEventInfo.clear();
192190

193191
delete m_silentAudioEvent;
194192
m_silentAudioEvent = NULL;
@@ -807,9 +805,7 @@ AudioRequest *AudioManager::allocateAudioRequest( Bool useAudioEvent )
807805
//-------------------------------------------------------------------------------------------------
808806
void AudioManager::releaseAudioRequest( AudioRequest *requestToRelease )
809807
{
810-
if (requestToRelease) {
811-
deleteInstance(requestToRelease);
812-
}
808+
deleteInstance(requestToRelease);
813809
}
814810

815811
//-------------------------------------------------------------------------------------------------

‎Generals/Code/GameEngine/Include/Common/Overridable.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ class Overridable : public MemoryPoolObject
122122
// cleans up and dangling overrides.
123123
__inline Overridable::~Overridable()
124124
{
125-
if (m_nextOverride)
126-
deleteInstance(m_nextOverride);
125+
deleteInstance(m_nextOverride);
127126
}
128127

129128

‎Generals/Code/GameEngine/Include/Common/StateMachine.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,8 @@ EMPTY_DTOR(SleepState)
483483
// @todo Replace calls to deleteInstance with RefCountPtr<StateMachine> when so appropriate.
484484
inline void deleteInstance(StateMachine* machine)
485485
{
486-
machine->Release_Ref();
486+
if (machine != NULL)
487+
machine->Release_Ref();
487488
}
488489

489490

‎Generals/Code/GameEngine/Include/Common/ThingTemplate.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,7 @@ class AudioArray
158158
~AudioArray()
159159
{
160160
for (Int i = 0; i < TTAUDIO_COUNT; ++i)
161-
if (m_audio[i])
162-
deleteInstance(m_audio[i]);
161+
deleteInstance(m_audio[i]);
163162
}
164163

165164
AudioArray(const AudioArray& that)

‎Generals/Code/GameEngine/Source/Common/GlobalData.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,8 +1022,7 @@ GlobalData::~GlobalData( void )
10221022
{
10231023
DEBUG_ASSERTCRASH( TheWritableGlobalData->m_next == NULL, ("~GlobalData: theOriginal is not original") );
10241024

1025-
if (m_weaponBonusSet)
1026-
deleteInstance(m_weaponBonusSet);
1025+
deleteInstance(m_weaponBonusSet);
10271026

10281027
if( m_theOriginal == this ) {
10291028
m_theOriginal = NULL;

‎Generals/Code/GameEngine/Source/Common/INI/INI.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,11 +1186,8 @@ void INI::parseDynamicAudioEventRTS( INI *ini, void * /*instance*/, void *store,
11861186
// translate the string into a sound
11871187
if (stricmp(token, "NoSound") == 0)
11881188
{
1189-
if (*theSound)
1190-
{
1191-
deleteInstance(*theSound);
1192-
*theSound = NULL;
1193-
}
1189+
deleteInstance(*theSound);
1190+
*theSound = NULL;
11941191
}
11951192
else
11961193
{

‎Generals/Code/GameEngine/Source/Common/RTS/Player.cpp‎

Lines changed: 44 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -368,54 +368,36 @@ void Player::init(const PlayerTemplate* pt)
368368
m_bombardBattlePlans = 0;
369369
m_holdTheLineBattlePlans = 0;
370370
m_searchAndDestroyBattlePlans = 0;
371-
if( m_battlePlanBonuses )
372-
{
373-
deleteInstance(m_battlePlanBonuses);
374-
m_battlePlanBonuses = NULL;
375-
}
371+
372+
deleteInstance(m_battlePlanBonuses);
373+
m_battlePlanBonuses = NULL;
376374

377375
deleteUpgradeList();
378376

379377
m_energy.init(this);
380378
m_stats.init();
381-
if (m_pBuildList != NULL)
382-
{
383-
deleteInstance(m_pBuildList);
384-
m_pBuildList = NULL;
385-
}
379+
380+
deleteInstance(m_pBuildList);
381+
m_pBuildList = NULL;
382+
386383
m_defaultTeam = NULL;
387384

388-
if (m_ai)
389-
{
390-
deleteInstance(m_ai);
391-
}
385+
deleteInstance(m_ai);
392386
m_ai = NULL;
393387

394-
if( m_resourceGatheringManager )
395-
{
396-
deleteInstance(m_resourceGatheringManager);
397-
m_resourceGatheringManager = NULL;
398-
}
388+
deleteInstance(m_resourceGatheringManager);
389+
m_resourceGatheringManager = NULL;
399390

400391
for (Int i = 0; i < NUM_HOTKEY_SQUADS; ++i) {
401-
if (m_squads[i] != NULL) {
402-
deleteInstance(m_squads[i]);
403-
m_squads[i] = NULL;
404-
}
392+
deleteInstance(m_squads[i]);
405393
m_squads[i] = newInstance(Squad);
406394
}
407395

408-
if (m_currentSelection != NULL) {
409-
deleteInstance(m_currentSelection) ;
410-
m_currentSelection = NULL;
411-
}
396+
deleteInstance(m_currentSelection);
412397
m_currentSelection = newInstance(Squad);
413398

414-
if( m_tunnelSystem )
415-
{
416-
deleteInstance(m_tunnelSystem);
417-
m_tunnelSystem = NULL;
418-
}
399+
deleteInstance(m_tunnelSystem);
400+
m_tunnelSystem = NULL;
419401

420402
m_canBuildBase = true;
421403
m_canBuildUnits = true;
@@ -494,8 +476,7 @@ void Player::init(const PlayerTemplate* pt)
494476
{
495477
KindOfPercentProductionChange *tof = *it;
496478
it = m_kindOfPercentProductionChangeList.erase( it );
497-
if(tof)
498-
deleteInstance(tof);
479+
deleteInstance(tof);
499480
}
500481

501482
}
@@ -515,25 +496,21 @@ Player::~Player()
515496

516497
// delete the relation maps (the destructor clears the actual map if any data is present)
517498
deleteInstance(m_teamRelations);
499+
m_teamRelations = NULL;
500+
518501
deleteInstance(m_playerRelations);
502+
m_playerRelations = NULL;
519503

520504
for (Int i = 0; i < NUM_HOTKEY_SQUADS; ++i) {
521-
if (m_squads[i] != NULL) {
522-
deleteInstance(m_squads[i]);
523-
m_squads[i] = NULL;
524-
}
505+
deleteInstance(m_squads[i]);
506+
m_squads[i] = NULL;
525507
}
526508

527-
if (m_currentSelection != NULL) {
528-
deleteInstance(m_currentSelection);
529-
m_currentSelection = NULL;
530-
}
509+
deleteInstance(m_currentSelection);
510+
m_currentSelection = NULL;
531511

532-
if( m_battlePlanBonuses )
533-
{
534-
deleteInstance(m_battlePlanBonuses);
535-
m_battlePlanBonuses = NULL;
536-
}
512+
deleteInstance(m_battlePlanBonuses);
513+
m_battlePlanBonuses = NULL;
537514
}
538515

539516
//=============================================================================
@@ -640,10 +617,7 @@ Bool Player::removeTeamRelationship(const Team *that)
640617
void Player::setBuildList(BuildListInfo *pBuildList)
641618
{
642619

643-
if (m_pBuildList != NULL)
644-
{
645-
deleteInstance(m_pBuildList);
646-
}
620+
deleteInstance(m_pBuildList);
647621
m_pBuildList = pBuildList;
648622

649623
}
@@ -706,10 +680,7 @@ void Player::setPlayerType(PlayerType t, Bool skirmish)
706680
{
707681
m_playerType = t;
708682

709-
if (m_ai)
710-
{
711-
deleteInstance(m_ai);
712-
}
683+
deleteInstance(m_ai);
713684
m_ai = NULL;
714685

715686
if (t == PLAYER_COMPUTER)
@@ -742,11 +713,8 @@ void Player::setDefaultTeam(void) {
742713
//=============================================================================
743714
void Player::deletePlayerAI()
744715
{
745-
if (m_ai)
746-
{
747-
deleteInstance(m_ai);
748-
m_ai = NULL;
749-
}
716+
deleteInstance(m_ai);
717+
m_ai = NULL;
750718
}
751719

752720
//=============================================================================
@@ -820,10 +788,10 @@ void Player::initFromDict(const Dict* d)
820788

821789
ScriptList *scripts = TheSidesList->getSkirmishSideInfo(i)->getScriptList()->duplicateAndQualify(
822790
qualifier, qualTemplatePlayerName, pname);
823-
if (TheSidesList->getSideInfo(getPlayerIndex())->getScriptList()) {
824-
deleteInstance(TheSidesList->getSideInfo(getPlayerIndex())->getScriptList());
825-
}
791+
792+
deleteInstance(TheSidesList->getSideInfo(getPlayerIndex())->getScriptList());
826793
TheSidesList->getSideInfo(getPlayerIndex())->setScriptList(scripts);
794+
827795
deleteInstance(TheSidesList->getSkirmishSideInfo(i)->getScriptList());
828796
TheSidesList->getSkirmishSideInfo(i)->setScriptList(NULL);
829797
}
@@ -869,12 +837,10 @@ void Player::initFromDict(const Dict* d)
869837
qualifier.format("%d", m_mpStartIndex);
870838
ScriptList *scripts = TheSidesList->getSkirmishSideInfo(skirmishNdx)->getScriptList()->duplicateAndQualify(
871839
qualifier, qualTemplatePlayerName, pname);
872-
ScriptList* slist = TheSidesList->getSideInfo(getPlayerIndex())->getScriptList();
873-
if (slist)
874-
{
875-
deleteInstance(slist);
876-
}
840+
841+
deleteInstance(TheSidesList->getSideInfo(getPlayerIndex())->getScriptList());
877842
TheSidesList->getSideInfo(getPlayerIndex())->setScriptList(scripts);
843+
878844
for (i=0; i<TheSidesList->getNumTeams(); i++) {
879845
if (TheSidesList->getTeamInfo(i)->getDict()->getAsciiString(TheKey_teamOwner) == pname)
880846
{
@@ -941,18 +907,11 @@ void Player::initFromDict(const Dict* d)
941907
}
942908
}
943909
}
944-
if( m_resourceGatheringManager )
945-
{
946-
deleteInstance(m_resourceGatheringManager);
947-
m_resourceGatheringManager = NULL;
948-
}
910+
911+
deleteInstance(m_resourceGatheringManager);
949912
m_resourceGatheringManager = newInstance(ResourceGatheringManager);
950913

951-
if( m_tunnelSystem )
952-
{
953-
deleteInstance(m_tunnelSystem);
954-
m_tunnelSystem = NULL;
955-
}
914+
deleteInstance(m_tunnelSystem);
956915
m_tunnelSystem = newInstance(TunnelTracker);
957916

958917
m_handicap.readFromDict(d);
@@ -987,18 +946,11 @@ void Player::initFromDict(const Dict* d)
987946
m_money.deposit(m);
988947

989948
for ( i = 0; i < NUM_HOTKEY_SQUADS; ++i ) {
990-
if (m_squads[i] != NULL)
991-
{
992-
deleteInstance(m_squads[i]);
993-
m_squads[i] = NULL;
994-
}
949+
deleteInstance(m_squads[i]);
995950
m_squads[i] = newInstance( Squad );
996951
}
997952

998-
if (m_currentSelection != NULL) {
999-
deleteInstance(m_currentSelection);
1000-
m_currentSelection = NULL;
1001-
}
953+
deleteInstance(m_currentSelection);
1002954
m_currentSelection = newInstance( Squad );
1003955
}
1004956

@@ -3376,8 +3328,7 @@ void Player::removeKindOfProductionCostChange( KindOfMaskType kindOf, Real perce
33763328
if(tof->m_ref == 0)
33773329
{
33783330
m_kindOfPercentProductionChangeList.erase( it );
3379-
if(tof)
3380-
deleteInstance(tof);
3331+
deleteInstance(tof);
33813332
}
33823333
return;
33833334
}
@@ -3714,8 +3665,7 @@ void Player::xfer( Xfer *xfer )
37143665
// destroy any build list that we got from loading the bare bones map, note that deleting
37153666
// the head of these structures automatically deletes any links attached
37163667
//
3717-
if( m_pBuildList)
3718-
deleteInstance(m_pBuildList);
3668+
deleteInstance(m_pBuildList);
37193669
m_pBuildList = NULL;
37203670

37213671
// read each build list info
@@ -4065,11 +4015,9 @@ void Player::xfer( Xfer *xfer )
40654015
xfer->xferBool( &battlePlanBonus ); //If we're loading, it just replaces the bool
40664016
if( xfer->getXferMode() == XFER_LOAD )
40674017
{
4068-
if (m_battlePlanBonuses)
4069-
{
4070-
deleteInstance(m_battlePlanBonuses);
4071-
m_battlePlanBonuses = NULL;
4072-
}
4018+
deleteInstance(m_battlePlanBonuses);
4019+
m_battlePlanBonuses = NULL;
4020+
40734021
if ( battlePlanBonus )
40744022
{
40754023
m_battlePlanBonuses = newInstance( BattlePlanBonuses );

‎Generals/Code/GameEngine/Source/Common/RTS/Science.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ ScienceStore::~ScienceStore()
5454
{
5555
ScienceInfo* si = *it;
5656
++it;
57-
if (si) {
58-
deleteInstance(si);
59-
}
57+
deleteInstance(si);
6058
}
6159
}
6260

‎Generals/Code/GameEngine/Source/Common/RTS/Team.cpp‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -849,19 +849,13 @@ TeamPrototype::~TeamPrototype()
849849
if (m_factory)
850850
m_factory->removeTeamPrototypeFromList(this);
851851

852-
if (m_productionConditionScript)
853-
{
854-
deleteInstance(m_productionConditionScript);
855-
}
852+
deleteInstance(m_productionConditionScript);
856853
m_productionConditionScript = NULL;
857854

858855
for (Int i = 0; i < MAX_GENERIC_SCRIPTS; ++i)
859856
{
860-
if (m_genericScriptsToRun[i])
861-
{
862-
deleteInstance(m_genericScriptsToRun[i]);
863-
m_genericScriptsToRun[i] = NULL;
864-
}
857+
deleteInstance(m_genericScriptsToRun[i]);
858+
m_genericScriptsToRun[i] = NULL;
865859
}
866860
}
867861

‎Generals/Code/GameEngine/Source/Common/StateMachine.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,7 @@ StateMachine::~StateMachine()
292292
// delete all states in the mapping
293293
for( i = m_stateMap.begin(); i != m_stateMap.end(); ++i )
294294
{
295-
if ((*i).second)
296-
deleteInstance((*i).second);
295+
deleteInstance((*i).second);
297296
}
298297
}
299298

0 commit comments

Comments
 (0)