Convert all NULLs to nullptr

Resolves the ambiguity of implementation defined NULLs

Fixes: 8844f42 ("tools: Remove custom NULL")

Author: voidanix

src/engine/animmodel.h

@@ -114,7 +114,7 @@ struct animmodel : model
         bool alphablend, cullface;
         shaderparamskey *key;
 
-        skin() : owner(0), tex(notexture), masks(notexture), envmap(NULL), normalmap(NULL), shader(NULL), alphablend(true), cullface(true), key(NULL) {}
+        skin() : owner(0), tex(notexture), masks(notexture), envmap(nullptr), normalmap(nullptr), shader(nullptr), alphablend(true), cullface(true), key(nullptr) {}
 
         bool masked() const { return masks != notexture; }
         bool envmapped() { return envmapmax>0 && envmapmodels; }
@@ -175,7 +175,7 @@ struct animmodel : model
         {
             #define DOMODELSHADER(name, body) \
                 do { \
-                    static Shader *name##shader = NULL; \
+                    static Shader *name##shader = nullptr; \
                     if(!name##shader) name##shader = useshaderbyname(#name); \
                     body; \
                 } while(0)
@@ -200,7 +200,7 @@ struct animmodel : model
 
         void cleanup()
         {
-            if(shader && shader->standard) shader = NULL;
+            if(shader && shader->standard) shader = nullptr;
         }
 
         void preloadBIH()
@@ -297,7 +297,7 @@ struct animmodel : model
         char *name;
         bool noclip;
 
-        mesh() : group(NULL), name(NULL), noclip(false)
+        mesh() : group(nullptr), name(nullptr), noclip(false)
         {
         }
 
@@ -491,7 +491,7 @@ struct animmodel : model
         char *name;
         vector<mesh *> meshes;
 
-        meshgroup() : next(NULL), shared(0), name(NULL)
+        meshgroup() : next(nullptr), shared(0), name(nullptr)
         {
         }
 
@@ -600,7 +600,7 @@ struct animmodel : model
         }
     };
 
-    virtual meshgroup *loadmeshes(const char *name, va_list args) { return NULL; }
+    virtual meshgroup *loadmeshes(const char *name, va_list args) { return nullptr; }
 
     meshgroup *sharemeshes(const char *name, ...)
     {
@@ -611,7 +611,7 @@ struct animmodel : model
             va_start(args, name);
             meshgroup *group = loadmeshes(name, args);
             va_end(args);
-            if(!group) return NULL;
+            if(!group) return nullptr;
             meshgroups.add(group);
         }
         return meshgroups[name];
@@ -625,7 +625,7 @@ struct animmodel : model
         modelattach *attached;
         matrix4 matrix;
 
-        linkedpart() : p(NULL), tag(-1), anim(-1), basetime(0), translate(0, 0, 0), rotate(0, 0, 0), attached(NULL) {}
+        linkedpart() : p(nullptr), tag(-1), anim(-1), basetime(0), translate(0, 0, 0), rotate(0, 0, 0), attached(nullptr) {}
     };
 
     struct part
@@ -640,9 +640,9 @@ struct animmodel : model
         float pitchscale, pitchoffset, pitchmin, pitchmax;
         vec translate;
 
-        part(animmodel *model, int index = 0) : model(model), index(index), meshes(NULL), numanimparts(1), pitchscale(1), pitchoffset(0), pitchmin(0), pitchmax(0), translate(0, 0, 0)
+        part(animmodel *model, int index = 0) : model(model), index(index), meshes(nullptr), numanimparts(1), pitchscale(1), pitchoffset(0), pitchmin(0), pitchmax(0), translate(0, 0, 0)
         {
-            loopk(MAXANIMPARTS) anims[k] = NULL;
+            loopk(MAXANIMPARTS) anims[k] = nullptr;
         }
         virtual ~part()
         {
@@ -685,7 +685,7 @@ struct animmodel : model
             }
         }
 
