mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 01:35:06 +01:00
Code Issues Releases Wiki Activity

Use nullptr instead of 0

Browse Source
This commit is contained in:
Hielke Morsink
2017-12-20 14:35:43 +01:00
committed by Michael Steenbeek
parent 3770b46e46
commit bcfd66cbc6
7 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2/Game.cpp
View File

@@ -82,10 +82,10 @@ uint8 gUnk141F568;
uint32 gCurrentTicks;
GAME_COMMAND_CALLBACK_POINTER * game_command_callback = 0;
GAME_COMMAND_CALLBACK_POINTER * game_command_callback = nullptr;
static GAME_COMMAND_CALLBACK_POINTER * const game_command_callback_table[] = {
0,
0,
nullptr,
nullptr,
game_command_callback_ride_construct_placed_front,
game_command_callback_ride_construct_placed_back,
game_command_callback_ride_remove_track_piece,
@@ -121,7 +121,7 @@ GAME_COMMAND_CALLBACK_POINTER * game_command_callback_get_callback(uint32 index)
{
return game_command_callback_table[index];
}
return 0;
return nullptr;
}
void game_increase_game_speed()
@@ -661,7 +661,7 @@ sint32 game_do_command_p(uint32 command, sint32 * eax, sint32 * ebx, sint32 * ec
if (network_get_mode() == NETWORK_MODE_CLIENT)
{
// Client sent the command to the server, do not run it locally, just return. It will run when server sends it.
game_command_callback = 0;
game_command_callback = nullptr;
// Decrement nest count
gGameCommandNestLevel--;
return cost;
@@ -678,7 +678,7 @@ sint32 game_do_command_p(uint32 command, sint32 * eax, sint32 * ebx, sint32 * ec
if (game_command_callback && !(flags & GAME_COMMAND_FLAG_GHOST))
{
game_command_callback(*eax, *ebx, *ecx, *edx, *esi, *edi, *ebp);
game_command_callback = 0;
game_command_callback = nullptr;
}
}
@@ -727,7 +727,7 @@ sint32 game_do_command_p(uint32 command, sint32 * eax, sint32 * ebx, sint32 * ec
gGameCommandNestLevel--;
// Clear the game command callback to prevent the next command triggering it
game_command_callback = 0;
game_command_callback = nullptr;
// Show error window
if (gGameCommandNestLevel == 0 && (flags & GAME_COMMAND_FLAG_APPLY) && gUnk141F568 == gUnk13CA740 && !(flags & GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED) && !(flags & GAME_COMMAND_FLAG_NETWORKED))