Skip to content

Commit e469158

Browse files
SoapyManSoapyMan
committed
- replace NULL macro with nullptr
1 parent 80e0894 commit e469158

22 files changed

Lines changed: 829 additions & 816 deletions

‎DriverLevelTool/driver_level.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ void ExportDMODELToOBJ(MODEL* model, const char* model_name, int model_index, in
2828
void WriteMODELToObjStream(IVirtualStream* pStream, MODEL* model, int modelSize, int model_index, const char* name_prefix,
2929
bool debugInfo = true,
3030
const Matrix4x4& translation = identity4(),
31-
int* first_v = NULL,
32-
int* first_t = NULL,
33-
RegionModels_t* regModels = NULL);
31+
int* first_v = nullptr,
32+
int* first_t = nullptr,
33+
RegionModels_t* regModels = nullptr);
3434

3535
//----------------------------------------------------------
3636
// main functions

‎DriverLevelTool/driver_routines/level.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ ELevelFormat g_format = LEV_FORMAT_AUTODETECT;
88

99
std::string g_levname;
1010

11-
IVirtualStream* g_levStream = NULL;
12-
char* g_overlayMapData = NULL;
11+
IVirtualStream* g_levStream = nullptr;
12+
char* g_overlayMapData = nullptr;
1313

1414
extern DkList<std::string> g_model_names;
1515

@@ -50,7 +50,7 @@ void LoadCarModelsLump(IVirtualStream* pFile, int ofs, int size)
5050
pFile->Read(g_carModels[i].cleanmodel, 1, g_carModels[i].cleanSize);
5151
}
5252
else
53-
g_carModels[i].cleanmodel = NULL;
53+
g_carModels[i].cleanmodel = nullptr;
5454

5555
if (model_entries[i].damOffset != -1)
5656
{
@@ -62,7 +62,7 @@ void LoadCarModelsLump(IVirtualStream* pFile, int ofs, int size)
6262
pFile->Read(g_carModels[i].dammodel, 1, g_carModels[i].damSize);
6363
}
6464
else
65-
g_carModels[i].dammodel = NULL;
65+
g_carModels[i].dammodel = nullptr;
6666

6767
if (model_entries[i].lowOffset != -1)
6868
{
@@ -74,7 +74,7 @@ void LoadCarModelsLump(IVirtualStream* pFile, int ofs, int size)
7474
pFile->Read(g_carModels[i].lowmodel, 1, g_carModels[i].lowSize);
7575
}
7676
else
77-
g_carModels[i].lowmodel = NULL;
77+
g_carModels[i].lowmodel = nullptr;
7878
}
7979

8080
pFile->Seek(l_ofs, VS_SEEK_SET);
@@ -169,7 +169,7 @@ void LoadLevelModelsLump(IVirtualStream* pFile)
169169
{
170170
ModelRef_t& ref = g_levelModels[i];
171171
ref.index = i;
172-
ref.model = NULL;
172+
ref.model = nullptr;
173173
ref.size = modelSize;
174174
ref.swap = true;
175175
}
@@ -475,7 +475,7 @@ void LoadLevelFile(const char* filename)
475475
}
476476

477477
CMemoryStream* stream = new CMemoryStream();
478-
stream->Open(NULL, VS_OPEN_WRITE | VS_OPEN_READ, 0);
478+
stream->Open(nullptr, VS_OPEN_WRITE | VS_OPEN_READ, 0);
479479

480480
// read file into stream
481481
if (stream->ReadFromFileStream(pReadFile))
@@ -574,7 +574,7 @@ void FreeLevelData()
574574

575575
if (g_levStream)
576576
delete g_levStream;
577-
g_levStream = NULL;
577+
g_levStream = nullptr;
578578

579579
FreeSpoolData();
580580

@@ -613,8 +613,8 @@ void FreeLevelData()
613613
delete[] g_extraPalettes;
614614
delete[] g_overlayMapData;
615615

616-
g_texPageData = NULL;
617-
g_texPagePos = NULL;
618-
g_texPagePos = NULL;
619-
g_extraPalettes = NULL;
616+
g_texPageData = nullptr;
617+
g_texPagePos = nullptr;
618+
g_texPagePos = nullptr;
619+
g_extraPalettes = nullptr;
620620
}

‎DriverLevelTool/driver_routines/models.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ModelRef_t* FindModelByIndex(int nIndex, RegionModels_t* models)
3030
return &g_levelModels[nIndex];
3131
}
3232

33-
return NULL;
33+
return nullptr;
3434
}
3535

3636
int GetModelIndexByName(const char* name)

