Skip to content

Commit f312de3

Browse files
bobtistabobtista
committed
refactor: modernize NULL to nullptr with clang-tidy --fix-errors
1 parent 4d8b06f commit f312de3

File tree

980 files changed

+19602
-19602
lines changed

Some content is hidden

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

980 files changed

+19602
-19602
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ AudioEventRTS::AudioEventRTS()
6868
m_shouldFade(false),
6969
m_isLogicalAudio(false),
7070
m_filenameToLoad(AsciiString::TheEmptyString),
71-
m_eventInfo(NULL),
71+
m_eventInfo(nullptr),
7272
m_playingHandle(0),
7373
m_killThisHandle(0),
7474
m_pitchShift(1.0),
@@ -95,7 +95,7 @@ AudioEventRTS::AudioEventRTS( const AsciiString& eventName )
9595
m_shouldFade(false),
9696
m_isLogicalAudio(false),
9797
m_filenameToLoad(AsciiString::TheEmptyString),
98-
m_eventInfo(NULL),
98+
m_eventInfo(nullptr),
9999
m_playingHandle(0),
100100
m_killThisHandle(0),
101101
m_pitchShift(1.0),
@@ -123,7 +123,7 @@ AudioEventRTS::AudioEventRTS( const AsciiString& eventName, ObjectID ownerID )
123123
m_shouldFade(false),
124124
m_isLogicalAudio(false),
125125
m_filenameToLoad(AsciiString::TheEmptyString),
126-
m_eventInfo(NULL),
126+
m_eventInfo(nullptr),
127127
m_playingHandle(0),
128128
m_killThisHandle(0),
129129
m_pitchShift(1.0),
@@ -159,7 +159,7 @@ AudioEventRTS::AudioEventRTS( const AsciiString& eventName, DrawableID drawableI
159159
m_shouldFade(false),
160160
m_isLogicalAudio(false),
161161
m_filenameToLoad(AsciiString::TheEmptyString),
162-
m_eventInfo(NULL),
162+
m_eventInfo(nullptr),
163163
m_playingHandle(0),
164164
m_killThisHandle(0),
165165
m_pitchShift(1.0),
@@ -194,7 +194,7 @@ AudioEventRTS::AudioEventRTS( const AsciiString& eventName, const Coord3D *posit
194194
m_shouldFade(false),
195195
m_isLogicalAudio(false),
196196
m_filenameToLoad(AsciiString::TheEmptyString),
197-
m_eventInfo(NULL),
197+
m_eventInfo(nullptr),
198198
m_playingHandle(0),
199199
m_killThisHandle(0),
200200
m_pitchShift(1.0),
@@ -302,9 +302,9 @@ AudioEventRTS::~AudioEventRTS()
302302
//-------------------------------------------------------------------------------------------------
303303
void AudioEventRTS::setEventName( AsciiString name )
304304
{
305-
if ((name != m_eventName) && m_eventInfo != NULL) {
305+
if ((name != m_eventName) && m_eventInfo != nullptr) {
306306
// Clear out the audio event info, cause its not valid for the new event.
307-
m_eventInfo = NULL;
307+
m_eventInfo = nullptr;
308308
}
309309

310310
m_eventName = name;
@@ -526,7 +526,7 @@ const AudioEventInfo *AudioEventRTS::getAudioEventInfo( void ) const
526526
if (m_eventInfo->m_audioName == m_eventName) {
527527
return m_eventInfo;
528528
} else {
529-
m_eventInfo = NULL;
529+
m_eventInfo = nullptr;
530530
}
531531
}
532532

@@ -568,7 +568,7 @@ const Coord3D* AudioEventRTS::getPosition( void )
568568
return &m_positionOfAudio;
569569
}
570570

571-
return NULL;
571+
return nullptr;
572572
}
573573

574574
//-------------------------------------------------------------------------------------------------
@@ -759,7 +759,7 @@ const Coord3D *AudioEventRTS::getCurrentPosition( void )
759759
return &m_positionOfAudio;
760760
}
761761

762-
return NULL;
762+
return nullptr;
763763
}
764764

765765
//-------------------------------------------------------------------------------------------------

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

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static const char* TheSpeakerTypes[] =
8080
"4 Speaker",
8181
"5.1 Surround",
8282
"7.1 Surround",
83-
NULL
83+
nullptr
8484
};
8585

