pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-27 04:07:39 +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_titles_repository.h
+48 -48
View File
@@ -19,20 +19,20 @@
class BaseTitlesRepository {
public:
struct Titles {
int id;
int skill_id;
int min_skill_value;
int max_skill_value;
int min_aa_points;
int max_aa_points;
int class_;
int gender;
int char_id;
int status;
int item_id;
uint32_t id;
int8_t skill_id;
int32_t min_skill_value;
int32_t max_skill_value;
int32_t min_aa_points;
int32_t max_aa_points;
int8_t class_;
int8_t gender;
int32_t char_id;
int32_t status;
int32_t item_id;
std::string prefix;
std::string suffix;
int title_set;
int32_t title_set;
};
static std::string PrimaryKey()
@@ -166,20 +166,20 @@ public:
if (results.RowCount() == 1) {
Titles e{};
e.id = atoi(row[0]);
e.skill_id = atoi(row[1]);
e.min_skill_value = atoi(row[2]);
e.max_skill_value = atoi(row[3]);
e.min_aa_points = atoi(row[4]);
e.max_aa_points = atoi(row[5]);
e.class_ = atoi(row[6]);
e.gender = atoi(row[7]);
e.char_id = atoi(row[8]);
e.status = atoi(row[9]);
e.item_id = atoi(row[10]);
e.id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.skill_id = static_cast<int8_t>(atoi(row[1]));
e.min_skill_value = static_cast<int32_t>(atoi(row[2]));
e.max_skill_value = static_cast<int32_t>(atoi(row[3]));
e.min_aa_points = static_cast<int32_t>(atoi(row[4]));
e.max_aa_points = static_cast<int32_t>(atoi(row[5]));
e.class_ = static_cast<int8_t>(atoi(row[6]));
e.gender = static_cast<int8_t>(atoi(row[7]));
e.char_id = static_cast<int32_t>(atoi(row[8]));
e.status = static_cast<int32_t>(atoi(row[9]));
e.item_id = static_cast<int32_t>(atoi(row[10]));
e.prefix = row[11] ? row[11] : "";
e.suffix = row[12] ? row[12] : "";
e.title_set = atoi(row[13]);
e.title_set = static_cast<int32_t>(atoi(row[13]));
return e;
}
@@ -337,20 +337,20 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
Titles e{};
e.id = atoi(row[0]);
e.skill_id = atoi(row[1]);
e.min_skill_value = atoi(row[2]);
e.max_skill_value = atoi(row[3]);
e.min_aa_points = atoi(row[4]);
e.max_aa_points = atoi(row[5]);
e.class_ = atoi(row[6]);
e.gender = atoi(row[7]);
e.char_id = atoi(row[8]);
e.status = atoi(row[9]);
e.item_id = atoi(row[10]);
e.id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.skill_id = static_cast<int8_t>(atoi(row[1]));
e.min_skill_value = static_cast<int32_t>(atoi(row[2]));
e.max_skill_value = static_cast<int32_t>(atoi(row[3]));
e.min_aa_points = static_cast<int32_t>(atoi(row[4]));
e.max_aa_points = static_cast<int32_t>(atoi(row[5]));
e.class_ = static_cast<int8_t>(atoi(row[6]));
e.gender = static_cast<int8_t>(atoi(row[7]));
e.char_id = static_cast<int32_t>(atoi(row[8]));
e.status = static_cast<int32_t>(atoi(row[9]));
e.item_id = static_cast<int32_t>(atoi(row[10]));
e.prefix = row[11] ? row[11] : "";
e.suffix = row[12] ? row[12] : "";
e.title_set = atoi(row[13]);
e.title_set = static_cast<int32_t>(atoi(row[13]));
all_entries.push_back(e);
}
@@ -375,20 +375,20 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
Titles e{};
e.id = atoi(row[0]);
e.skill_id = atoi(row[1]);
e.min_skill_value = atoi(row[2]);
e.max_skill_value = atoi(row[3]);
e.min_aa_points = atoi(row[4]);
e.max_aa_points = atoi(row[5]);
e.class_ = atoi(row[6]);
e.gender = atoi(row[7]);
e.char_id = atoi(row[8]);
e.status = atoi(row[9]);
e.item_id = atoi(row[10]);
e.id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.skill_id = static_cast<int8_t>(atoi(row[1]));
e.min_skill_value = static_cast<int32_t>(atoi(row[2]));
e.max_skill_value = static_cast<int32_t>(atoi(row[3]));
e.min_aa_points = static_cast<int32_t>(atoi(row[4]));
e.max_aa_points = static_cast<int32_t>(atoi(row[5]));
e.class_ = static_cast<int8_t>(atoi(row[6]));
e.gender = static_cast<int8_t>(atoi(row[7]));
e.char_id = static_cast<int32_t>(atoi(row[8]));
e.status = static_cast<int32_t>(atoi(row[9]));
e.item_id = static_cast<int32_t>(atoi(row[10]));
e.prefix = row[11] ? row[11] : "";
e.suffix = row[12] ? row[12] : "";
e.title_set = atoi(row[13]);
e.title_set = static_cast<int32_t>(atoi(row[13]));
all_entries.push_back(e);
}