Skip to content

Commit 56fc6de

Browse files
committed
refactor: update remaining NULL to nullptr in inline comments
1 parent b45b267 commit 56fc6de

File tree

17 files changed

+23
-23
lines changed

17 files changed

+23
-23
lines changed

Core/Tools/Launcher/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ void CreatePrimaryWin(const char *prefix)
316316
wc.cbWndExtra = 0; // No extra win data
317317
wc.hInstance = Global_instance;
318318
wc.hIcon=LoadIcon(Global_instance, MAKEINTRESOURCE(IDI_GENERALS));
319-
wc.hCursor = nullptr; /////////LoadCursor( NULL, IDC_ARROW );
319+
wc.hCursor = nullptr; /////////LoadCursor( nullptr, IDC_ARROW );
320320
wc.hbrBackground = nullptr;
321321
wc.lpszMenuName = name;
322322
wc.lpszClassName = name;

Core/Tools/PATCHGET/CHATAPI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ HWND CreatePrimaryWin(void)
626626
wc.cbWndExtra = 0; // No extra win data
627627
wc.hInstance = Global_instance;
628628
wc.hIcon=LoadIcon(Global_instance, MAKEINTRESOURCE(IDI_ICON1));
629-
wc.hCursor = nullptr; /////////LoadCursor( NULL, IDC_ARROW );
629+
wc.hCursor = nullptr; /////////LoadCursor( nullptr, IDC_ARROW );
630630
wc.hbrBackground = nullptr;
631631
wc.lpszMenuName = name;
632632
wc.lpszClassName = name;

Generals/Code/GameEngine/Include/GameClient/Keyboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class Keyboard : public SubsystemInterface
113113
// access methods for key data
114114
void resetKeys( void ); ///< reset the state of the keys
115115
KeyboardIO *getFirstKey( void ); ///< get first key ready for processing
116-
KeyboardIO *findKey( KeyDefType key, KeyboardIO::StatusType status ); ///< get key ready for processing, can return NULL
116+
KeyboardIO *findKey( KeyDefType key, KeyboardIO::StatusType status ); ///< get key ready for processing, can return nullptr
117117
void setKeyStatusData( KeyDefType key,
118118
KeyboardIO::StatusType data ); ///< set key status
119119
WideChar translateKey( WideChar keyCode ); ///< translate key code to printable UNICODE char

Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface
457457
void cancelPath(void); ///< Called if we no longer need the path.
458458
Path* getPath( void ) { return m_path; } ///< return the agent's current path
459459
const Path* getPath( void ) const { return m_path; } ///< return the agent's current path
460-
void destroyPath( void ); ///< destroy the current path, setting it to NULL
460+
void destroyPath( void ); ///< destroy the current path, setting it to nullptr
461461
UnsignedInt getPathAge( void ) const { return TheGameLogic->getFrame() - m_pathTimestamp; } ///< return the "age" of the path
462462
Bool isPathAvailable( const Coord3D *destination ) const; ///< does a path exist between us and the destination
463463
Bool isQuickPathAvailable( const Coord3D *destination ) const; ///< does a path (using quick pathfind) exist between us and the destination

Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ class PhysicsBehavior : public UpdateModule,
249249
Real m_yawRate; ///< rate of rotation around up vector
250250
Real m_rollRate; ///< rate of rotation around forward vector
251251
Real m_pitchRate; ///< rate or rotation around side vector
252-
DynamicAudioEventRTS* m_bounceSound; ///< The sound for when this thing bounces, or NULL
252+
DynamicAudioEventRTS* m_bounceSound; ///< The sound for when this thing bounces, or nullptr
253253
Coord3D m_accel; ///< current acceleration
254254
Coord3D m_prevAccel; ///< last frame's acceleration
255255
Coord3D m_vel; ///< current velocity

Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class RebuildHoleBehavior : public UpdateModule,
107107

108108
protected:
109109

110-
void newWorkerRespawnProcess( Object *existingWorker ); ///< start the worker respawn process (again if existingWorker is non NULL)
110+
void newWorkerRespawnProcess( Object *existingWorker ); ///< start the worker respawn process (again if existingWorker is non nullptr)
111111

112112
ObjectID m_workerID; ///< id of the worker that will rebuild us
113113
ObjectID m_reconstructingID; ///< ID of the object we're reconstructing

Generals/Code/GameEngine/Include/GameLogic/Object.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -664,9 +664,9 @@ class Object : public Thing, public Snapshot
664664
GeometryInfo m_geometryInfo;
665665

666666
#if RETAIL_COMPATIBLE_AIGROUP
667-
AIGroup* m_group; ///< if non-NULL, we are part of this group of agents
667+
AIGroup* m_group; ///< if non-nullptr, we are part of this group of agents
668668
#else
669-
RefCountPtr<AIGroup> m_group; ///< if non-NULL, we are part of this group of agents
669+
RefCountPtr<AIGroup> m_group; ///< if non-nullptr, we are part of this group of agents
670670
#endif
671671

672672
// These will last for my lifetime. I will reuse them and reset them. The truly dynamic ones are in PartitionManager

Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class WaterHandle
5555
WaterHandle( void ) { m_polygon = nullptr; }
5656

5757
///@todo we need to formalize the water systems
58-
PolygonTrigger *m_polygon; ///< valid when water is a polygon area, NULL if water is a grid
58+
PolygonTrigger *m_polygon; ///< valid when water is a polygon area, nullptr if water is a grid
5959

6060
};
6161

GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ class ThingTemplate : public Overridable
715715

716716
// ---- Pointer-sized things
717717
ThingTemplate* m_nextThingTemplate;
718-
const ThingTemplate* m_reskinnedFrom; ///< non NULL if we were generated via a reskin
718+
const ThingTemplate* m_reskinnedFrom; ///< non nullptr if we were generated via a reskin
719719
const Image * m_selectedPortraitImage; /// portrait image when selected (to display in GUI)
720720
const Image * m_buttonImage;
721721

GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ class Drawable : public Thing,
678678
Drawable *m_nextDrawable;
679679
Drawable *m_prevDrawable; ///< list links
680680

681-
DynamicAudioEventInfo *m_customSoundAmbientInfo; ///< If not NULL, info about the ambient sound to attach to this object
681+
DynamicAudioEventInfo *m_customSoundAmbientInfo; ///< If not nullptr, info about the ambient sound to attach to this object
682682

683683
DrawableStatusBits m_status; ///< status bits (see DrawableStatus enum)
684684
UnsignedInt m_tintStatus; ///< tint color status bits (see TintStatus enum)

0 commit comments

Comments
 (0)