-        bool link(part *p, const char *tag, const vec &translate = vec(0, 0, 0), const vec &rotate = vec(0, 0, 0), int anim = -1, int basetime = 0, modelattach *attached = NULL)
+        bool link(part *p, const char *tag, const vec &translate = vec(0, 0, 0), const vec &rotate = vec(0, 0, 0), int anim = -1, int basetime = 0, modelattach *attached = nullptr)
         {
             int i = meshes ? meshes->findtag(tag) : -1;
             if(i<0)
@@ -774,7 +774,7 @@ struct animmodel : model
             }
             else
             {
-                animspec *spec = NULL;
+                animspec *spec = nullptr;
                 if(anims[animpart])
                 {
                     int primaryidx = anim&ANIM_INDEX;
@@ -1009,7 +1009,7 @@ struct animmodel : model
                 animmodel *m = (animmodel *)a[i].m;
                 if(!m)
                 {
-                    if(a[i].pos) link(NULL, a[i].tag, vec(0, 0, 0), vec(0, 0, 0), 0, 0, &a[i]);
+                    if(a[i].pos) link(nullptr, a[i].tag, vec(0, 0, 0), vec(0, 0, 0), 0, 0, &a[i]);
                     continue;
                 }
                 part *p = m->parts[0];
@@ -1031,14 +1031,14 @@ struct animmodel : model
         }
 
         animstate as[MAXANIMPARTS];
-        parts[0]->render(anim, basetime, basetime2, pitch, axis, forward, d, NULL, as);
+        parts[0]->render(anim, basetime, basetime2, pitch, axis, forward, d, nullptr, as);
 
         if(a) for(int i = numtags-1; i >= 0; i--)
         {
             animmodel *m = (animmodel *)a[i].m;
             if(!m)
             {
-                if(a[i].pos) unlink(NULL);
+                if(a[i].pos) unlink(nullptr);
                 continue;
             }
             part *p = m->parts[0];
@@ -1192,7 +1192,7 @@ struct animmodel : model
         return bih;
     }
 
-    bool link(part *p, const char *tag, const vec &translate = vec(0, 0, 0), const vec &rotate = vec(0, 0, 0), int anim = -1, int basetime = 0, modelattach *attached = NULL)
+    bool link(part *p, const char *tag, const vec &translate = vec(0, 0, 0), const vec &rotate = vec(0, 0, 0), int anim = -1, int basetime = 0, modelattach *attached = nullptr)
     {
         if(parts.empty()) return false;
         return parts[0]->link(p, tag, translate, rotate, anim, basetime, attached);
@@ -1352,7 +1352,7 @@ struct animmodel : model
         enablecullface = true;
         lastalphatest = -1;
         lastvbuf = lasttcbuf = lastxbuf = lastnbuf = lastbbuf = lastebuf = lastenvmaptex = closestenvmaptex = 0;
-        lasttex = lastmasks = lastnormalmap = NULL;
+        lasttex = lastmasks = lastnormalmap = nullptr;
         transparent = sizescale = 1;
         shaderparamskey::invalidate();
     }
@@ -1410,11 +1410,11 @@ bool animmodel::enabletc = false, animmodel::enablealphablend = false,
      animmodel::enablecullface = true,
      animmodel::enablenormals = false, animmodel::enabletangents = false, animmodel::enablebones = false, animmodel::enabledepthoffset = false;
 vec animmodel::lightdir(0, 0, 1), animmodel::lightcolor(1, 1, 1);
-const bvec *animmodel::lightmaterial = NULL;
+const bvec *animmodel::lightmaterial = nullptr;
 float animmodel::transparent = 1, animmodel::lastalphatest = -1, animmodel::sizescale = 1;
 GLuint animmodel::lastvbuf = 0, animmodel::lasttcbuf = 0, animmodel::lastnbuf = 0, animmodel::lastxbuf = 0, animmodel::lastbbuf = 0,
        animmodel::lastebuf = 0, animmodel::lastenvmaptex = 0, animmodel::closestenvmaptex = 0;
-Texture *animmodel::lasttex = NULL, *animmodel::lastmasks = NULL, *animmodel::lastnormalmap = NULL;
+Texture *animmodel::lasttex = nullptr, *animmodel::lastmasks = nullptr, *animmodel::lastnormalmap = nullptr;
 int animmodel::matrixpos = 0;
 matrix4 animmodel::matrixstack[64];
 
@@ -1441,7 +1441,7 @@ template<class MDL> struct modelloader
     static bool multimeshed() { return true; }
 };
 
