mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-13 15:08:03 -05:00
Code Issues Projects Releases Wiki Activity

Throws exception if an invalid itemID is used

Browse Source 
Addresses https://github.com/HarbourMasters/Shipwright/pull/1050#discussion_r943694857
This commit is contained in:
Christopher Leggett 2022-08-11 21:16:39 -04:00
parent e9c193146c
commit 4b7548e998
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -16,6 +16,7 @@
#include <soh/Enhancements/custom-message/CustomMessageManager.h>
#include <soh/Enhancements/custom-message/CustomMessageTypes.h>
#include <soh/Enhancements/item-tables/ItemTableManager.h>
#include <stdexcept>
using json = nlohmann::json;
using namespace std::literals::string_literals;
@ -4580,6 +4581,18 @@ void Randomizer::CreateCustomMessages() {
CreateScrubMessages();
}
class ExtendedVanillaTableInvalidItemIdException: public std::exception {
private:
s16 itemID;
public:
ExtendedVanillaTableInvalidItemIdException(s16 itemID): itemID(itemID) {}
std::string what() {
return itemID + " is not a valid ItemID for the extendedVanillaGetItemTable. If you are adding a new"
"item, try adding it to randoGetItemTable instead.";
}
};
void InitRandoItemTable() {
// These entries have ItemIDs from vanilla, but not GetItemIDs or entries in the old sGetItemTable
GetItemEntry extendedVanillaGetItemTable[] = {
@ -4702,8 +4715,7 @@ void InitRandoItemTable() {
// We should never get here. If this branch of code executes,
// then you've added an item to extendedVanillaGetItemTable that
// should be in randoGetItemTable.
getItemID = RG_NONE;
break;
throw ExtendedVanillaTableInvalidItemIdException(extendedVanillaGetItemTable[i].itemId);
}
ItemTableManager::Instance->AddItemEntry(MOD_RANDOMIZER, getItemID, extendedVanillaGetItemTable[i]);
}