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

Changed format arg type

Browse Source
This commit is contained in:
Jittapan 2022-11-12 14:00:51 +07:00 committed by Atemo
parent 180913d448
commit 4ae18c2353
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/map/itemdb.cpp
View File

@ -870,7 +870,7 @@ uint64 ItemDatabase::parseBodyNode(const ryml::NodeRef& node) {
item->stack.guild_storage = false; item->stack.guild_storage = false;
} }
} }
if (this->nodeExists(node, "NoUse")) { if (this->nodeExists(node, "NoUse")) {
const auto& nouseNode = node["NoUse"]; const auto& nouseNode = node["NoUse"];
@ -1064,7 +1064,7 @@ uint64 ItemDatabase::parseBodyNode(const ryml::NodeRef& node) {
item->script = parse_script(script.c_str(), this->getCurrentFile().c_str(), this->getLineNumber(node["Script"]), SCRIPT_IGNORE_EXTERNAL_BRACKETS); item->script = parse_script(script.c_str(), this->getCurrentFile().c_str(), this->getLineNumber(node["Script"]), SCRIPT_IGNORE_EXTERNAL_BRACKETS);
} else { } else {
if (!exists) if (!exists)
item->script = nullptr; item->script = nullptr;
} }
@ -3186,7 +3186,7 @@ uint64 ItemGroupDatabase::parseBodyNode(const ryml::NodeRef& node) {
this->invalidWarning(node, "Invalid AnnounceBoxItemId node.\n"); this->invalidWarning(node, "Invalid AnnounceBoxItemId node.\n");
} }
if (!item_db.exists(tmp_nameid)) { if (!item_db.exists(tmp_nameid)) {
ShowWarning("ItemGroupDatabase::parseBodyNode: Box item `%lu` does not exist. Ignoring.\n", tmp_nameid); ShowWarning("ItemGroupDatabase::parseBodyNode: Box item `%u` does not exist. Ignoring.\n", tmp_nameid);
} }
else { else {
group->announce_box_id = tmp_nameid; group->announce_box_id = tmp_nameid;
@ -4143,7 +4143,7 @@ static int itemdb_read_sqldb(void) {
bool itemdb_isNoEquip(struct item_data *id, uint16 m) { bool itemdb_isNoEquip(struct item_data *id, uint16 m) {
if (!id->flag.no_equip) if (!id->flag.no_equip)
return false; return false;
struct map_data *mapdata = map_getmapdata(m); struct map_data *mapdata = map_getmapdata(m);
if ((id->flag.no_equip&1 && !mapdata_flag_vs2(mapdata)) || // Normal if ((id->flag.no_equip&1 && !mapdata_flag_vs2(mapdata)) || // Normal
@ -4555,18 +4555,18 @@ static void itemdb_read(void) {
"", "",
"/" DBIMPORT, "/" DBIMPORT,
}; };
if (db_use_sqldbs) if (db_use_sqldbs)
itemdb_read_sqldb(); itemdb_read_sqldb();
else else
item_db.load(); item_db.load();
for(i=0; i<ARRAYLENGTH(dbsubpath); i++){ for(i=0; i<ARRAYLENGTH(dbsubpath); i++){
uint8 n1 = (uint8)(strlen(db_path)+strlen(dbsubpath[i])+1); uint8 n1 = (uint8)(strlen(db_path)+strlen(dbsubpath[i])+1);
uint8 n2 = (uint8)(strlen(db_path)+strlen(DBPATH)+strlen(dbsubpath[i])+1); uint8 n2 = (uint8)(strlen(db_path)+strlen(DBPATH)+strlen(dbsubpath[i])+1);
char* dbsubpath1 = (char*)aMalloc(n1+1); char* dbsubpath1 = (char*)aMalloc(n1+1);
char* dbsubpath2 = (char*)aMalloc(n2+1); char* dbsubpath2 = (char*)aMalloc(n2+1);
if(i==0) { if(i==0) {
safesnprintf(dbsubpath1,n1,"%s%s",db_path,dbsubpath[i]); safesnprintf(dbsubpath1,n1,"%s%s",db_path,dbsubpath[i]);
@ -4667,7 +4667,7 @@ void itemdb_reload(void) {
pc_setinventorydata(sd); pc_setinventorydata(sd);
pc_check_available_item(sd, ITMCHK_ALL); // Check for invalid(ated) items. pc_check_available_item(sd, ITMCHK_ALL); // Check for invalid(ated) items.
pc_load_combo(sd); // Check to see if new combos are available pc_load_combo(sd); // Check to see if new combos are available
status_calc_pc(sd, SCO_FORCE); // status_calc_pc(sd, SCO_FORCE); //
} }
mapit_free(iter); mapit_free(iter);
} }