Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve some compile errors and warnings

Browse Source
This commit is contained in:
aleos 2024-05-03 13:06:40 -04:00
parent 69635631c0
commit 1ab4ebe576
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/tool/csv2yaml.cpp
View File

@ -161,9 +161,9 @@ static void produce_txt_data(const std::string &modePath, const std::string &fix
skill_produce.clear();
if (fileExists(modePath + "/produce_db.txt"))
sv_readdb(modePath.c_str(), "produce_db.txt", ',', 5, 5+2*MAX_PRODUCE_RESOURCE, MAX_SKILL_PRODUCE_DB, skill_parse_row_producedb, false);
sv_readdb(modePath.c_str(), "produce_db.txt", ',', 5, 5 + 2 * MAX_PRODUCE_RESOURCE, MAX_SKILL_PRODUCE_DB, skill_parse_row_producedb, false);
if (fileExists(fixedPath + "/skill_changematerial_db.txt"))
sv_readdb(fixedPath.c_str(), "skill_changematerial_db.txt", ',', 5, 5+2*MAX_SKILL_CHANGEMATERIAL_SET, MAX_SKILL_CHANGEMATERIAL_DB, skill_parse_row_changematerialdb, false);
sv_readdb(fixedPath.c_str(), "skill_changematerial_db.txt", ',', 5, 5 + 2 * MAX_SKILL_CHANGEMATERIAL_SET, MAX_SKILL_CHANGEMATERIAL_DB, skill_parse_row_changematerialdb, false);
}
template<typename Func>
@ -5296,12 +5296,8 @@ static bool read_homunculusdb( char* str[], size_t columns, size_t current ){
return true;
}
int main( int argc, char *argv[] ){
return main_core<Csv2YamlTool>( argc, argv );
}
// Copied and adjusted from skill.cpp
static bool skill_parse_row_producedb(char* split[], int columns, int current) {
static bool skill_parse_row_producedb(char* split[], size_t columns, size_t current) {
t_itemid nameid = static_cast<t_itemid>(strtoul(split[1], nullptr, 10));
if (nameid == 0) {
@ -5335,7 +5331,7 @@ static bool skill_parse_row_producedb(char* split[], int columns, int current) {
entry.req_skill_lv = skill_lv;
}
for (uint8 x = 5; x+1 < columns && split[x] && split[x+1]; x += 2) {
for (size_t x = 5; x+1 < columns && split[x] && split[x+1]; x += 2) {
nameid = static_cast<t_itemid>(strtoul(split[x], nullptr, 10));
item_name = util::umap_find(aegis_itemnames, nameid);
@ -5366,7 +5362,7 @@ static bool skill_parse_row_producedb(char* split[], int columns, int current) {
}
// Copied and adjusted from skill.cpp
static bool skill_parse_row_changematerialdb(char* split[], int columns, int current)
static bool skill_parse_row_changematerialdb(char* split[], size_t columns, size_t current)
{
t_itemid nameid = static_cast<t_itemid>(strtoul(split[1], nullptr, 10));
@ -5387,7 +5383,7 @@ static bool skill_parse_row_changematerialdb(char* split[], int columns, int cur
s_skill_changematerial_db_csv item = {};
item.baserate = static_cast<uint16>(strtoul(split[2], nullptr, 10));
for (uint16 x = 3; x+1 < columns && split[x] && split[x+1]; x += 2) {
for (size_t x = 3; x+1 < columns && split[x] && split[x+1]; x += 2) {
item.qty.insert({ static_cast<uint16>(strtoul(split[x], nullptr, 10)), static_cast<uint16>(strtoul(split[x+1], nullptr, 10)) });
}
@ -5462,3 +5458,7 @@ static bool skill_producedb_yaml(void) {
}
return true;
}
int main( int argc, char *argv[] ){
return main_core<Csv2YamlTool>( argc, argv );
}

6
src/tool/csv2yaml.hpp
View File

@ -557,9 +557,9 @@ static bool itemdb_read_combos(const char* file);
static bool cashshop_parse_dbrow( char* fields[], size_t columns, size_t current );
static bool read_homunculus_skilldb( char* split[], size_t columns, size_t current );
static bool read_homunculusdb( char* str[], size_t columns, size_t current );
static bool skill_parse_row_producedb(char* fields[], int columns, int current);
static bool skill_parse_row_producedb(char* fields[], size_t columns, size_t current);
static bool skill_producedb_yaml();
static bool skill_parse_row_changematerialdb(char* fields[], int columns, int current);
static bool skill_parse_row_createarrowdb(char* fields[], int columns, int current);
static bool skill_parse_row_producedb(char *split[], size_t columns, size_t current);
static bool skill_parse_row_changematerialdb(char* fields[], size_t columns, size_t current);
#endif /* CSV2YAML_HPP */