‎DriverLevelTool/driver_routines/models.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ struct ModelRef_t
3333
{
3434
ModelRef_t()
3535
{
36-
model = NULL;
37-
userData = NULL;
36+
model = nullptr;
37+
userData = nullptr;
3838
}
3939

4040
MODEL* model;

‎DriverLevelTool/driver_routines/regions.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
LEVELINFO g_levInfo;
1212
OUT_CELL_FILE_HEADER g_mapInfo;
1313

14-
AreaDataStr* g_areaData = NULL; // region model/texture data descriptors
15-
AreaTPage_t* g_regionPages = NULL; // region texpage usage table
16-
RegionModels_t* g_regionModels = NULL; // cached region models
17-
Spool* g_regionSpool = NULL; // region data info
18-
ushort* g_spoolInfoOffsets = NULL; // region offset table
14+
AreaDataStr* g_areaData = nullptr; // region model/texture data descriptors
15+
AreaTPage_t* g_regionPages = nullptr; // region texpage usage table
16+
RegionModels_t* g_regionModels = nullptr; // cached region models
17+
Spool* g_regionSpool = nullptr; // region data info
18+
ushort* g_spoolInfoOffsets = nullptr; // region offset table
1919

2020
int g_numAreas = 0;
2121
int g_numSpoolInfoOffsets = 0;
2222
int g_numRegionSpools = 0;
2323

24-
void* g_straddlers = NULL; // cells that placed between regions (transition area)
24+
void* g_straddlers = nullptr; // cells that placed between regions (transition area)
2525
int g_numStraddlers = 0;
2626

2727
int g_cell_slots_add[5] = { 0 };
@@ -240,23 +240,23 @@ void FreeSpoolData()
240240
{
241241
if(g_straddlers)
242242
free(g_straddlers);
243-
g_straddlers = NULL;
243+
g_straddlers = nullptr;
244244

245245
if(g_regionSpool)
246246
free(g_regionSpool);
247-
g_regionSpool = NULL;
247+
g_regionSpool = nullptr;
248248

249249
if(g_spoolInfoOffsets)
250250
delete [] g_spoolInfoOffsets;
251-
g_spoolInfoOffsets = NULL;
251+
g_spoolInfoOffsets = nullptr;
252252

253253
if(g_regionPages)
254254
delete [] g_regionPages;
255-
g_regionPages = NULL;
255+
g_regionPages = nullptr;
256256

257257
if(g_areaData)
258258
delete [] g_areaData;
259-
g_areaData = NULL;
259+
g_areaData = nullptr;
260260

261261
if(g_regionModels)
262262
{
@@ -267,6 +267,6 @@ void FreeSpoolData()
267267
}
268268

269269
delete [] g_regionModels;
270-
g_regionModels = NULL;
270+
g_regionModels = nullptr;
271271
}
272272
}

‎DriverLevelTool/driver_routines/textures.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
//-------------------------------------------------------------------------------
99

10-
char* g_textureNamesData = NULL;
10+
char* g_textureNamesData = nullptr;
1111

12-
TEXPAGE_POS* g_texPagePos = NULL;
12+
TEXPAGE_POS* g_texPagePos = nullptr;
1313

1414
int g_numTexPages = 0;
1515
int g_numTexDetails = 0;
@@ -21,9 +21,9 @@ bool g_originalTransparencyKey = true;
2121

2222
XYPAIR g_permsList[16];
2323
XYPAIR g_specList[16];
24-
texdata_t* g_texPageData = NULL;
25-
TexPage_t* g_texPages = NULL;
26-
extclutdata_t* g_extraPalettes = NULL;
24+
texdata_t* g_texPageData = nullptr;
25+
TexPage_t* g_texPages = nullptr;
26+
extclutdata_t* g_extraPalettes = nullptr;
2727
int g_numExtraPalettes = 0;
2828

2929
// 16 bit color to BGRA
@@ -327,7 +327,7 @@ void LoadTextureInfoLump(IVirtualStream* pFile)
327327
pFile->Read(tp.details, tp.numDetails, sizeof(TEXINF));
328328
}
329329
else
330-
tp.details = NULL;
330+
tp.details = nullptr;
331331

332332
}
333333

@@ -362,5 +362,5 @@ TEXINF* FindTextureDetail(const char* name)
362362
}
363363
}
364364

365-
return NULL;
365+
return nullptr;
366366
}

