mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-23 22:32:50 -05:00
Code Issues Projects Releases Wiki Activity

Should fix switch build pt 2

Browse Source
This commit is contained in:
Christopher Leggett 2022-08-06 12:21:11 -04:00
parent 43461cec69
commit 9062eaaca5
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
soh/soh/Enhancements/item-tables/ItemTableManager.cpp
View File

@ -1,5 +1,4 @@
#include "ItemTableManager.h" #include "ItemTableManager.h"
#include "stddef.h"
ItemTableManager::ItemTableManager() { ItemTableManager::ItemTableManager() {
} }
@ -15,7 +14,7 @@ bool ItemTableManager::AddItemTable(uint16_t tableID) {
bool ItemTableManager::AddItemEntry(uint16_t tableID, uint16_t getItemID, uint16_t itemID, uint16_t objectID, int16_t drawID, uint16_t textID, uint16_t field, bool chestAnim) { bool ItemTableManager::AddItemEntry(uint16_t tableID, uint16_t getItemID, uint16_t itemID, uint16_t objectID, int16_t drawID, uint16_t textID, uint16_t field, bool chestAnim) {
ItemTable* itemTable = RetrieveItemTable(tableID); ItemTable* itemTable = RetrieveItemTable(tableID);
if (itemTable == NULL) { if (itemTable == nullptr) {
return false; return false;
} }
GetItemEntry getItemEntry = GET_ITEM(itemID, objectID, drawID, textID, field, chestAnim); GetItemEntry getItemEntry = GET_ITEM(itemID, objectID, drawID, textID, field, chestAnim);
@ -24,7 +23,7 @@ bool ItemTableManager::AddItemEntry(uint16_t tableID, uint16_t getItemID, uint16
bool ItemTableManager::AddItemEntry(uint16_t tableID, uint16_t getItemID, GetItemEntry getItemEntry) { bool ItemTableManager::AddItemEntry(uint16_t tableID, uint16_t getItemID, GetItemEntry getItemEntry) {
ItemTable* itemTable = RetrieveItemTable(tableID); ItemTable* itemTable = RetrieveItemTable(tableID);
if (itemTable == NULL) { if (itemTable == nullptr) {
return false; return false;
} }
return itemTable->emplace(getItemID, getItemEntry).second; return itemTable->emplace(getItemID, getItemEntry).second;
@ -32,7 +31,7 @@ bool ItemTableManager::AddItemEntry(uint16_t tableID, uint16_t getItemID, GetIte
GetItemEntry ItemTableManager::RetrieveItemEntry(uint16_t tableID, uint16_t itemID) { GetItemEntry ItemTableManager::RetrieveItemEntry(uint16_t tableID, uint16_t itemID) {
ItemTable* itemTable = RetrieveItemTable(tableID); ItemTable* itemTable = RetrieveItemTable(tableID);
if (itemTable != NULL) { if (itemTable != nullptr) {
auto foundItemEntry = itemTable->find(itemID); auto foundItemEntry = itemTable->find(itemID);
if (foundItemEntry != itemTable->end()) { if (foundItemEntry != itemTable->end()) {
return foundItemEntry->second; return foundItemEntry->second;
@ -43,7 +42,7 @@ GetItemEntry ItemTableManager::RetrieveItemEntry(uint16_t tableID, uint16_t item
bool ItemTableManager::ClearItemTable(uint16_t tableID) { bool ItemTableManager::ClearItemTable(uint16_t tableID) {
ItemTable* itemTable = RetrieveItemTable(tableID); ItemTable* itemTable = RetrieveItemTable(tableID);
if (itemTable != NULL) { if (itemTable != nullptr) {
itemTable->clear(); itemTable->clear();
return true; return true;
} }