aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorred-001 <red-001@outlook.ie>2016-12-03 11:38:07 +0000
committerNer'zhul <nerzhul@users.noreply.github.com>2017-01-07 09:54:51 +0100
commitc435eabf3ffb77eab955d5faeb5450da1befc149 (patch)
treec2f2d834abcb58fdecbc34f2379e52f7b8c604a5
parentb387f95ed31e9d1dc61ffd10f19187349705d6c9 (diff)
downloadminetest-c435eabf3ffb77eab955d5faeb5450da1befc149.tar.gz
minetest-c435eabf3ffb77eab955d5faeb5450da1befc149.tar.bz2
minetest-c435eabf3ffb77eab955d5faeb5450da1befc149.zip
Extend minetest.is_yes()
-rw-r--r--src/unittest/test_utilities.cpp2
-rw-r--r--src/util/string.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/unittest/test_utilities.cpp b/src/unittest/test_utilities.cpp
index d73975b9f..58412dd85 100644
--- a/src/unittest/test_utilities.cpp
+++ b/src/unittest/test_utilities.cpp
@@ -147,6 +147,8 @@ void TestUtilities::testIsYes()
UASSERT(is_yes("0") == false);
UASSERT(is_yes("1") == true);
UASSERT(is_yes("2") == true);
+ UASSERT(is_yes("on") == true);
+ UASSERT(is_yes("off") == false);
}
diff --git a/src/util/string.h b/src/util/string.h
index 572c37150..ba3c09e51 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -272,7 +272,7 @@ inline bool is_yes(const std::string &str)
{
std::string s2 = lowercase(trim(str));
- return s2 == "y" || s2 == "yes" || s2 == "true" || atoi(s2.c_str()) != 0;
+ return s2 == "y" || s2 == "yes" || s2 == "true" || s2 == "on" || atoi(s2.c_str()) != 0;
}