‎DriverLevelTool/exporter/export_models.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ void ExportDMODELToOBJ(MODEL* model, const char* model_name, int model_index, in
282282

283283
const char* selFilename = model_name;
284284

285-
if (strchr(model_name, '.') == NULL)
285+
if (strchr(model_name, '.') == nullptr)
286286
selFilename = varargs("%s.obj", model_name);
287287

288288
FILE* mdlFile = fopen(selFilename, "wb");

‎DriverLevelTool/exporter/export_regions.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ PACKED_CELL_OBJECT* GetFirstPackedCop(CELL_DATA** cell, ushort cell_ptr, int bar
113113
*cell = &g_cells[cell_ptr];
114114

115115
if ((*cell)->num & 0x8000)
116-
return NULL;
116+
return nullptr;
117117

118118
return &g_packed_cell_objects[((*cell)->num & 0x3fff) - g_cell_objects_add[barrel_region]];
119119
}
@@ -128,13 +128,13 @@ PACKED_CELL_OBJECT* GetNextPackedCop(CELL_DATA** cell, int barrel_region)
128128

129129
do {
130130
if ((*cell)->num & 0x8000)
131-
return NULL;
131+
return nullptr;
132132

133133
(*cell) = (*cell) + 1;
134134
num = (*cell)->num;
135135

136136
if (num & 0x4000)
137-
return NULL;
137+
return nullptr;
138138

139139
ppco = &g_packed_cell_objects[((*cell)->num & 0x3fff) - g_cell_objects_add[barrel_region]];
140140
} while (ppco->value == 0xffff && (ppco->pos.vy & 1) != 0);
@@ -343,7 +343,7 @@ void ExportRegions()
343343
}
344344

345345
// read cell objects after we spool additional area data
346-
RegionModels_t* regModels = NULL;
346+
RegionModels_t* regModels = nullptr;
347347

348348
// if region data is available, load models and textures
349349
if (spool->super_region != SUPERREGION_NONE)

‎DriverLevelTool/exporter/export_textures.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ void ExportAllTextures()
283283

284284
for (int i = 0; i < g_numAreas; i++)
285285
{
286-
LoadRegionData(g_levStream, NULL, &g_areaData[i], &g_regionPages[i]);
286+
LoadRegionData(g_levStream, nullptr, &g_areaData[i], &g_regionPages[i]);
287287
}
288288
}
289289

‎DriverLevelTool/model_compiler/compiler.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111

1212
extern std::string g_levname;
1313

14-
TexPage_t* g_compilerTPages = NULL;
14+
TexPage_t* g_compilerTPages = nullptr;
1515
int g_numCompilerTPages = 0;
1616

1717
//--------------------------------------------------------------------------
1818

1919
inline int GetDamageZoneId(const char* zoneName)
2020
{
21-
if (zoneName == NULL)
21+
if (zoneName == nullptr)
2222
return 0xFFFF;
2323

2424
for(int i = 0; i < NUM_ZONE_TYPES; i++)
@@ -50,7 +50,7 @@ void FreeTextureDetails()
5050
}
5151

5252
delete[] g_compilerTPages;
53-
g_compilerTPages = NULL;
53+
g_compilerTPages = nullptr;
5454
g_numCompilerTPages = 0;
5555
}
5656

@@ -90,7 +90,7 @@ void InitTextureDetailsForModel(smdmodel_t* model)
9090

9191
if (!tpage_ini)
9292
{
93-
g_compilerTPages[i].details = NULL;
93+
g_compilerTPages[i].details = nullptr;
9494
g_compilerTPages[i].numDetails = 0;
9595

9696
MsgError("Unable to open '%s_textures/%s.ini'! Texture coordinates might be messed up\n", g_levname.c_str(), textured_groups[i]->texture);
@@ -148,7 +148,7 @@ void InitTextureDetailsForModel(smdmodel_t* model)
148148
int FindTextureDetailByUV(int tpage, UV_INFO* uvs, int num_uv, TEXINF** detail)
149149
{
150150
// first find tpage
151-
TexPage_t* tpinfo = NULL;
151+
TexPage_t* tpinfo = nullptr;
152152
for(int i = 0; i < g_numCompilerTPages; i++)
153153
{
154154
if(g_compilerTPages[i].id == tpage)
@@ -552,7 +552,7 @@ void CompileOBJModelToDMODEL(const char* filename, const char* outputName, bool
552552
InitTextureDetailsForModel(&model);
553553

554554
CMemoryStream stream;
555-
stream.Open(NULL, VS_OPEN_WRITE, 512 * 1024);
555+
stream.Open(nullptr, VS_OPEN_WRITE, 512 * 1024);
556556

557557
int resultSize = 0;
558558
MODEL* resultModel = CompileDMODEL(&stream, &model, resultSize);

0 commit comments

Comments
 (0)