Extend minetest.is_yes()

diff --git a/src/unittest/test_utilities.cpp b/src/unittest/test_utilities.cpp
index d73975b9f84f11076932388f9a7372bc3e6ea4e6..58412dd85cb8dde84c7f0c13fbcd2eda0a83cf9f 100644 (file)
--- 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 572c371502c5965167c764d3110cd72488034b2d..ba3c09e513c2c18629e3b438cfc384d6dc6f5ae2 100644 (file)
--- 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;
 }