From e54ffea870583ac07710315594e41512219374b1 Mon Sep 17 00:00:00 2001
From: Samual <samual@xonotic.org>
Date: Mon, 19 Dec 2011 13:19:27 -0500
Subject: [PATCH] Add "interpretboolean" function to read "yes" and "no" and
such as 1/0
---
qcsrc/client/command/cl_cmd.qc | 28 ++++++++++++----------------
qcsrc/common/util.qc | 21 +++++++++++++++++++++
qcsrc/common/util.qh | 4 ++++
3 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/qcsrc/client/command/cl_cmd.qc b/qcsrc/client/command/cl_cmd.qc
index a48a542adc..fc1e762b75 100644
--- a/qcsrc/client/command/cl_cmd.qc
+++ b/qcsrc/client/command/cl_cmd.qc
@@ -138,11 +138,15 @@ void LocalCommand_handlevote(float request, float argc)
float vote_selection;
string vote_string;
- switch(argv(1))
+ if(InterpretBoolean(argv(1)))
+ {
+ vote_selection = 2;
+ vote_string = "yes";
+ }
+ else
{
- case "yes": vote_selection = 2; vote_string = "yes"; break;
- case "no": vote_selection = 1; vote_string = "no"; break;
- default: break;
+ vote_selection = 1;
+ vote_string = "no";
}
if(vote_selection)
@@ -172,7 +176,7 @@ void LocalCommand_handlevote(float request, float argc)
}
}
-void LocalCommand_hud(float request, float argc) // TODO: Add aliases in commands.cfg
+void LocalCommand_hud(float request, float argc)
{
switch(request)
{
@@ -202,24 +206,18 @@ void LocalCommand_hud(float request, float argc) // TODO: Add aliases in command
case "scoreboard_columns_set":
{
Cmd_HUD_SetFields(argc);
-
return;
}
case "scoreboard_columns_help":
{
Cmd_HUD_Help();
-
return;
}
case "radar":
{
- if(argv(2))
- hud_panel_radar_maximized = (stof(argv(2)) != 0);
- else
- hud_panel_radar_maximized = !hud_panel_radar_maximized;
-
+ hud_panel_radar_maximized = (argv(2) ? InterpretBoolean(argv(2)) : !hud_panel_radar_maximized);
return;
}
}
@@ -271,7 +269,6 @@ void LocalCommand_mv_download(float request, float argc)
case CMD_REQUEST_COMMAND:
{
Cmd_MapVote_MapDownload(argc);
-
return;
}
@@ -302,7 +299,6 @@ void LocalCommand_sendcvar(float request, float argc)
localcmd("cmd sentcvar ", thiscvar, " \"", s, "\"\n");
strunzone(thiscvar);
-
return;
}
@@ -322,7 +318,7 @@ void LocalCommand_settemp(float request, float argc)
{
case CMD_REQUEST_COMMAND:
{
- if((argv(1) == "restore") && (argc == 2))
+ if((argv(1) == "restore") && argv(2))
{
float i = cvar_clientsettemp_restore();
@@ -348,7 +344,7 @@ void LocalCommand_settemp(float request, float argc)
print("Incorrect parameters for ^2settemp^7\n");
case CMD_REQUEST_USAGE:
{
- print("\nUsage:^3 cl_cmd settemp <cvar> | [restore]\n");
+ print("\nUsage:^3 cl_cmd settemp \"cvar\" | [restore]\n");
print(" Where 'cvar' is the cvar plus arguments to send to the server,\n");
print(" or 'restore' allows you to restore all of the original temporary cvar values.\n");
return;
diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index a609827cf9..72a93d4a71 100644
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -2137,3 +2137,24 @@ string MakeConsoleSafe(string input)
input = strreplace("\"", "\\\"", input);
return input;
}
+
+#ifndef MENUQC
+// get true/false value of a string with multiple different inputs
+float InterpretBoolean(string input)
+{
+ switch(strtolower(input))
+ {
+ case "yes":
+ case "true":
+ case "on":
+ return TRUE;
+
+ case "no":
+ case "false":
+ case "off":
+ return FALSE;
+
+ default: return stof(input);
+ }
+}
+#endif
\ No newline at end of file
diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index e2dfcb3b86..a371218819 100644
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -274,3 +274,7 @@ float xdecode(string s);
#ifdef CSQC
entity ReadCSQCEntity()
#endif
+
+#ifndef MENUQC
+string strtolower(string s);
+#endif
\ No newline at end of file
--
2.39.5