From 63049d016df231bb7b125024ed8a1d11a323a83d Mon Sep 17 00:00:00 2001 From: divverent Date: Sun, 6 Dec 2009 17:58:43 +0000 Subject: [PATCH] we cannot skip the next 3 vars after encounting a vector - so we instead have to filter for names that end with _x, _y or _z. Sucks. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9545 d7cf8633-e32d-0410-b094-e92efae38249 --- prvm_edict.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/prvm_edict.c b/prvm_edict.c index 2ca28fff..8b4ddf0a 100644 --- a/prvm_edict.c +++ b/prvm_edict.c @@ -2063,13 +2063,15 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required { const char *name; name = PRVM_GetString(prog->globaldefs[i].s_name); + //Con_Printf("found var %s\n", name); if(name && !strncmp(name, "autocvar_", 9) - // && !(strlen(name) > 1 && name[strlen(name)-2] == '_' && (name[strlen(name)-1] == 'x' || name[strlen(name)-1] == 'y' || name[strlen(name)-1] == 'z')) + && !(strlen(name) > 1 && name[strlen(name)-2] == '_' && (name[strlen(name)-1] == 'x' || name[strlen(name)-1] == 'y' || name[strlen(name)-1] == 'z')) ) { prvm_eval_t *val = (prvm_eval_t *)(prog->globals.generic + prog->globaldefs[i].ofs); cvar_t *cvar = Cvar_FindVar(name + 9); + //Con_Printf("PRVM_LoadProgs: autocvar global %s in %s, processing...\n", name, PRVM_NAME); if(!cvar) { const char *value; @@ -2146,8 +2148,7 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required Con_Printf("PRVM_LoadProgs: private cvar for autocvar global %s in %s\n", name, PRVM_NAME); } fail: - if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_vector) - i += 3; // skip the _x _y _z floats + ; } prog->loaded = TRUE; -- 2.39.2