pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-24 13:38:21 +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_loottable_repository.h
+28 -28
View File
@@ -19,14 +19,14 @@
class BaseLoottableRepository {
public:
struct Loottable {
int id;
uint32_t id;
std::string name;
int mincash;
int maxcash;
int avgcoin;
int done;
int min_expansion;
int max_expansion;
uint32_t mincash;
uint32_t maxcash;
uint32_t avgcoin;
int8_t done;
int8_t min_expansion;
int8_t max_expansion;
std::string content_flags;
std::string content_flags_disabled;
};
@@ -150,14 +150,14 @@ public:
if (results.RowCount() == 1) {
Loottable e{};
e.id = atoi(row[0]);
e.id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.name = row[1] ? row[1] : "";
e.mincash = atoi(row[2]);
e.maxcash = atoi(row[3]);
e.avgcoin = atoi(row[4]);
e.done = atoi(row[5]);
e.min_expansion = atoi(row[6]);
e.max_expansion = atoi(row[7]);
e.mincash = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
e.maxcash = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
e.avgcoin = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
e.done = static_cast<int8_t>(atoi(row[5]));
e.min_expansion = static_cast<int8_t>(atoi(row[6]));
e.max_expansion = static_cast<int8_t>(atoi(row[7]));
e.content_flags = row[8] ? row[8] : "";
e.content_flags_disabled = row[9] ? row[9] : "";
@@ -305,14 +305,14 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
Loottable e{};
e.id = atoi(row[0]);
e.id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.name = row[1] ? row[1] : "";
e.mincash = atoi(row[2]);
e.maxcash = atoi(row[3]);
e.avgcoin = atoi(row[4]);
e.done = atoi(row[5]);
e.min_expansion = atoi(row[6]);
e.max_expansion = atoi(row[7]);
e.mincash = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
e.maxcash = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
e.avgcoin = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
e.done = static_cast<int8_t>(atoi(row[5]));
e.min_expansion = static_cast<int8_t>(atoi(row[6]));
e.max_expansion = static_cast<int8_t>(atoi(row[7]));
e.content_flags = row[8] ? row[8] : "";
e.content_flags_disabled = row[9] ? row[9] : "";
@@ -339,14 +339,14 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
Loottable e{};
e.id = atoi(row[0]);
e.id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.name = row[1] ? row[1] : "";
e.mincash = atoi(row[2]);
e.maxcash = atoi(row[3]);
e.avgcoin = atoi(row[4]);
e.done = atoi(row[5]);
e.min_expansion = atoi(row[6]);
e.max_expansion = atoi(row[7]);
e.mincash = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
e.maxcash = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
e.avgcoin = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
e.done = static_cast<int8_t>(atoi(row[5]));
e.min_expansion = static_cast<int8_t>(atoi(row[6]));
e.max_expansion = static_cast<int8_t>(atoi(row[7]));
e.content_flags = row[8] ? row[8] : "";
e.content_flags_disabled = row[9] ? row[9] : "";