From e2313a595cddf22b722d36ca1142e2bddb2fedff Mon Sep 17 00:00:00 2001 From: divverent Date: Wed, 1 Apr 2009 12:52:45 +0000 Subject: [PATCH] make cvar* functions unable to retrieve private cvars git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8837 d7cf8633-e32d-0410-b094-e92efae38249 --- prvm_cmds.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/prvm_cmds.c b/prvm_cmds.c index f47f5f68..a644f1a2 100644 --- a/prvm_cmds.c +++ b/prvm_cmds.c @@ -413,6 +413,13 @@ void VM_localcmd (void) Cbuf_AddText(string); } +static qboolean PRVM_Cvar_ReadOk(const char *string) +{ + cvar_t *cvar; + cvar = Cvar_FindVar(string); + return ((cvar) && ((cvar->flags & CVAR_PRIVATE) == 0)); +} + /* ================= VM_cvar @@ -426,7 +433,7 @@ void VM_cvar (void) VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar); VM_VarString(0, string, sizeof(string)); VM_CheckEmptyString(string); - PRVM_G_FLOAT(OFS_RETURN) = Cvar_VariableValue(string); + PRVM_G_FLOAT(OFS_RETURN) = PRVM_Cvar_ReadOk(string) ? Cvar_VariableValue(string) : 0; } /* @@ -488,7 +495,7 @@ void VM_cvar_string(void) VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar_string); VM_VarString(0, string, sizeof(string)); VM_CheckEmptyString(string); - PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(Cvar_VariableString(string)); + PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(PRVM_Cvar_ReadOk(string) ? Cvar_VariableString(string) : ""); } -- 2.39.2