Skip to content

Commit

Permalink
More nullptrs
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexbatalov
alexbatalov committed Jan 16, 2024
1 parent 250203e commit 73669d7
Show file tree
Hide file tree
Showing 13 changed files with 40 additions and 40 deletions.
4 changes: 2 additions & 2 deletions src/autorun.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace fallout {
bool autorunMutexCreate()
{
#ifdef _WIN32
gInterplayGenericAutorunMutex = CreateMutexA(NULL, FALSE, "InterplayGenericAutorunMutex");
gInterplayGenericAutorunMutex = CreateMutexA(nullptr, FALSE, "InterplayGenericAutorunMutex");
if (GetLastError() == ERROR_ALREADY_EXISTS) {
CloseHandle(gInterplayGenericAutorunMutex);
return false;
Expand All @@ -29,7 +29,7 @@ bool autorunMutexCreate()
void autorunMutexClose()
{
#ifdef _WIN32
if (gInterplayGenericAutorunMutex != NULL) {
if (gInterplayGenericAutorunMutex != nullptr) {
CloseHandle(gInterplayGenericAutorunMutex);
}
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/character_editor.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4130,7 +4130,7 @@ static int characterEditorShowOptions()
getmsg(&gCharacterEditorMessageList, &gCharacterEditorMessageListItem, 609));
strcpy(string5, getmsg(&gCharacterEditorMessageList, &gCharacterEditorMessageListItem, 610));

if (showDialogBox(string4, dialogBody, 1, 169, 126, _colorTable[32328], NULL, _colorTable[32328], DIALOG_BOX_YES_NO) != 0) {
if (showDialogBox(string4, dialogBody, 1, 169, 126, _colorTable[32328], nullptr, _colorTable[32328], DIALOG_BOX_YES_NO) != 0) {
shouldSave = true;
} else {
shouldSave = false;
Expand Down
2 changes: 1 addition & 1 deletion src/combat.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2365,7 +2365,7 @@ Object* _combat_whose_turn()
if (isInCombat()) {
return _combat_turn_obj;
} else {
return NULL;
return nullptr;
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/combat_ai.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1294,9 +1294,9 @@ static int _compare_nearer(const void* a1, const void* a2)

if (object1 == nullptr && object2 == nullptr) {
return 0;
} else if (object1 != NULL && object2 == NULL) {
} else if (object1 != nullptr && object2 == nullptr) {
return -1;
} else if (object1 == NULL && object2 != NULL) {
} else if (object1 == nullptr && object2 != nullptr) {
return 1;
}

Expand Down Expand Up @@ -1331,9 +1331,9 @@ static int _compare_strength(const void* a1, const void* a2)

if (object1 == nullptr && object2 == nullptr) {
return 0;
} else if (object1 != NULL && object2 == NULL) {
} else if (object1 != nullptr && object2 == nullptr) {
return -1;
} else if (object1 == NULL && object2 != NULL) {
} else if (object1 == nullptr && object2 != nullptr) {
return 1;
}

Expand Down Expand Up @@ -1367,9 +1367,9 @@ static int _compare_weakness(const void* a1, const void* a2)

if (object1 == nullptr && object2 == nullptr) {
return 0;
} else if (object1 != NULL && object2 == NULL) {
} else if (object1 != nullptr && object2 == nullptr) {
return -1;
} else if (object1 == NULL && object2 != NULL) {
} else if (object1 == nullptr && object2 != nullptr) {
return 1;
}

Expand Down
4 changes: 2 additions & 2 deletions src/critter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ char* killTypeGetName(int killType)
MessageListItem messageListItem;
return getmsg(&gProtoMessageList, &messageListItem, 1450 + killType);
} else {
return NULL;
return nullptr;
}
} else {
return byte_501494;
Expand All @@ -785,7 +785,7 @@ char* killTypeGetDescription(int killType)
MessageListItem messageListItem;
return getmsg(&gProtoMessageList, &messageListItem, 1469 + killType);
} else {
return NULL;
return nullptr;
}
} else {
return byte_501494;
Expand Down
16 changes: 8 additions & 8 deletions src/inventory.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5188,7 +5188,7 @@ void inventoryOpenTrade(int win, Object* barterer, Object* playerTable, Object*
if (keyCode >= 1000 && keyCode <= 1000 + gInventorySlotsCount) {
if (gInventoryCursor == INVENTORY_WINDOW_CURSOR_ARROW) {
inventoryWindowOpenContextMenu(keyCode, INVENTORY_WINDOW_TYPE_TRADE);
inventoryWindowRenderInnerInventories(win, playerTable, NULL, -1);
inventoryWindowRenderInnerInventories(win, playerTable, nullptr, -1);
} else {
int slotIndex = keyCode - 1000;
if (slotIndex + _stack_offset[_curr_stack] < _pud->length) {
Expand All @@ -5197,15 +5197,15 @@ void inventoryOpenTrade(int win, Object* barterer, Object* playerTable, Object*
_barter_move_inventory(inventoryItem->item, inventoryItem->quantity, slotIndex, stackOffset, barterer, playerTable, true);
_display_target_inventory(_target_stack_offset[_target_curr_stack], -1, _target_pud, INVENTORY_WINDOW_TYPE_TRADE);
_display_inventory(_stack_offset[_curr_stack], -1, INVENTORY_WINDOW_TYPE_TRADE);
inventoryWindowRenderInnerInventories(win, playerTable, NULL, -1);
inventoryWindowRenderInnerInventories(win, playerTable, nullptr, -1);
}
}

keyCode = -1;
} else if (keyCode >= 2000 && keyCode <= 2000 + gInventorySlotsCount) {
if (gInventoryCursor == INVENTORY_WINDOW_CURSOR_ARROW) {
inventoryWindowOpenContextMenu(keyCode, INVENTORY_WINDOW_TYPE_TRADE);
inventoryWindowRenderInnerInventories(win, NULL, bartererTable, -1);
inventoryWindowRenderInnerInventories(win, nullptr, bartererTable, -1);
} else {
int slotIndex = keyCode - 2000;
if (slotIndex + _target_stack_offset[_target_curr_stack] < _target_pud->length) {
Expand All @@ -5214,39 +5214,39 @@ void inventoryOpenTrade(int win, Object* barterer, Object* playerTable, Object*
_barter_move_inventory(inventoryItem->item, inventoryItem->quantity, slotIndex, stackOffset, barterer, bartererTable, false);
_display_target_inventory(_target_stack_offset[_target_curr_stack], -1, _target_pud, INVENTORY_WINDOW_TYPE_TRADE);
_display_inventory(_stack_offset[_curr_stack], -1, INVENTORY_WINDOW_TYPE_TRADE);
inventoryWindowRenderInnerInventories(win, NULL, bartererTable, -1);
inventoryWindowRenderInnerInventories(win, nullptr, bartererTable, -1);
}
}

keyCode = -1;
} else if (keyCode >= 2300 && keyCode <= 2300 + gInventorySlotsCount) {
if (gInventoryCursor == INVENTORY_WINDOW_CURSOR_ARROW) {
inventoryWindowOpenContextMenu(keyCode, INVENTORY_WINDOW_TYPE_TRADE);
inventoryWindowRenderInnerInventories(win, playerTable, NULL, -1);
inventoryWindowRenderInnerInventories(win, playerTable, nullptr, -1);
} else {
int itemIndex = keyCode - 2300;
if (itemIndex < _ptable_pud->length) {
InventoryItem* inventoryItem = &(_ptable_pud->items[_ptable_pud->length - (itemIndex + _ptable_offset + 1)]);
_barter_move_from_table_inventory(inventoryItem->item, inventoryItem->quantity, itemIndex, barterer, playerTable, true);
_display_target_inventory(_target_stack_offset[_target_curr_stack], -1, _target_pud, INVENTORY_WINDOW_TYPE_TRADE);
_display_inventory(_stack_offset[_curr_stack], -1, INVENTORY_WINDOW_TYPE_TRADE);
inventoryWindowRenderInnerInventories(win, playerTable, NULL, -1);
inventoryWindowRenderInnerInventories(win, playerTable, nullptr, -1);
}
}

keyCode = -1;
} else if (keyCode >= 2400 && keyCode <= 2400 + gInventorySlotsCount) {
if (gInventoryCursor == INVENTORY_WINDOW_CURSOR_ARROW) {
inventoryWindowOpenContextMenu(keyCode, INVENTORY_WINDOW_TYPE_TRADE);
inventoryWindowRenderInnerInventories(win, NULL, bartererTable, -1);
inventoryWindowRenderInnerInventories(win, nullptr, bartererTable, -1);
} else {
int v45 = keyCode - 2400;
if (v45 < _btable_pud->length) {
InventoryItem* inventoryItem = &(_btable_pud->items[_btable_pud->length - (v45 + _btable_offset + 1)]);
_barter_move_from_table_inventory(inventoryItem->item, inventoryItem->quantity, v45, barterer, bartererTable, false);
_display_target_inventory(_target_stack_offset[_target_curr_stack], -1, _target_pud, INVENTORY_WINDOW_TYPE_TRADE);
_display_inventory(_stack_offset[_curr_stack], -1, INVENTORY_WINDOW_TYPE_TRADE);
inventoryWindowRenderInnerInventories(win, NULL, bartererTable, -1);
inventoryWindowRenderInnerInventories(win, nullptr, bartererTable, -1);
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/platform/ios/paths.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// Modelled after SDL_AndroidGetExternalStoragePath.
const char* iOSGetDocumentsPath()
{
static char* s_iOSDocumentsPath = NULL;
static char* s_iOSDocumentsPath = nullptr;

if (s_iOSDocumentsPath == NULL) {
if (s_iOSDocumentsPath == nullptr) {
@autoreleasepool {
NSArray* array = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);

Expand All @@ -19,7 +19,7 @@
if (base) {
const size_t len = SDL_strlen(base) + 2;
s_iOSDocumentsPath = (char*)SDL_malloc(len);
if (s_iOSDocumentsPath == NULL) {
if (s_iOSDocumentsPath == nullptr) {
SDL_OutOfMemory();
} else {
SDL_snprintf(s_iOSDocumentsPath, len, "%s/", base);
Expand Down
2 changes: 1 addition & 1 deletion src/proto_instance.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1672,7 +1672,7 @@ static int _check_door_state(Object* a1, Object* a2)

CacheEntry* artHandle;
Art* art = artLock(a1->fid, &artHandle);
if (art == NULL) {
if (art == nullptr) {
return -1;
}

Expand Down
4 changes: 2 additions & 2 deletions src/stat.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ char* pcStatGetName(int pcStat);
char* pcStatGetDescription(int pcStat);
int statGetFrmId(int stat);
int statRoll(Object* critter, int stat, int modifier, int* howMuch);
int pcAddExperience(int xp, int* xpGained = NULL);
int pcAddExperienceWithOptions(int xp, bool a2, int* xpGained = NULL);
int pcAddExperience(int xp, int* xpGained = nullptr);
int pcAddExperienceWithOptions(int xp, bool a2, int* xpGained = nullptr);
int pcSetExperience(int a1);

static inline bool statIsValid(int stat)
Expand Down
2 changes: 1 addition & 1 deletion src/svga.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ static bool createRenderer(int width, int height)
}

gSdlTextureSurface = SDL_CreateRGBSurfaceWithFormat(0, width, height, SDL_BITSPERPIXEL(format), format);
if (gSdlTextureSurface == NULL) {
if (gSdlTextureSurface == nullptr) {
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion src/win32.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace fallout {
bool gProgramIsActive = false;

// GNW95MUTEX
HANDLE _GNW95_mutex = NULL;
HANDLE _GNW95_mutex = nullptr;

// 0x4DE700
int main(int argc, char* argv[])
Expand Down
2 changes: 1 addition & 1 deletion src/window_manager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1329,7 +1329,7 @@ void programWindowSetTitle(const char* title)

#ifdef _WIN32
if (_GNW95_title_mutex == INVALID_HANDLE_VALUE) {
_GNW95_title_mutex = CreateMutexA(NULL, TRUE, title);
_GNW95_title_mutex = CreateMutexA(nullptr, TRUE, title);
if (GetLastError() != ERROR_SUCCESS) {
_GNW95_already_running = true;
return;
Expand Down
22 changes: 11 additions & 11 deletions src/worldmap.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2204,7 +2204,7 @@ static int wmParseSubConditional(char** stringPtr, const char* a2, int* typePtr,
*paramPtr = atoi(string);

pch = strstr(string, ")");
if (pch != NULL) {
if (pch != nullptr) {
string = pch + 1;
}

Expand All @@ -2216,12 +2216,12 @@ static int wmParseSubConditional(char** stringPtr, const char* a2, int* typePtr,
*valuePtr = atoi(string);

pch = strstr(string, ")");
if (pch != NULL) {
if (pch != nullptr) {
string = pch + 1;
}

pch = strstr(string, ",");
if (pch != NULL) {
if (pch != nullptr) {
string = pch + 1;
}
*stringPtr = string;
Expand All @@ -2239,12 +2239,12 @@ static int wmParseSubConditional(char** stringPtr, const char* a2, int* typePtr,
*valuePtr = atoi(string);

pch = strstr(string, ")");
if (pch != NULL) {
if (pch != nullptr) {
string = pch + 1;
}

pch = strstr(string, ",");
if (pch != NULL) {
if (pch != nullptr) {
string = pch + 1;
}
*stringPtr = string;
Expand All @@ -2262,12 +2262,12 @@ static int wmParseSubConditional(char** stringPtr, const char* a2, int* typePtr,
*valuePtr = atoi(string);

pch = strstr(string, ")");
if (pch != NULL) {
if (pch != nullptr) {
string = pch + 1;
}

pch = strstr(string, ",");
if (pch != NULL) {
if (pch != nullptr) {
string = pch + 1;
}
*stringPtr = string;
Expand All @@ -2285,12 +2285,12 @@ static int wmParseSubConditional(char** stringPtr, const char* a2, int* typePtr,
*valuePtr = atoi(string);

pch = strstr(string, ")");
if (pch != NULL) {
if (pch != nullptr) {
string = pch + 1;
}

pch = strstr(string, ",");
if (pch != NULL) {
if (pch != nullptr) {
string = pch + 1;
}
*stringPtr = string;
Expand All @@ -2308,12 +2308,12 @@ static int wmParseSubConditional(char** stringPtr, const char* a2, int* typePtr,
*valuePtr = atoi(string);

pch = strstr(string, ")");
if (pch != NULL) {
if (pch != nullptr) {
string = pch + 1;
}

pch = strstr(string, ",");
if (pch != NULL) {
if (pch != nullptr) {
string = pch + 1;
}
*stringPtr = string;
Expand Down

0 comments on commit 73669d7

Please sign in to comment.