X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=prvm_edict.c;h=c027ec719bdd656242c50fb7d54fe196787e88ea;hb=e2cbba9125f88e89b18c920bfb3343cf074ae6eb;hp=90cc8d8f79e38badfc76e9769c8c430ed04179ea;hpb=dcf2feebb91580baccadb844a0749518c32ccb55;p=xonotic%2Fdarkplaces.git

diff --git a/prvm_edict.c b/prvm_edict.c
index 90cc8d8f..c027ec71 100644
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -1164,11 +1164,12 @@ static void PRVM_ED_EdictGet_f(cmd_state_t *cmd)
 	s = PRVM_UglyValueString(prog, (etype_t)key->type, v, valuebuf, sizeof(valuebuf));
 	if(Cmd_Argc(cmd) == 5)
 	{
-		cvar_t *cvar = Cvar_FindVar(cmd->cvars, Cmd_Argv(cmd, 4), cmd->cvars_flagsmask, true);
-		if (cvar)
-			if(Cvar_Readonly(cvar, "prvm_edictget"))
-				goto fail;
-
+		cvar_t *cvar = Cvar_FindVar(cmd->cvars, Cmd_Argv(cmd, 4), cmd->cvars_flagsmask);
+		if (cvar && cvar->flags & CVAR_READONLY)
+		{
+			Con_Printf("prvm_edictget: %s is read-only\n", cvar->name);
+			goto fail;
+		}
 		Cvar_Get(cmd->cvars, Cmd_Argv(cmd, 4), s, cmd->cvars_flagsmask, NULL);
 	}
 	else
@@ -1206,10 +1207,12 @@ static void PRVM_ED_GlobalGet_f(cmd_state_t *cmd)
 	s = PRVM_UglyValueString(prog, (etype_t)key->type, v, valuebuf, sizeof(valuebuf));
 	if(Cmd_Argc(cmd) == 4)
 	{
-		cvar_t *cvar = Cvar_FindVar(cmd->cvars, Cmd_Argv(cmd, 3), cmd->cvars_flagsmask, true);
-		if (cvar)
-			if(Cvar_Readonly(cvar, "prvm_globalget"))
-				goto fail;
+		cvar_t *cvar = Cvar_FindVar(cmd->cvars, Cmd_Argv(cmd, 3), cmd->cvars_flagsmask);
+		if (cvar && cvar->flags & CVAR_READONLY)
+		{
+			Con_Printf("prvm_globalget: %s is read-only\n", cvar->name);
+			goto fail;
+		}
 		Cvar_Get(cmd->cvars, Cmd_Argv(cmd, 3), s, cmd->cvars_flagsmask, NULL);
 	}
 	else
@@ -2387,7 +2390,7 @@ void PRVM_Prog_Load(prvm_prog_t *prog, const char * filename, unsigned char * da
 		)
 		{
 			prvm_eval_t *val = PRVM_GLOBALFIELDVALUE(prog->globaldefs[i].ofs);
-			cvar = Cvar_FindVar(prog->console_cmd->cvars, name + 9, prog->console_cmd->cvars_flagsmask, false);
+			cvar = Cvar_FindVar(prog->console_cmd->cvars, name + 9, prog->console_cmd->cvars_flagsmask);
 			//Con_Printf("PRVM_LoadProgs: autocvar global %s in %s, processing...\n", name, prog->name);
 			if(!cvar)
 			{