OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 13:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed exception usage in TableData.

Browse Source
This commit is contained in:
dongresource 2020-10-16 21:47:43 +02:00
parent dd54668697
commit 7f716c7278
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/TableData.cpp
View File

@ -17,6 +17,15 @@ std::map<int32_t, int> TableData::RunningNPCRotations;
std::map<int32_t, int> TableData::RunningNPCMapNumbers; std::map<int32_t, int> TableData::RunningNPCMapNumbers;
std::map<int32_t, BaseNPC*> TableData::RunningMobs; std::map<int32_t, BaseNPC*> TableData::RunningMobs;
class TableException : public std::exception {
public:
std::string msg;
TableException(std::string m) : std::exception() { msg = m; }
const char *what() const throw() { return msg.c_str(); }
};
void TableData::init() { void TableData::init() {
int32_t nextId = 0; int32_t nextId = 0;
@ -332,14 +341,12 @@ void TableData::loadDrops() {
// Check if DropChance exists // Check if DropChance exists
if (MobManager::MobDropChances.find(toAdd.dropChanceType) == MobManager::MobDropChances.end()) if (MobManager::MobDropChances.find(toAdd.dropChanceType) == MobManager::MobDropChances.end())
{ {
std::string errorMessage = " MobDropChance not found: " + std::to_string((toAdd.dropChanceType)); throw TableException(" MobDropChance not found: " + std::to_string((toAdd.dropChanceType)));
throw (std::exception((errorMessage).c_str()));
} }
// Check if number of crates is correct // Check if number of crates is correct
if (!(MobManager::MobDropChances[(int)drop["DropChance"]].cratesRatio.size() == toAdd.crateIDs.size())) if (!(MobManager::MobDropChances[(int)drop["DropChance"]].cratesRatio.size() == toAdd.crateIDs.size()))
{ {
std::string errorMessage = " DropType " + std::to_string((int)drop["DropType"]) + " contains invalid number of crates"; throw TableException(" DropType " + std::to_string((int)drop["DropType"]) + " contains invalid number of crates");
throw (std::exception((errorMessage).c_str()));
} }
toAdd.taros = (int)drop["Taros"]; toAdd.taros = (int)drop["Taros"];
@ -380,7 +387,7 @@ void TableData::loadDrops() {
{ {
char buff[255]; char buff[255];
sprintf(buff, "Unknown item with Id %d and Type %d", (int)item["Id"], (int)item["Type"]); sprintf(buff, "Unknown item with Id %d and Type %d", (int)item["Id"], (int)item["Type"]);
throw (std::exception(buff)); throw TableException(std::string(buff));
} }
std::map<std::pair<int32_t, int32_t>, Item>::iterator toAdd = ItemManager::ItemData.find(itemDataKey); std::map<std::pair<int32_t, int32_t>, Item>::iterator toAdd = ItemManager::ItemData.find(itemDataKey);
// if item collection doesn't exist, start a new one // if item collection doesn't exist, start a new one