From da86e4e7f5d89a8f1c2e49cdeabeb613d2e6285c Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C4=81nis=20R=C5=ABcis?= Date: Wed, 12 May 2010 05:12:38 +0300 Subject: [PATCH] Attempt to get cl_weaponpriority working again --- qcsrc/client/Main.qc | 12 ++++++++---- qcsrc/server/miscfunctions.qc | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index d16e91820..9c1af7d5f 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -584,12 +584,16 @@ void GameCommand(string msg) localcmd("sv_cmd debug_shotorg\n"); } else if(cmd == "sendcvar") { - s = cvar_string(argv(1)); - if(argv(1) == "cl_weaponpriority") + // W_FixWeaponOrder will trash argv, so save what we need. + string cvar; + cvar = strzone(argv(1)); + s = cvar_string(cvar); + if(cvar == "cl_weaponpriority") s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 1); - else if(substring(argv(1), 0, 17) == "cl_weaponpriority" && strlen(argv(1)) == 18) + else if(substring(cvar, 0, 17) == "cl_weaponpriority" && strlen(cvar) == 18) s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 0); - localcmd("cmd sentcvar ", argv(1), " \"", s, "\"\n"); + localcmd("cmd sentcvar ", cvar, " \"", s, "\"\n"); + strunzone(cvar); } else if(cmd == "spawn") { s = argv(1); diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index a67a4e423..bcd1ea7d0 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -534,7 +534,7 @@ void GetCvars_handleString(string thisname, float f, .string field, string name) } } else - stuffcmd(self, strcat("sendcvar ", name, "\n")); + stuffcmd(self, strcat("cl_cmd sendcvar ", name, "\n")); } void GetCvars_handleString_Fixup(string thisname, float f, .string field, string name, string(string) func) { @@ -562,7 +562,7 @@ void GetCvars_handleFloat(string thisname, float f, .float field, string name) self.field = stof(argv(f + 1)); } else - stuffcmd(self, strcat("sendcvar ", name, "\n")); + stuffcmd(self, strcat("cl_cmd sendcvar ", name, "\n")); } void GetCvars_handleFloatOnce(string thisname, float f, .float field, string name) { @@ -584,7 +584,7 @@ void GetCvars_handleFloatOnce(string thisname, float f, .float field, string nam else { if(!self.field) - stuffcmd(self, strcat("sendcvar ", name, "\n")); + stuffcmd(self, strcat("cl_cmd sendcvar ", name, "\n")); } } string W_FixWeaponOrder_ForceComplete(string s); -- 2.39.2