mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-31 10:45:16 +01:00
Code Issues Releases Wiki Activity

Replace NULL with nullptr in C++ files

Browse Source
This commit is contained in:
Gymnasiast
2018-01-29 17:06:01 +01:00
committed by Richard Jenkins
parent 6bd0b2baea
commit 5cc21fd21b
26 changed files with 184 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/openrct2/world/Sprite.cpp
View File

@@ -58,7 +58,7 @@ static size_t GetSpatialIndexOffset(sint32 x, sint32 y);
rct_sprite *try_get_sprite(size_t spriteIndex)
{
rct_sprite * sprite = NULL;
rct_sprite * sprite = nullptr;
if (spriteIndex < MAX_SPRITES)
{
sprite = &_spriteList[spriteIndex];
@@ -250,7 +250,7 @@ const char * sprite_checksum()
const char * sprite_checksum()
{
return NULL;
return nullptr;
}
#endif // DISABLE_NETWORK
@@ -315,11 +315,11 @@ rct_sprite *create_sprite(uint8 bl)
// 69EC96;
uint16 cx = 0x12C - gSpriteListCount[SPRITE_LIST_MISC];
if (cx >= gSpriteListCount[SPRITE_LIST_NULL]) {
return NULL;
return nullptr;
}
linkedListTypeOffset = SPRITE_LIST_MISC * 2;
} else if (gSpriteListCount[SPRITE_LIST_NULL] == 0) {
return NULL;
return nullptr;
}
rct_unk_sprite *sprite = &(get_sprite(gSpriteListHead[SPRITE_LIST_NULL]))->unknown;
@@ -429,7 +429,7 @@ static void sprite_steam_particle_update(rct_steam_particle *steam)
void sprite_misc_explosion_cloud_create(sint32 x, sint32 y, sint32 z)
{
rct_unk_sprite *sprite = (rct_unk_sprite*)create_sprite(2);
if (sprite != NULL) {
if (sprite != nullptr) {
sprite->sprite_width = 44;
sprite->sprite_height_negative = 32;
sprite->sprite_height_positive = 34;
@@ -460,7 +460,7 @@ static void sprite_misc_explosion_cloud_update(rct_sprite * sprite)
void sprite_misc_explosion_flare_create(sint32 x, sint32 y, sint32 z)
{
rct_unk_sprite *sprite = (rct_unk_sprite*)create_sprite(2);
if (sprite != NULL) {
if (sprite != nullptr) {
sprite->sprite_width = 25;
sprite->sprite_height_negative = 85;
sprite->sprite_height_positive = 8;
@@ -675,7 +675,7 @@ void litter_create(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 type)
return;
if (gSpriteListCount[SPRITE_LIST_LITTER] >= 500) {
rct_litter *newestLitter = NULL;
rct_litter *newestLitter = nullptr;
uint32 newestLitterCreationTick = 0;
for (uint16 nextSpriteIndex, spriteIndex = gSpriteListHead[SPRITE_LIST_LITTER]; spriteIndex != SPRITE_INDEX_NULL; spriteIndex = nextSpriteIndex) {
rct_litter *litter = &get_sprite(spriteIndex)->litter;
@@ -686,14 +686,14 @@ void litter_create(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 type)
}
}
if (newestLitter != NULL) {
if (newestLitter != nullptr) {
invalidate_sprite_0((rct_sprite*)newestLitter);
sprite_remove((rct_sprite*)newestLitter);
}
}
rct_litter *litter = (rct_litter*)create_sprite(1);
if (litter == NULL)
if (litter == nullptr)
return;
move_sprite_to_list((rct_sprite*)litter, SPRITE_LIST_LITTER * 2);
@@ -841,7 +841,7 @@ static rct_sprite * find_sprite_list_cycle(uint16 sprite_idx)
const rct_sprite * fast = get_sprite(sprite_idx);
const rct_sprite * slow = fast;
bool increment_slow = false;
rct_sprite * cycle_start = NULL;
rct_sprite * cycle_start = nullptr;
while (fast->unknown.sprite_index != SPRITE_INDEX_NULL)
{
// increment fast every time, unless reached the end
@@ -876,7 +876,7 @@ static rct_sprite * find_sprite_quadrant_cycle(uint16 sprite_idx)
const rct_sprite * fast = get_sprite(sprite_idx);
const rct_sprite * slow = fast;
bool increment_slow = false;
rct_sprite * cycle_start = NULL;
rct_sprite * cycle_start = nullptr;
while (fast->unknown.sprite_index != SPRITE_INDEX_NULL)
{
// increment fast every time, unless reached the end
@@ -920,7 +920,7 @@ sint32 check_for_sprite_list_cycles(bool fix)
{
for (sint32 i = 0; i < NUM_SPRITE_LISTS; i++) {
rct_sprite * cycle_start = find_sprite_list_cycle(gSpriteListHead[i]);
if (cycle_start != NULL)
if (cycle_start != nullptr)
{
if (fix)
{
@@ -964,7 +964,7 @@ sint32 fix_disjoint_sprites()
// Find reachable sprites
bool reachable[MAX_SPRITES] = { false };
uint16 sprite_idx = gSpriteListHead[SPRITE_LIST_NULL];
rct_sprite * null_list_tail = NULL;
rct_sprite * null_list_tail = nullptr;
while (sprite_idx != SPRITE_INDEX_NULL)
{
reachable[sprite_idx] = true;
@@ -981,7 +981,7 @@ sint32 fix_disjoint_sprites()
rct_sprite * spr = get_sprite(sprite_idx);
if (spr->unknown.sprite_identifier == SPRITE_IDENTIFIER_NULL)
{
openrct2_assert(null_list_tail != NULL, "Null list is empty, yet found null sprites");
openrct2_assert(null_list_tail != nullptr, "Null list is empty, yet found null sprites");
spr->unknown.sprite_index = sprite_idx;
if (!reachable[sprite_idx])
{
@@ -1002,7 +1002,7 @@ sint32 check_for_spatial_index_cycles(bool fix)
{
for (sint32 i = 0; i < SPATIAL_INDEX_LOCATION_NULL; i++) {
rct_sprite * cycle_start = find_sprite_quadrant_cycle(gSpriteSpatialIndex[i]);
if (cycle_start != NULL)
if (cycle_start != nullptr)
{
if (fix)
{