X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=prvm_edict.c;h=79c937a492767aa72088748435fe4536a8b49f30;hb=324a5329d33ef90df59e6488abce6433d90ac04c;hp=77a1af71b053f5a9143496359961f2fb2c8e4684;hpb=1c54a41c77409164170eb49389103f5cf7a9b344;p=xonotic%2Fdarkplaces.git

diff --git a/prvm_edict.c b/prvm_edict.c
index 77a1af71..79c937a4 100644
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -1938,6 +1938,7 @@ void PRVM_Prog_Load(prvm_prog_t *prog, const char * filename, unsigned char * da
 	unsigned int d;
 	char vabuf[1024];
 	char vabuf2[1024];
+	cvar_t *cvar;
 
 	if (prog->loaded)
 		prog->error_cmd("PRVM_LoadProgs: there is already a %s program loaded!", prog->name );
@@ -2353,6 +2354,9 @@ void PRVM_Prog_Load(prvm_prog_t *prog, const char * filename, unsigned char * da
 		}
 	}
 
+	for (cvar = cvar_vars; cvar; cvar = cvar->next)
+		cvar->globaldefindex[prog - prvm_prog_list] = -1;
+
 	for (i=0 ; i<prog->numglobaldefs ; i++)
 	{
 		const char *name;
@@ -2364,7 +2368,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_t *cvar = Cvar_FindVar(name + 9);
+			cvar = Cvar_FindVar(name + 9);
 			//Con_Printf("PRVM_LoadProgs: autocvar global %s in %s, processing...\n", name, prog->name);
 			if(!cvar)
 			{
@@ -2398,7 +2402,6 @@ void PRVM_Prog_Load(prvm_prog_t *prog, const char * filename, unsigned char * da
 				}
 				if(!cvar)
 					prog->error_cmd("PRVM_LoadProgs: could not create cvar for autocvar global %s in %s", name, prog->name);
-				cvar->globaldefindex_progid[prog - prvm_prog_list] = prog->id;
 				cvar->globaldefindex[prog - prvm_prog_list] = i;
 			}
 			else if((cvar->flags & CVAR_PRIVATE) == 0)
@@ -2435,7 +2438,6 @@ void PRVM_Prog_Load(prvm_prog_t *prog, const char * filename, unsigned char * da
 						Con_Printf("PRVM_LoadProgs: invalid type of autocvar global %s in %s\n", name, prog->name);
 						goto fail;
 				}
-				cvar->globaldefindex_progid[prog - prvm_prog_list] = prog->id;
 				cvar->globaldefindex[prog - prvm_prog_list] = i;
 			}
 			else