-template<class MDL> MDL *modelloader<MDL>::loading = NULL;
+template<class MDL> MDL *modelloader<MDL>::loading = nullptr;
 template<class MDL> string modelloader<MDL>::dir = {'\0'}; // crashes clang if "" is used here
 
 template<class MDL, class MESH> struct modelcommands

src/engine/bih.cpp

@@ -260,7 +260,7 @@ void BIH::build(mesh &m, ushort *indices, int numindices, const ivec &vmin, cons
 }
 
 BIH::BIH(vector<mesh> &buildmeshes)
-  : meshes(NULL), nummeshes(0), nodes(NULL), numnodes(0), tribbs(NULL), numtris(0), bbmin(1e16f, 1e16f, 1e16f), bbmax(-1e16f, -1e16f, -1e16f), center(0, 0, 0), radius(0), entradius(0)
+  : meshes(nullptr), nummeshes(0), nodes(nullptr), numnodes(0), tribbs(nullptr), numtris(0), bbmin(1e16f, 1e16f, 1e16f), bbmax(-1e16f, -1e16f, -1e16f), center(0, 0, 0), radius(0), entradius(0)
 {
     if(buildmeshes.empty()) return;
     loopv(buildmeshes) numtris += buildmeshes[i].numtris;

src/engine/bih.h

@@ -49,7 +49,7 @@ struct BIH
         int flags;
         vec bbmin, bbmax;
 
-        mesh() : numnodes(0), numtris(0), tex(NULL), flags(0) {}
+        mesh() : numnodes(0), numtris(0), tex(nullptr), flags(0) {}
 
         vec getpos(int i) const { return *(const vec *)(pos + i*posstride); }
         vec2 gettc(int i) const { return *(const vec2 *)(tc + i*tcstride); }

src/engine/blend.cpp

@@ -124,7 +124,7 @@ struct BlendMapCache
 
 BlendMapCache *newblendmapcache() { return new BlendMapCache; }
 
-void freeblendmapcache(BlendMapCache *&cache) { delete cache; cache = NULL; }
+void freeblendmapcache(BlendMapCache *&cache) { delete cache; cache = nullptr; }
 
 bool setblendmaporigin(BlendMapCache *cache, const ivec &o, int size)
 {

src/engine/blob.cpp

@@ -63,13 +63,13 @@ struct blobrenderer
     uchar blobalpha;
 
     blobrenderer(const char *texname)
-      : texname(texname), tex(NULL),
-        cache(NULL), cachesize(0),
-        blobs(NULL), maxblobs(0), startblob(0), endblob(0),
-        verts(NULL), maxverts(0), startvert(0), endvert(0), availverts(0),
-        indexes(NULL), maxindexes(0), startindex(0), endindex(0), availindexes(0),
-        ebo(0), vbo(0), edata(NULL), vdata(NULL), numedata(0), numvdata(0),
-        startrender(NULL), endrender(NULL), lastblob(NULL)
+      : texname(texname), tex(nullptr),
+        cache(nullptr), cachesize(0),
+        blobs(nullptr), maxblobs(0), startblob(0), endblob(0),
+        verts(nullptr), maxverts(0), startvert(0), endvert(0), availverts(0),
+        indexes(nullptr), maxindexes(0), startindex(0), endindex(0), availindexes(0),
+        ebo(0), vbo(0), edata(nullptr), vdata(nullptr), numedata(0), numvdata(0),
+        startrender(nullptr), endrender(nullptr), lastblob(nullptr)
     {}
 
     ~blobrenderer()
@@ -87,7 +87,7 @@ struct blobrenderer
         DELETEA(edata);
         DELETEA(vdata);
         numedata = numvdata = 0;
-        startrender = endrender = NULL;
+        startrender = endrender = nullptr;
     }
 
     void init(int tris)
@@ -307,7 +307,7 @@ struct blobrenderer
         }
     }
 
