From: Martin Taibr Date: Sat, 14 Sep 2019 18:31:09 +0000 (+0200) Subject: restore var name so branch can be merged X-Git-Tag: xonotic-v0.8.5~1285^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F716%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git restore var name so branch can be merged --- diff --git a/qcsrc/dpdefs/upstream/csprogsdefs.qc b/qcsrc/dpdefs/upstream/csprogsdefs.qc index ea5e652fa..3748b8df7 100644 --- a/qcsrc/dpdefs/upstream/csprogsdefs.qc +++ b/qcsrc/dpdefs/upstream/csprogsdefs.qc @@ -393,7 +393,7 @@ string(entity ent) etos = #65; string(string s) precache_file = #68; void(entity e) makestatic = #69; -void(string var_, string val) cvar_set = #72; +void(string var, string val) cvar_set = #72; void(vector pos, string samp, float vol, float atten) ambientsound = #74; string(string s) precache_model2 = #75; diff --git a/qcsrc/dpdefs/upstream/progsdefs.qc b/qcsrc/dpdefs/upstream/progsdefs.qc index 9971bac09..2ccd84314 100644 --- a/qcsrc/dpdefs/upstream/progsdefs.qc +++ b/qcsrc/dpdefs/upstream/progsdefs.qc @@ -490,7 +490,7 @@ void(string s) changelevel = #70; //#71 was removed -void(string var_, string val) cvar_set = #72; // sets cvar.value +void(string var, string val) cvar_set = #72; // sets cvar.value void(entity client, string s, ...) centerprint = #73; // sprint, but in middle