pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-27 12:27:17 +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_tradeskill_recipe_repository.h
+44 -44
View File
@@ -19,19 +19,19 @@
class BaseTradeskillRecipeRepository {
public:
struct TradeskillRecipe {
int id;
int32_t id;
std::string name;
int tradeskill;
int skillneeded;
int trivial;
int nofail;
int replace_container;
int16_t tradeskill;
int16_t skillneeded;
int16_t trivial;
int8_t nofail;
int8_t replace_container;
std::string notes;
int must_learn;
int quest;
int enabled;
int min_expansion;
int max_expansion;
int8_t must_learn;
int8_t quest;
int8_t enabled;
int8_t min_expansion;
int8_t max_expansion;
std::string content_flags;
std::string content_flags_disabled;
};
@@ -170,19 +170,19 @@ public:
if (results.RowCount() == 1) {
TradeskillRecipe e{};
e.id = atoi(row[0]);
e.id = static_cast<int32_t>(atoi(row[0]));
e.name = row[1] ? row[1] : "";
e.tradeskill = atoi(row[2]);
e.skillneeded = atoi(row[3]);
e.trivial = atoi(row[4]);
e.nofail = atoi(row[5]);
e.replace_container = atoi(row[6]);
e.tradeskill = static_cast<int16_t>(atoi(row[2]));
e.skillneeded = static_cast<int16_t>(atoi(row[3]));
e.trivial = static_cast<int16_t>(atoi(row[4]));
e.nofail = static_cast<int8_t>(atoi(row[5]));
e.replace_container = static_cast<int8_t>(atoi(row[6]));
e.notes = row[7] ? row[7] : "";
e.must_learn = atoi(row[8]);
e.quest = atoi(row[9]);
e.enabled = atoi(row[10]);
e.min_expansion = atoi(row[11]);
e.max_expansion = atoi(row[12]);
e.must_learn = static_cast<int8_t>(atoi(row[8]));
e.quest = static_cast<int8_t>(atoi(row[9]));
e.enabled = static_cast<int8_t>(atoi(row[10]));
e.min_expansion = static_cast<int8_t>(atoi(row[11]));
e.max_expansion = static_cast<int8_t>(atoi(row[12]));
e.content_flags = row[13] ? row[13] : "";
e.content_flags_disabled = row[14] ? row[14] : "";
@@ -345,19 +345,19 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
TradeskillRecipe e{};
e.id = atoi(row[0]);
e.id = static_cast<int32_t>(atoi(row[0]));
e.name = row[1] ? row[1] : "";
e.tradeskill = atoi(row[2]);
e.skillneeded = atoi(row[3]);
e.trivial = atoi(row[4]);
e.nofail = atoi(row[5]);
e.replace_container = atoi(row[6]);
e.tradeskill = static_cast<int16_t>(atoi(row[2]));
e.skillneeded = static_cast<int16_t>(atoi(row[3]));
e.trivial = static_cast<int16_t>(atoi(row[4]));
e.nofail = static_cast<int8_t>(atoi(row[5]));
e.replace_container = static_cast<int8_t>(atoi(row[6]));
e.notes = row[7] ? row[7] : "";
e.must_learn = atoi(row[8]);
e.quest = atoi(row[9]);
e.enabled = atoi(row[10]);
e.min_expansion = atoi(row[11]);
e.max_expansion = atoi(row[12]);
e.must_learn = static_cast<int8_t>(atoi(row[8]));
e.quest = static_cast<int8_t>(atoi(row[9]));
e.enabled = static_cast<int8_t>(atoi(row[10]));
e.min_expansion = static_cast<int8_t>(atoi(row[11]));
e.max_expansion = static_cast<int8_t>(atoi(row[12]));
e.content_flags = row[13] ? row[13] : "";
e.content_flags_disabled = row[14] ? row[14] : "";
@@ -384,19 +384,19 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
TradeskillRecipe e{};
e.id = atoi(row[0]);
e.id = static_cast<int32_t>(atoi(row[0]));
e.name = row[1] ? row[1] : "";
e.tradeskill = atoi(row[2]);
e.skillneeded = atoi(row[3]);
e.trivial = atoi(row[4]);
e.nofail = atoi(row[5]);
e.replace_container = atoi(row[6]);
e.tradeskill = static_cast<int16_t>(atoi(row[2]));
e.skillneeded = static_cast<int16_t>(atoi(row[3]));
e.trivial = static_cast<int16_t>(atoi(row[4]));
e.nofail = static_cast<int8_t>(atoi(row[5]));
e.replace_container = static_cast<int8_t>(atoi(row[6]));
e.notes = row[7] ? row[7] : "";
e.must_learn = atoi(row[8]);
e.quest = atoi(row[9]);
e.enabled = atoi(row[10]);
e.min_expansion = atoi(row[11]);
e.max_expansion = atoi(row[12]);
e.must_learn = static_cast<int8_t>(atoi(row[8]));
e.quest = static_cast<int8_t>(atoi(row[9]));
e.enabled = static_cast<int8_t>(atoi(row[10]));
e.min_expansion = static_cast<int8_t>(atoi(row[11]));
e.max_expansion = static_cast<int8_t>(atoi(row[12]));
e.content_flags = row[13] ? row[13] : "";
e.content_flags_disabled = row[14] ? row[14] : "";