Skip to content

Commit b45b267

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

File tree

46 files changed

+88
-88
lines changed

Some content is hidden

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

46 files changed

+88
-88
lines changed

Core/GameEngine/Include/GameNetwork/LANAPI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ class LANAPI : public LANAPIInterface
238238

239239
Bool m_isInLANMenu; ///< true while we are in a LAN menu (lobby, game options, direct connect)
240240
Bool m_inLobby; ///< Are we in the lobby (not in a game)?
241-
LANGameInfo * m_currentGame; ///< Pointer to game (setup screen) we are currently in (NULL for lobby)
241+
LANGameInfo * m_currentGame; ///< Pointer to game (setup screen) we are currently in (nullptr for lobby)
242242
//LANGameInfo *m_currentGameInfo; ///< Pointer to game setup info we are currently in.
243243

244244
UnsignedInt m_localIP;

Core/GameEngine/Include/GameNetwork/LANGameInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class LANGameSlot : public GameSlot
4242
public:
4343
LANGameSlot();
4444

45-
LANPlayer *getUser( void ); ///< Get the User structure associated with the slot (NULL for non-humans)
45+
LANPlayer *getUser( void ); ///< Get the User structure associated with the slot (nullptr for non-humans)
4646

4747
// Various tests
4848
Bool isUser( LANPlayer *user ); ///< Does this slot contain the given user? Based off user->name