8686
static const Int TheSpeakerTypesCount = sizeof(TheSpeakerTypes) / sizeof(TheSpeakerTypes[0]);
@@ -90,54 +90,54 @@ static void parseSpeakerType( INI *ini, void *instance, void *store, const void
9090
// Field Parse table for Audio Settings ///////////////////////////////////////////////////////////
9191
static const FieldParse audioSettingsFieldParseTable[] =
9292
{
93-
{ "AudioRoot", INI::parseAsciiString, NULL, offsetof( AudioSettings, m_audioRoot) },
94-
{ "SoundsFolder", INI::parseAsciiString, NULL, offsetof( AudioSettings, m_soundsFolder) },
95-
{ "MusicFolder", INI::parseAsciiString, NULL, offsetof( AudioSettings, m_musicFolder) },
96-
{ "StreamingFolder", INI::parseAsciiString, NULL, offsetof( AudioSettings, m_streamingFolder) },
97-
{ "SoundsExtension", INI::parseAsciiString, NULL, offsetof( AudioSettings, m_soundsExtension) },
98-
99-
{ "UseDigital", INI::parseBool, NULL, offsetof( AudioSettings, m_useDigital) },
100-
{ "UseMidi", INI::parseBool, NULL, offsetof( AudioSettings, m_useMidi) },
101-
{ "OutputRate", INI::parseInt, NULL, offsetof( AudioSettings, m_outputRate) },
102-
{ "OutputBits", INI::parseInt, NULL, offsetof( AudioSettings, m_outputBits) },
103-
{ "OutputChannels", INI::parseInt, NULL, offsetof( AudioSettings, m_outputChannels) },
104-
{ "SampleCount2D", INI::parseInt, NULL, offsetof( AudioSettings, m_sampleCount2D) },
105-
{ "SampleCount3D", INI::parseInt, NULL, offsetof( AudioSettings, m_sampleCount3D) },
106-
{ "StreamCount", INI::parseInt, NULL, offsetof( AudioSettings, m_streamCount) },
107-
108-
{ "Preferred3DHW1", INI::parseAsciiString, NULL, offsetof( AudioSettings, m_preferred3DProvider[0]) },
109-
{ "Preferred3DHW2", INI::parseAsciiString, NULL, offsetof( AudioSettings, m_preferred3DProvider[1]) },
110-
{ "Preferred3DHW3", INI::parseAsciiString, NULL, offsetof( AudioSettings, m_preferred3DProvider[2]) },
111-
{ "Preferred3DHW4", INI::parseAsciiString, NULL, offsetof( AudioSettings, m_preferred3DProvider[3]) },
112-
113-
{ "Preferred3DSW", INI::parseAsciiString, NULL, offsetof( AudioSettings, m_preferred3DProvider[4]) },
114-
115-
{ "Default2DSpeakerType", parseSpeakerType, NULL, offsetof( AudioSettings, m_defaultSpeakerType2D) },
116-
{ "Default3DSpeakerType", parseSpeakerType, NULL, offsetof( AudioSettings, m_defaultSpeakerType3D) },
117-
118-
{ "MinSampleVolume", INI::parsePercentToReal, NULL, offsetof( AudioSettings, m_minVolume) },
119-
{ "GlobalMinRange", INI::parseInt, NULL, offsetof( AudioSettings, m_globalMinRange) },
120-
{ "GlobalMaxRange", INI::parseInt, NULL, offsetof( AudioSettings, m_globalMaxRange) },
121-
{ "TimeBetweenDrawableSounds", INI::parseDurationUnsignedInt, NULL, offsetof( AudioSettings, m_drawableAmbientFrames) },
122-
{ "TimeToFadeAudio", INI::parseDurationUnsignedInt, NULL, offsetof( AudioSettings, m_fadeAudioFrames) },
123-
{ "AudioFootprintInBytes",INI::parseUnsignedInt, NULL, offsetof( AudioSettings, m_maxCacheSize) },
124-
{ "Relative2DVolume", INI::parsePercentToReal, NULL, offsetof( AudioSettings, m_relative2DVolume ) },
125-
{ "DefaultSoundVolume", INI::parsePercentToReal, NULL, offsetof( AudioSettings, m_defaultSoundVolume) },
126-
{ "Default3DSoundVolume", INI::parsePercentToReal, NULL, offsetof( AudioSettings, m_default3DSoundVolume) },
127-
{ "DefaultSpeechVolume", INI::parsePercentToReal, NULL, offsetof( AudioSettings, m_defaultSpeechVolume) },
128-
{ "DefaultMusicVolume", INI::parsePercentToReal, NULL, offsetof( AudioSettings, m_defaultMusicVolume) },
129-
{ "DefaultMoneyTransactionVolume", INI::parsePercentToReal, NULL, offsetof( AudioSettings, m_defaultMoneyTransactionVolume) },
130-
{ "MicrophoneDesiredHeightAboveTerrain", INI::parseReal, NULL, offsetof( AudioSettings, m_microphoneDesiredHeightAboveTerrain ) },
131-
{ "MicrophoneMaxPercentageBetweenGroundAndCamera", INI::parsePercentToReal, NULL, offsetof( AudioSettings, m_microphoneMaxPercentageBetweenGroundAndCamera ) },
132-
{ "ZoomMinDistance", INI::parseReal, NULL, offsetof( AudioSettings, m_zoomMinDistance ) },
133-
{ "ZoomMaxDistance", INI::parseReal, NULL, offsetof( AudioSettings, m_zoomMaxDistance ) },
134-
{ "ZoomSoundVolumePercentageAmount", INI::parsePercentToReal, NULL, offsetof( AudioSettings, m_zoomSoundVolumePercentageAmount ) },
135-
136-
{ NULL, NULL, NULL, NULL }
93+
{ "AudioRoot", INI::parseAsciiString, nullptr, offsetof( AudioSettings, m_audioRoot) },
94+
{ "SoundsFolder", INI::parseAsciiString, nullptr, offsetof( AudioSettings, m_soundsFolder) },
95+
{ "MusicFolder", INI::parseAsciiString, nullptr, offsetof( AudioSettings, m_musicFolder) },
96+
{ "StreamingFolder", INI::parseAsciiString, nullptr, offsetof( AudioSettings, m_streamingFolder) },
97+
{ "SoundsExtension", INI::parseAsciiString, nullptr, offsetof( AudioSettings, m_soundsExtension) },
98+
99+
{ "UseDigital", INI::parseBool, nullptr, offsetof( AudioSettings, m_useDigital) },
100+
{ "UseMidi", INI::parseBool, nullptr, offsetof( AudioSettings, m_useMidi) },
101+
{ "OutputRate", INI::parseInt, nullptr, offsetof( AudioSettings, m_outputRate) },
102+
{ "OutputBits", INI::parseInt, nullptr, offsetof( AudioSettings, m_outputBits) },
103+
{ "OutputChannels", INI::parseInt, nullptr, offsetof( AudioSettings, m_outputChannels) },
104+
{ "SampleCount2D", INI::parseInt, nullptr, offsetof( AudioSettings, m_sampleCount2D) },
105+
{ "SampleCount3D", INI::parseInt, nullptr, offsetof( AudioSettings, m_sampleCount3D) },
106+
{ "StreamCount", INI::parseInt, nullptr, offsetof( AudioSettings, m_streamCount) },
107+
108+
{ "Preferred3DHW1", INI::parseAsciiString, nullptr, offsetof( AudioSettings, m_preferred3DProvider[0]) },
109+
{ "Preferred3DHW2", INI::parseAsciiString, nullptr, offsetof( AudioSettings, m_preferred3DProvider[1]) },
110+
{ "Preferred3DHW3", INI::parseAsciiString, nullptr, offsetof( AudioSettings, m_preferred3DProvider[2]) },
111+
{ "Preferred3DHW4", INI::parseAsciiString, nullptr, offsetof( AudioSettings, m_preferred3DProvider[3]) },
112+
113+
{ "Preferred3DSW", INI::parseAsciiString, nullptr, offsetof( AudioSettings, m_preferred3DProvider[4]) },
114+
115+
{ "Default2DSpeakerType", parseSpeakerType, nullptr, offsetof( AudioSettings, m_defaultSpeakerType2D) },
116+
{ "Default3DSpeakerType", parseSpeakerType, nullptr, offsetof( AudioSettings, m_defaultSpeakerType3D) },
117+
118+
{ "MinSampleVolume", INI::parsePercentToReal, nullptr, offsetof( AudioSettings, m_minVolume) },
119+
{ "GlobalMinRange", INI::parseInt, nullptr, offsetof( AudioSettings, m_globalMinRange) },
120+
{ "GlobalMaxRange", INI::parseInt, nullptr, offsetof( AudioSettings, m_globalMaxRange) },
121+
{ "TimeBetweenDrawableSounds", INI::parseDurationUnsignedInt, nullptr, offsetof( AudioSettings, m_drawableAmbientFrames) },
122+
{ "TimeToFadeAudio", INI::parseDurationUnsignedInt, nullptr, offsetof( AudioSettings, m_fadeAudioFrames) },
123+
{ "AudioFootprintInBytes",INI::parseUnsignedInt, nullptr, offsetof( AudioSettings, m_maxCacheSize) },
124+
{ "Relative2DVolume", INI::parsePercentToReal, nullptr, offsetof( AudioSettings, m_relative2DVolume ) },
125+
{ "DefaultSoundVolume", INI::parsePercentToReal, nullptr, offsetof( AudioSettings, m_defaultSoundVolume) },
126+
{ "Default3DSoundVolume", INI::parsePercentToReal, nullptr, offsetof( AudioSettings, m_default3DSoundVolume) },
127+
{ "DefaultSpeechVolume", INI::parsePercentToReal, nullptr, offsetof( AudioSettings, m_defaultSpeechVolume) },
128+
{ "DefaultMusicVolume", INI::parsePercentToReal, nullptr, offsetof( AudioSettings, m_defaultMusicVolume) },
129+
{ "DefaultMoneyTransactionVolume", INI::parsePercentToReal, nullptr, offsetof( AudioSettings, m_defaultMoneyTransactionVolume) },
130+
{ "MicrophoneDesiredHeightAboveTerrain", INI::parseReal, nullptr, offsetof( AudioSettings, m_microphoneDesiredHeightAboveTerrain ) },
131+
{ "MicrophoneMaxPercentageBetweenGroundAndCamera", INI::parsePercentToReal, nullptr, offsetof( AudioSettings, m_microphoneMaxPercentageBetweenGroundAndCamera ) },
132+
{ "ZoomMinDistance", INI::parseReal, nullptr, offsetof( AudioSettings, m_zoomMinDistance ) },
133+
{ "ZoomMaxDistance", INI::parseReal, nullptr, offsetof( AudioSettings, m_zoomMaxDistance ) },
134+
{ "ZoomSoundVolumePercentageAmount", INI::parsePercentToReal, nullptr, offsetof( AudioSettings, m_zoomSoundVolumePercentageAmount ) },
135+
136+
{ nullptr, nullptr, nullptr, NULL }
137137
};
138138

139139
// Singleton TheAudio /////////////////////////////////////////////////////////////////////////////
140-
AudioManager *TheAudio = NULL;
140+
AudioManager *TheAudio = nullptr;
141141

142142

143143
// AudioManager Device Independent functions //////////////////////////////////////////////////////
@@ -146,8 +146,8 @@ AudioManager::AudioManager() :
146146
m_sound3DOn(TRUE),
147147
m_musicOn(TRUE),
148148
m_speechOn(TRUE),
149-
m_music(NULL),
150-
m_sound(NULL),
149+
m_music(nullptr),
150+
m_sound(nullptr),
151151
m_surroundSpeakers(FALSE),
152152
m_hardwareAccel(FALSE),
153153
m_musicPlayingFromCD(FALSE)
@@ -170,7 +170,7 @@ AudioManager::AudioManager() :
170170
m_audioSettings = NEW AudioSettings;
171171
m_miscAudio = NEW MiscAudio;
172172
m_silentAudioEvent = NEW AudioEventRTS;
173-
m_savedValues = NULL;
173+
m_savedValues = nullptr;
174174
m_disallowSpeech = FALSE;
175175
}
176176

