From 26c5de33df1a8ee5beb57383f9b2dc72f51d6064 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 9 Jul 2015 17:39:06 +1000 Subject: [PATCH] Fix hardcoded constant values for cvar_type --- qcsrc/server/cl_physics.qc | 4 ++-- qcsrc/server/miscfunctions.qh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc index 37242874e..14747d156 100644 --- a/qcsrc/server/cl_physics.qc +++ b/qcsrc/server/cl_physics.qc @@ -58,13 +58,13 @@ float Physics_ClientOption(entity pl, string option) if(Physics_Valid(pl.cvar_cl_physics)) { string var = sprintf("g_physics_%s_%s", pl.cvar_cl_physics, option); - if(cvar_type(var) & 1) + if(cvar_type(var) & CVAR_TYPEFLAG_EXISTS) return cvar(var); } if(autocvar_g_physics_clientselect && autocvar_g_physics_clientselect_default) { string var = sprintf("g_physics_%s_%s", autocvar_g_physics_clientselect_default, option); - if(cvar_type(var) & 1) + if(cvar_type(var) & CVAR_TYPEFLAG_EXISTS) return cvar(var); } return cvar(strcat("sv_", option)); diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh index 3acc88360..b9ae44be9 100644 --- a/qcsrc/server/miscfunctions.qh +++ b/qcsrc/server/miscfunctions.qh @@ -15,7 +15,7 @@ #else string cvar_string_normal(string n) { - if (!(cvar_type(n) & 1)) + if (!(cvar_type(n) & CVAR_TYPEFLAG_EXISTS)) backtrace(strcat("Attempt to access undefined cvar: ", n)); return builtin_cvar_string(n); } -- 2.39.2