Accept true/false for SetOption, SetChatOption

nickgammon · Jul 10, 2010 · a6f49a1 · a6f49a1
1 parent db1fd0e
commit a6f49a1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/scripting/lua_methods.cpp b/scripting/lua_methods.cpp
@@ -4770,7 +4770,7 @@ static int L_SetChatOption (lua_State *L)
   lua_pushnumber (L, pDoc->SetChatOption (
       my_checknumber (L, 1),    // Chat ID
       my_checkstring (L, 2),    // OptionName
-      my_checkstring (L, 3)     // Value
+      get_option_value (L, 3)   // Value
       ));
   return 1;  // number of result fields
   } // end of L_SetChatOption
@@ -4899,9 +4899,17 @@ static int L_SetNotes (lua_State *L)
 static int L_SetOption (lua_State *L)
   {
   CMUSHclientDoc *pDoc = doc (L);
+  lua_Number option;
+
+    // if boolean convert to 0 or 1
+  if (lua_isboolean (L, 2))
+    option = lua_toboolean (L, 2) ? 1 : 0;
+  else
+    option = my_checknumber (L, 2);
+
   lua_pushnumber (L, pDoc->SetOption (
       my_checkstring (L, 1),    // OptionName
-      my_checknumber (L, 2)     // Value
+      option                    // Value
       ));
   return 1;  // number of result fields
   } // end of L_SetOption

diff --git a/scripting/methods.cpp b/scripting/methods.cpp
@@ -8436,6 +8436,16 @@ bool bChanged;
     {
     // this is a numeric option
 
+    // for boolean options, accept "y" or "n"
+    if (ChatOptionsTable [iItem].iMinimum == 0 &&
+      ChatOptionsTable [iItem].iMaximum == 0)
+      {
+      if (strValue == "Y" || strValue == "y")
+        Value = "1";
+      else if (strValue == "N" || strValue == "n")
+        Value = "0";
+      }
+
     if (!IsNumber (Value, true))
        return eOptionOutOfRange;