@@ -186,19 +186,19 @@ AudioManager::~AudioManager()
186186
m_allAudioEventInfo.clear();
187187

188188
delete m_silentAudioEvent;
189-
m_silentAudioEvent = NULL;
189+
m_silentAudioEvent = nullptr;
190190

191191
delete m_music;
192-
m_music = NULL;
192+
m_music = nullptr;
193193

194194
delete m_sound;
195-
m_sound = NULL;
195+
m_sound = nullptr;
196196

197197
delete m_miscAudio;
198-
m_miscAudio = NULL;
198+
m_miscAudio = nullptr;
199199

200200
delete m_audioSettings;
201-
m_audioSettings = NULL;
201+
m_audioSettings = nullptr;
202202

203203
delete [] m_savedValues;
204204
}
@@ -207,22 +207,22 @@ AudioManager::~AudioManager()
207207
void AudioManager::init()
208208
{
209209
INI ini;
210-
ini.loadFileDirectory( "Data\\INI\\AudioSettings", INI_LOAD_OVERWRITE, NULL);
210+
ini.loadFileDirectory( "Data\\INI\\AudioSettings", INI_LOAD_OVERWRITE, nullptr);
211211

212-
ini.loadFileDirectory( "Data\\INI\\Default\\Music", INI_LOAD_OVERWRITE, NULL );
213-
ini.loadFileDirectory( "Data\\INI\\Music", INI_LOAD_OVERWRITE, NULL );
212+
ini.loadFileDirectory( "Data\\INI\\Default\\Music", INI_LOAD_OVERWRITE, nullptr );
213+
ini.loadFileDirectory( "Data\\INI\\Music", INI_LOAD_OVERWRITE, nullptr );
214214

215-
ini.loadFileDirectory( "Data\\INI\\Default\\SoundEffects", INI_LOAD_OVERWRITE, NULL );
216-
ini.loadFileDirectory( "Data\\INI\\SoundEffects", INI_LOAD_OVERWRITE, NULL );
215+
ini.loadFileDirectory( "Data\\INI\\Default\\SoundEffects", INI_LOAD_OVERWRITE, nullptr );
216+
ini.loadFileDirectory( "Data\\INI\\SoundEffects", INI_LOAD_OVERWRITE, nullptr );
217217

218-
ini.loadFileDirectory( "Data\\INI\\Default\\Speech", INI_LOAD_OVERWRITE, NULL );
219-
ini.loadFileDirectory( "Data\\INI\\Speech", INI_LOAD_OVERWRITE, NULL );
218+
ini.loadFileDirectory( "Data\\INI\\Default\\Speech", INI_LOAD_OVERWRITE, nullptr );
219+
ini.loadFileDirectory( "Data\\INI\\Speech", INI_LOAD_OVERWRITE, nullptr );
220220

221-
ini.loadFileDirectory( "Data\\INI\\Default\\Voice", INI_LOAD_OVERWRITE, NULL );
222-
ini.loadFileDirectory( "Data\\INI\\Voice", INI_LOAD_OVERWRITE, NULL );
221+
ini.loadFileDirectory( "Data\\INI\\Default\\Voice", INI_LOAD_OVERWRITE, nullptr );
222+
ini.loadFileDirectory( "Data\\INI\\Voice", INI_LOAD_OVERWRITE, nullptr );
223223

224224
// do the miscellaneous sound files last so that we find the AudioEventRTS associated with the events.
225-
ini.loadFileDirectory( "Data\\INI\\MiscAudio", INI_LOAD_OVERWRITE, NULL);
225+
ini.loadFileDirectory( "Data\\INI\\MiscAudio", INI_LOAD_OVERWRITE, nullptr);
226226

227227
// determine if one of the music tracks exists. Since their now BIGd, one implies all.
228228
// If they don't exist, then attempt to load them from the CD.
@@ -498,7 +498,7 @@ Bool AudioManager::isValidAudioEvent(const AudioEventRTS *eventToCheck) const
498498

499499
getInfoForAudioEvent(eventToCheck);
500500

501-
return (eventToCheck->getAudioEventInfo() != NULL);
501+
return (eventToCheck->getAudioEventInfo() != nullptr);
502502
}
503503

