pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-27 08:17:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Repositories] Add more precise types to repository generator (#2391)

Browse Source 
* Make utils/scripts/generators/repository-generator.pl aware of more
datatypes

This adds support for unsigned and more integer types. It also avoids
using parsing functions that require casting (still needed in some
cases)

Having the data types in the Repository structs better map to the types
in the database will allow us to avoid casting when we pull data out of
them. And as a benefit, assume something is wrong if we do :)

Hopefully clean up some warnings due to casting too.

Co-authored-by: Akkadius <akkadius1@gmail.com>
This commit is contained in:
Michael Cook (mackal)
2022-08-31 01:04:27 -04:00
committed by GitHub
parent fcf01f6d87
commit 6f7fa98996
183 changed files with 7849 additions and 7818 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/repositories/base/base_lootdrop_entries_repository.h
+44 -44
View File
@@ -19,17 +19,17 @@
class BaseLootdropEntriesRepository {
public:
struct LootdropEntries {
int lootdrop_id;
int item_id;
int item_charges;
int equip_item;
float chance;
float disabled_chance;
int trivial_min_level;
int trivial_max_level;
int multiplier;
int npc_min_level;
int npc_max_level;
uint32_t lootdrop_id;
int32_t item_id;
uint16_t item_charges;
uint8_t equip_item;
float chance;
float disabled_chance;
uint16_t trivial_min_level;
uint16_t trivial_max_level;
uint8_t multiplier;
uint16_t npc_min_level;
uint16_t npc_max_level;
};
static std::string PrimaryKey()
@@ -154,17 +154,17 @@ public:
if (results.RowCount() == 1) {
LootdropEntries e{};
e.lootdrop_id = atoi(row[0]);
e.item_id = atoi(row[1]);
e.item_charges = atoi(row[2]);
e.equip_item = atoi(row[3]);
e.chance = static_cast<float>(atof(row[4]));
e.disabled_chance = static_cast<float>(atof(row[5]));
e.trivial_min_level = atoi(row[6]);
e.trivial_max_level = atoi(row[7]);
e.multiplier = atoi(row[8]);
e.npc_min_level = atoi(row[9]);
e.npc_max_level = atoi(row[10]);
e.lootdrop_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.item_id = static_cast<int32_t>(atoi(row[1]));
e.item_charges = static_cast<uint16_t>(strtoul(row[2], nullptr, 10));
e.equip_item = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
e.chance = strtof(row[4], nullptr);
e.disabled_chance = strtof(row[5], nullptr);
e.trivial_min_level = static_cast<uint16_t>(strtoul(row[6], nullptr, 10));
e.trivial_max_level = static_cast<uint16_t>(strtoul(row[7], nullptr, 10));
e.multiplier = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
e.npc_min_level = static_cast<uint16_t>(strtoul(row[9], nullptr, 10));
e.npc_max_level = static_cast<uint16_t>(strtoul(row[10], nullptr, 10));
return e;
}
@@ -314,17 +314,17 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
LootdropEntries e{};
e.lootdrop_id = atoi(row[0]);
e.item_id = atoi(row[1]);
e.item_charges = atoi(row[2]);
e.equip_item = atoi(row[3]);
e.chance = static_cast<float>(atof(row[4]));
e.disabled_chance = static_cast<float>(atof(row[5]));
e.trivial_min_level = atoi(row[6]);
e.trivial_max_level = atoi(row[7]);
e.multiplier = atoi(row[8]);
e.npc_min_level = atoi(row[9]);
e.npc_max_level = atoi(row[10]);
e.lootdrop_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.item_id = static_cast<int32_t>(atoi(row[1]));
e.item_charges = static_cast<uint16_t>(strtoul(row[2], nullptr, 10));
e.equip_item = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
e.chance = strtof(row[4], nullptr);
e.disabled_chance = strtof(row[5], nullptr);
e.trivial_min_level = static_cast<uint16_t>(strtoul(row[6], nullptr, 10));
e.trivial_max_level = static_cast<uint16_t>(strtoul(row[7], nullptr, 10));
e.multiplier = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
e.npc_min_level = static_cast<uint16_t>(strtoul(row[9], nullptr, 10));
e.npc_max_level = static_cast<uint16_t>(strtoul(row[10], nullptr, 10));
all_entries.push_back(e);
}
@@ -349,17 +349,17 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
LootdropEntries e{};
e.lootdrop_id = atoi(row[0]);
e.item_id = atoi(row[1]);
e.item_charges = atoi(row[2]);
e.equip_item = atoi(row[3]);
e.chance = static_cast<float>(atof(row[4]));
e.disabled_chance = static_cast<float>(atof(row[5]));
e.trivial_min_level = atoi(row[6]);
e.trivial_max_level = atoi(row[7]);
e.multiplier = atoi(row[8]);
e.npc_min_level = atoi(row[9]);
e.npc_max_level = atoi(row[10]);
e.lootdrop_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.item_id = static_cast<int32_t>(atoi(row[1]));
e.item_charges = static_cast<uint16_t>(strtoul(row[2], nullptr, 10));
e.equip_item = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
e.chance = strtof(row[4], nullptr);
e.disabled_chance = strtof(row[5], nullptr);
e.trivial_min_level = static_cast<uint16_t>(strtoul(row[6], nullptr, 10));
e.trivial_max_level = static_cast<uint16_t>(strtoul(row[7], nullptr, 10));
e.multiplier = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
e.npc_min_level = static_cast<uint16_t>(strtoul(row[9], nullptr, 10));
e.npc_max_level = static_cast<uint16_t>(strtoul(row[10], nullptr, 10));
all_entries.push_back(e);
}