From 65e35355faa02ca0b0681b351ed0f4ce9e26dcaf Mon Sep 17 00:00:00 2001
From: terencehill <piuntn@gmail.com>
Date: Fri, 6 Apr 2018 13:34:18 +0200
Subject: [PATCH] Small cleanups

---
 qcsrc/menu/xonotic/weaponarenacheckbox.qc | 5 ++---
 qcsrc/server/command/cmd.qc               | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/qcsrc/menu/xonotic/weaponarenacheckbox.qc b/qcsrc/menu/xonotic/weaponarenacheckbox.qc
index fd4f51385..695b2d787 100644
--- a/qcsrc/menu/xonotic/weaponarenacheckbox.qc
+++ b/qcsrc/menu/xonotic/weaponarenacheckbox.qc
@@ -21,9 +21,8 @@ void XonoticWeaponarenaCheckBox_setChecked(entity me, float foo)
 }
 void XonoticWeaponarenaCheckBox_loadCvars(entity me)
 {
-	float n = tokenize_console(cvar_string("menu_weaponarena"));
-	float i;
-	for(i=0; i<n; ++i)
+	int n = tokenize_console(cvar_string("menu_weaponarena"));
+	for (int i = 0; i < n; i++)
 	{
 		if(argv(i) == me.netname)
 		{
diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 088925f10..47e94f520 100644
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -614,8 +614,10 @@ void ClientCommand_voice(entity caller, float request, float argc, string comman
 					sprint(caller, sprintf("Invalid voice. Use one of: %s\n", allvoicesamples));
 					return;
 				}
-				if (argc >= 3) VoiceMessage(caller, e, substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2)));
-				else VoiceMessage(caller, e, "");
+				string msg = "";
+				if (argc >= 3)
+					msg = substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2));
+				VoiceMessage(caller, e, msg);
 
 				return;
 			}
-- 
2.39.2