-    void gentris(cube &cu, int orient, const ivec &o, int size, materialsurface *mat = NULL, int vismask = 0)
+    void gentris(cube &cu, int orient, const ivec &o, int size, materialsurface *mat = nullptr, int vismask = 0)
     {
         vec pos[MAXFACEVERTS+8];
         int dim = dimension(orient), numverts = 0, numplanes = 1, flat = -1;
@@ -452,7 +452,7 @@ struct blobrenderer
                     int vismask = cu[i].visible;
                     if(vismask&0xC0) 
                     {
-                        if(vismask&0x80) loopj(6) gentris(cu[i], j, co, size, NULL, vismask);
+                        if(vismask&0x80) loopj(6) gentris(cu[i], j, co, size, nullptr, vismask);
                         else loopj(6) if(vismask&(1<<j)) gentris(cu[i], j, co, size);
                     }
                 }
@@ -488,7 +488,7 @@ struct blobrenderer
         blobalphahigh = scale / blobfadehigh;
         blobalpha = uchar(scale);
         gentris(worldroot, ivec(0, 0, 0), hdr.worldsize>>1);
-        return !(b.flags & BL_DUP) ? &b : NULL;
+        return !(b.flags & BL_DUP) ? &b : nullptr;
     }
 
     static void setuprenderstate()
@@ -618,9 +618,9 @@ struct blobrenderer
         if(!vbo) glGenBuffers_(1, &vbo);
 
         gle::bindebo(ebo);
-        glBufferData_(GL_ELEMENT_ARRAY_BUFFER, maxindexes*sizeof(ushort), NULL, GL_STREAM_DRAW);
+        glBufferData_(GL_ELEMENT_ARRAY_BUFFER, maxindexes*sizeof(ushort), nullptr, GL_STREAM_DRAW);
         gle::bindvbo(vbo);
-        glBufferData_(GL_ARRAY_BUFFER, maxverts*sizeof(blobvert), NULL, GL_STREAM_DRAW);
+        glBufferData_(GL_ARRAY_BUFFER, maxverts*sizeof(blobvert), nullptr, GL_STREAM_DRAW);
 
         ushort *estart;
         blobvert *vstart;
@@ -644,7 +644,7 @@ struct blobrenderer
                     b->flags &= ~BL_RENDER;
                     if(b->next >= maxblobs) break;
                 }
-                startrender = endrender = NULL;
+                startrender = endrender = nullptr;
                 return;
             }
         }
@@ -661,7 +661,7 @@ struct blobrenderer
             vdst += b->endvert - b->startvert;
             if(b->next >= maxblobs) break;
         }
-        startrender = endrender = NULL;
+        startrender = endrender = nullptr;
 
         if(intel_mapbufferrange_bug)
         {
@@ -686,7 +686,7 @@ struct blobrenderer
 };
 
 int blobrenderer::lastreset = 0;
-blobrenderer *blobrenderer::lastrender = NULL;
+blobrenderer *blobrenderer::lastrender = nullptr;
 
 VARF(IDF_PERSIST, blobstattris, 128, 4096, 16384, initblobs(BLOB_STATIC));
 VARF(IDF_PERSIST, blobdyntris, 128, 4096, 16384, initblobs(BLOB_DYNAMIC));
@@ -719,7 +719,7 @@ void flushblobs()
 {
     loopi(sizeof(blobs)/sizeof(blobs[0])) blobs[i].flushblobs();
     if(blobrenderer::lastrender) blobrenderer::cleanuprenderstate();
-    blobrenderer::lastrender = NULL;
+    blobrenderer::lastrender = nullptr;
 }
 
 void cleanupblobs()