504504
//-------------------------------------------------------------------------------------------------
@@ -864,7 +864,7 @@ AudioEventInfo *AudioManager::findAudioEventInfo( AsciiString eventName ) const
864864
AudioEventInfoHash::const_iterator it;
865865
it = m_allAudioEventInfo.find(eventName);
866866
if (it == m_allAudioEventInfo.end()) {
867-
return NULL;
867+
return nullptr;
868868
}
869869

870870
return (*it).second;
@@ -951,7 +951,7 @@ Real AudioManager::getAudioLengthMS( const AudioEventRTS *event )
951951
//-------------------------------------------------------------------------------------------------
952952
Bool AudioManager::isMusicAlreadyLoaded(void) const
953953
{
954-
const AudioEventInfo *musicToLoad = NULL;
954+
const AudioEventInfo *musicToLoad = nullptr;
955955
AudioEventInfoHash::const_iterator it;
956956
for (it = m_allAudioEventInfo.begin(); it != m_allAudioEventInfo.end(); ++it) {
957957
if (it->second) {
@@ -1034,12 +1034,12 @@ Bool AudioManager::shouldPlayLocally(const AudioEventRTS *audioEvent)
10341034

10351035
Player *owningPlayer = ThePlayerList->getNthPlayer(audioEvent->getPlayerIndex());
10361036

1037-
if (BitIsSet(ei->m_type, ST_PLAYER) && BitIsSet(ei->m_type, ST_UI) && owningPlayer == NULL) {
1037+
if (BitIsSet(ei->m_type, ST_PLAYER) && BitIsSet(ei->m_type, ST_UI) && owningPlayer == nullptr) {
10381038
DEBUG_ASSERTCRASH(!TheGameLogic->isInGameLogicUpdate(), ("Playing %s sound -- player-based UI sound without specifying a player.", ei->m_audioName.str()));
10391039
return TRUE;
10401040
}
10411041

1042-
if (owningPlayer == NULL) {
1042+
if (owningPlayer == nullptr) {
10431043
DEBUG_CRASH(("Sound '%s' expects an owning player, but the audio event that created it didn't specify one.", ei->m_audioName.str()));
10441044
return FALSE;
10451045
}
@@ -1050,7 +1050,7 @@ Bool AudioManager::shouldPlayLocally(const AudioEventRTS *audioEvent)
10501050
}
10511051

10521052
const Team *localTeam = localPlayer->getDefaultTeam();
1053-
if (localTeam == NULL) {
1053+
if (localTeam == nullptr) {
10541054
return FALSE;
10551055
}
10561056

@@ -1082,7 +1082,7 @@ AudioHandle AudioManager::allocateNewHandle( void )
10821082
void AudioManager::releaseAudioEventRTS( AudioEventRTS *&eventToRelease )
10831083
{
10841084
delete eventToRelease;
1085-
eventToRelease = NULL;
1085+
eventToRelease = nullptr;
10861086
}
10871087

10881088
//-------------------------------------------------------------------------------------------------
@@ -1116,7 +1116,7 @@ void AudioManager::regainFocus( void )
11161116

11171117
// Now, blow away the old volumes.
11181118
delete [] m_savedValues;
1119-
m_savedValues = NULL;
1119+
m_savedValues = nullptr;
11201120
}
11211121

11221122
//-------------------------------------------------------------------------------------------------

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@
7575
const FieldParse MusicTrack::m_musicTrackFieldParseTable[] =
7676
{
7777

78-
{ "Filename", INI::parseAsciiString, NULL, offsetof( MusicTrack, filename ) },
79-
{ "Volume", INI::parsePercentToReal, NULL, offsetof( MusicTrack, volume ) },
80-
{ "Ambient", INI::parseBool, NULL, offsetof( MusicTrack, ambient ) },
81-
{ NULL, NULL, NULL, 0 },
78+
{ "Filename", INI::parseAsciiString, nullptr, offsetof( MusicTrack, filename ) },
79+
{ "Volume", INI::parsePercentToReal, nullptr, offsetof( MusicTrack, volume ) },
80+
{ "Ambient", INI::parseBool, nullptr, offsetof( MusicTrack, ambient ) },
81+
{ nullptr, nullptr, nullptr, 0 },
8282
};
8383

8484

‎Core/GameEngine/Source/Common/FramePacer.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "GameNetwork/NetworkInterface.h"
2929

3030

31-
FramePacer* TheFramePacer = NULL;
31+
FramePacer* TheFramePacer = nullptr;
3232

3333
FramePacer::FramePacer()
3434
{
@@ -83,12 +83,12 @@ Bool FramePacer::isActualFramesPerSecondLimitEnabled() const
8383
{
8484
Bool allowFpsLimit = true;
8585

86-
if (TheTacticalView != NULL)
86+
if (TheTacticalView != nullptr)
8787
{
8888
allowFpsLimit &= TheTacticalView->getTimeMultiplier()<=1 && !TheScriptEngine->isTimeFast();
8989
}
9090

91-
if (TheGameLogic != NULL)
91+
if (TheGameLogic != nullptr)
9292
{
9393
#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
9494
allowFpsLimit &= !(!TheGameLogic->isGamePaused() && TheGlobalData->m_TiVOFastMode);
@@ -177,7 +177,7 @@ Int FramePacer::getActualLogicTimeScaleFps(LogicTimeQueryFlags flags) const
177177
return 0;
178178
}
179179

180-
if (TheNetwork != NULL)
180+
if (TheNetwork != nullptr)
181181
{
182182
return TheNetwork->getFrameRate();
183183
}

0 commit comments

Comments
 (0)