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

Added unsigned rate support for yaml (#4442)

Browse Source 
Added core functions to supported reading unsigned rates.
By default rates are values between 0 and 10000, if no other maximum is defined.
This commit is contained in:
Lemongrass3110 2019-11-04 22:04:16 +01:00 committed by GitHub
parent f10fdf5aa0
commit 159ce4e3cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/common/database.cpp
View File

@ -237,6 +237,34 @@ bool YamlDatabase::asString(const YAML::Node &node, const std::string &name, std
return asType<std::string>(node, name, out); return asType<std::string>(node, name, out);
} }
bool YamlDatabase::asUInt16Rate( const YAML::Node& node, const std::string& name, uint16& out, uint16 maximum ){
if( this->asUInt16( node, name, out ) ){
if( out > maximum ){
this->invalidWarning( node[name], "Node \"%s\" with value %" PRIu16 " exceeds maximum of %" PRIu16 ".\n", name.c_str(), out, maximum );
return false;
}else{
return true;
}
}else{
return false;
}
}
bool YamlDatabase::asUInt32Rate( const YAML::Node& node, const std::string& name, uint32& out, uint32 maximum ){
if( this->asUInt32( node, name, out ) ){
if( out > maximum ){
this->invalidWarning( node[name], "Node \"%s\" with value %" PRIu32 " exceeds maximum of %" PRIu32 ".\n", name.c_str(), out, maximum );
return false;
}else{
return true;
}
}else{
return false;
}
}
void YamlDatabase::invalidWarning( const YAML::Node &node, const char* fmt, ... ){ void YamlDatabase::invalidWarning( const YAML::Node &node, const char* fmt, ... ){
va_list ap; va_list ap;

2
src/common/database.hpp
View File

@ -46,6 +46,8 @@ protected:
bool asFloat(const YAML::Node &node, const std::string &name, float &out); bool asFloat(const YAML::Node &node, const std::string &name, float &out);
bool asDouble(const YAML::Node &node, const std::string &name, double &out); bool asDouble(const YAML::Node &node, const std::string &name, double &out);
bool asString(const YAML::Node &node, const std::string &name, std::string &out); bool asString(const YAML::Node &node, const std::string &name, std::string &out);
bool asUInt16Rate(const YAML::Node& node, const std::string& name, uint16& out, uint16 maximum=10000);
bool asUInt32Rate(const YAML::Node& node, const std::string& name, uint32& out, uint32 maximum=10000);
public: public:
YamlDatabase( const std::string type_, uint16 version_, uint16 minimumVersion_ ){ YamlDatabase( const std::string type_, uint16 version_, uint16 minimumVersion_ ){