Core/GameEngine/Source/Common/System/GameMemory.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ class MemoryPoolSingleBlock
397397
{
398398
private:
399399

400-
MemoryPoolBlob *m_owningBlob; ///< will be NULL if the single block was allocated via sysAllocate()
400+
MemoryPoolBlob *m_owningBlob; ///< will be nullptr if the single block was allocated via sysAllocate()
401401
MemoryPoolSingleBlock *m_nextBlock; ///< if m_owningBlob is nonnull, this points to next free (unallocated) block in the blob; if m_owningBlob is null, this points to the next used (allocated) raw block in the pool.
402402
#ifdef MPSB_DLINK
403403
MemoryPoolSingleBlock *m_prevBlock; ///< if m_owningBlob is nonnull, this points to prev free (unallocated) block in the blob; if m_owningBlob is null, this points to the prev used (allocated) raw block in the pool.
@@ -589,7 +589,7 @@ inline MemoryPoolSingleBlock *MemoryPoolSingleBlock::getNextFreeBlock()
589589
*/
590590
inline void MemoryPoolSingleBlock::setNextFreeBlock(MemoryPoolSingleBlock *b)
591591
{
592-
//DEBUG_ASSERTCRASH(m_owningBlob != NULL && b->m_owningBlob != NULL, ("must be called on blob block"));
592+
//DEBUG_ASSERTCRASH(m_owningBlob != nullptr && b->m_owningBlob != nullptr, ("must be called on blob block"));
593593
// don't check the 'b' block -- we need to call this before 'b' is fully initialized.
594594
DEBUG_ASSERTCRASH(m_owningBlob != nullptr, ("must be called on blob block"));
595595
this->m_nextBlock = b;
@@ -885,7 +885,7 @@ void MemoryPoolSingleBlock::initBlock(Int logicalSize, MemoryPoolBlob *owningBlo
885885
#ifdef MPSB_DLINK
886886
m_prevBlock = nullptr;
887887
#endif
888-
m_owningBlob = owningBlob; // could be NULL
888+
m_owningBlob = owningBlob; // could be nullptr
889889

890890
#ifdef MEMORYPOOL_BOUNDINGWALL
891891
m_wallPattern = theBoundingWallPattern++;

Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ class WaterRenderObjClass : public Snapshot,
205205

206206
Real m_riverVOrigin;
207207
TextureClass *m_riverTexture;
208-
TextureClass *m_whiteTexture; ///< a texture containing only white used for NULL pixel shader stages.
208+
TextureClass *m_whiteTexture; ///< a texture containing only white used for nullptr pixel shader stages.
209209
TextureClass *m_waterNoiseTexture;
210210
DWORD m_waterPixelShader; ///<D3D handle to pixel shader.
211211
DWORD m_riverWaterPixelShader; ///<D3D handle to pixel shader.

Core/Libraries/Source/WWVegas/WW3D2/shattersystem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,7 @@ void ShatterSystem::Shatter_Mesh(MeshClass * mesh,const Vector3 & point,const Ve
10131013
}
10141014
}
10151015

1016-
/* if (mtl_params.UVIndexArray[ipass] != NULL) {
1016+
/* if (mtl_params.UVIndexArray[ipass] != nullptr) {
10171017
int uv_index = mtl_params.UVIndexArray[ipass][ipoly][ivert];
10181018
polygon.Verts[ivert].TexCoord[ipass][0] = mtl_params.UV[ipass][0][uv_index];
10191019
SHATTER_DEBUG_SAY(("Per-Face UV pass: %d: %f %f",ipass,polygon.Verts[ivert].TexCoord[ipass][0].X,polygon.Verts[ivert].TexCoord[ipass][0].Y));

Core/Tools/PATCHGET/CHATAPI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ BOOL CALLBACK downloadDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
527527
//sprintf(localfile,"%s\\%s",g_Update->localpath,g_Update->patchfile);
528528

529529
// Create the directory
530-
//CreateDirectory((char *)g_Update->localpath, NULL );
530+
//CreateDirectory((char *)g_Update->localpath, nullptr );
531531

532532
TheDownloadManager->downloadFile(TheDownload.server, TheDownload.userName, TheDownload.password,
533533
TheDownload.file, TheDownload.localFile, TheDownload.regKey, TheDownload.tryResume);

Core/Tools/WW3D/max2w3d/meshcon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class MeshConnectionsClass
117117
** out_name - name of the mesh is passed back by setting the char* pointed to by this value.
118118
** out_boneindex - the index of the bone used is passed back by setting the int pointed to by this value.
119119
** out_inode - mesh INode is passed by setting the INode* pointed to by this value. If this
120-
** parameter is NULL, the value is not passed back.
120+
** parameter is nullptr, the value is not passed back.
121121
*/
122122
bool Get_Sub_Object_Data(int index, char **out_name, int *out_boneindex, INode **out_inode = nullptr);
123123
bool Get_Aggregate_Data(int index, char **out_name, int *out_boneindex, INode **out_inode = nullptr);

Core/Tools/mangler/wlib/monod.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ int MonoD::print(const char *str, int len)
4747
#ifdef _WIN32
4848
unsigned long retval;
4949
WriteFile(handle, str, len, &retval, nullptr);
50-
////DeviceIoControl(handle, (DWORD)IOCTL_MONO_PRINT_RAW, (void *)str, len, NULL, 0,
50+
////DeviceIoControl(handle, (DWORD)IOCTL_MONO_PRINT_RAW, (void *)str, len, nullptr, 0,
5151
//// &retval,0);
5252
return(len);
5353
#else

Core/Tools/matchbot/wlib/monod.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ int MonoD::print(const char *str, int len)
4747
#ifdef _WIN32
4848
unsigned long retval;
4949
WriteFile(handle, str, len, &retval, nullptr);
50-
////DeviceIoControl(handle, (DWORD)IOCTL_MONO_PRINT_RAW, (void *)str, len, NULL, 0,
50+
////DeviceIoControl(handle, (DWORD)IOCTL_MONO_PRINT_RAW, (void *)str, len, nullptr, 0,
5151
//// &retval,0);
5252
return(len);
5353
#else

Core/Tools/wolSetup/WOLAPI/chatdefs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
#define CHAT_E_NOTIMPLEMENTED MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 502)
124124
// The request was made while while a conflicting request was still pending
125125
#define CHAT_E_PENDINGREQUEST MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 503)
126-
// Invalid parameter passed - usually a NULL pointer
126+
// Invalid parameter passed - usually a nullptr pointer
127127
#define CHAT_E_PARAMERROR MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 504)
128128
// Tried to create or join a channel before leaving the previous one
129129
#define CHAT_E_LEAVECHANNEL MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 508)

0 commit comments

Comments
 (0)