mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
Remove blank default values for emergequeue_limit_* settings
Add checks for invalid user input for important settings Rename Settings::tryGet* to Settings::get*NoEx for consistency
This commit is contained in:
parent
c6c5edd73a
commit
7f743178db
6 changed files with 32 additions and 26 deletions
|
@ -745,7 +745,7 @@ fail:
|
|||
}
|
||||
|
||||
//////////// Try to get value, no exception thrown
|
||||
bool tryGet(std::string name, std::string &val)
|
||||
bool getNoEx(std::string name, std::string &val)
|
||||
{
|
||||
try {
|
||||
val = get(name);
|
||||
|
@ -755,7 +755,7 @@ fail:
|
|||
}
|
||||
}
|
||||
|
||||
bool tryGetFlagStr(std::string name, u32 &val, FlagDesc *flagdesc)
|
||||
bool getFlagStrNoEx(std::string name, u32 &val, FlagDesc *flagdesc)
|
||||
{
|
||||
try {
|
||||
val = getFlagStr(name, flagdesc);
|
||||
|
@ -765,7 +765,7 @@ fail:
|
|||
}
|
||||
}
|
||||
|
||||
bool tryGetFloat(std::string name, float &val)
|
||||
bool getFloatNoEx(std::string name, float &val)
|
||||
{
|
||||
try {
|
||||
val = getFloat(name);
|
||||
|
@ -775,7 +775,7 @@ fail:
|
|||
}
|
||||
}
|
||||
|
||||
bool tryGetU16(std::string name, int &val)
|
||||
bool getU16NoEx(std::string name, int &val)
|
||||
{
|
||||
try {
|
||||
val = getU16(name);
|
||||
|
@ -785,7 +785,7 @@ fail:
|
|||
}
|
||||
}
|
||||
|
||||
bool tryGetU16(std::string name, u16 &val)
|
||||
bool getU16NoEx(std::string name, u16 &val)
|
||||
{
|
||||
try {
|
||||
val = getU16(name);
|
||||
|
@ -795,7 +795,7 @@ fail:
|
|||
}
|
||||
}
|
||||
|
||||
bool tryGetS16(std::string name, int &val)
|
||||
bool getS16NoEx(std::string name, int &val)
|
||||
{
|
||||
try {
|
||||
val = getU16(name);
|
||||
|
@ -805,7 +805,7 @@ fail:
|
|||
}
|
||||
}
|
||||
|
||||
bool tryGetS16(std::string name, s16 &val)
|
||||
bool getS16NoEx(std::string name, s16 &val)
|
||||
{
|
||||
try {
|
||||
val = getS16(name);
|
||||
|
@ -815,7 +815,7 @@ fail:
|
|||
}
|
||||
}
|
||||
|
||||
bool tryGetS32(std::string name, s32 &val)
|
||||
bool getS32NoEx(std::string name, s32 &val)
|
||||
{
|
||||
try {
|
||||
val = getS32(name);
|
||||
|
@ -825,7 +825,7 @@ fail:
|
|||
}
|
||||
}
|
||||
|
||||
bool tryGetV3F(std::string name, v3f &val)
|
||||
bool getV3FNoEx(std::string name, v3f &val)
|
||||
{
|
||||
try {
|
||||
val = getV3F(name);
|
||||
|
@ -835,7 +835,7 @@ fail:
|
|||
}
|
||||
}
|
||||
|
||||
bool tryGetV2F(std::string name, v2f &val)
|
||||
bool getV2FNoEx(std::string name, v2f &val)
|
||||
{
|
||||
try {
|
||||
val = getV2F(name);
|
||||
|
@ -845,7 +845,7 @@ fail:
|
|||
}
|
||||
}
|
||||
|
||||
bool tryGetU64(std::string name, u64 &val)
|
||||
bool getU64NoEx(std::string name, u64 &val)
|
||||
{
|
||||
try {
|
||||
val = getU64(name);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue