Extend minetest.is_yes()

minetest · Jan 7, 2017 · c435eab · c435eab
1 parent b387f95
commit c435eab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;
 }