DP_QC_AUTOCVARS: declare a QC variable float/vector/string autocvar_foo, and it will...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9538 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cvar.c b/cvar.c
index 111550a8632107df7d141d4aebf2592965cdc128..30ba09fde88c87d399715ef14e48069f3b5481e0 100644 (file)
--- a/cvar.c
+++ b/cvar.c
@@ -233,6 +233,8 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
 {
        qboolean changed;
        size_t valuelen;
 {
        qboolean changed;
        size_t valuelen;

+       prvm_prog_t *tmpprog;
+       int i;

 
        changed = strcmp(var->string, value) != 0;
        // LordHavoc: don't reallocate when there is no change
 
        changed = strcmp(var->string, value) != 0;
        // LordHavoc: don't reallocate when there is no change


@@ -305,6 +307,49 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value)
                else if (!strcmp(var->name, "net_slist_favorites"))
                        NetConn_UpdateFavorites();
        }
                else if (!strcmp(var->name, "net_slist_favorites"))
                        NetConn_UpdateFavorites();
        }

+
+       tmpprog = prog;
+       for(i = 0; i < PRVM_MAXPROGS; ++i)
+       {
+               if(PRVM_ProgLoaded(i))
+               {
+                       PRVM_SetProg(i);
+                       if(var->globaldefindex_progid[i] == prog->id)
+                       {
+                               // MUST BE SYNCED WITH prvm_edict.c PRVM_LoadProgs
+                               int j;
+                               const char *s;
+                               prvm_eval_t *val = (prvm_eval_t *)(prog->globals.generic + prog->globaldefs[var->globaldefindex[i]].ofs);
+                               switch(prog->globaldefs[var->globaldefindex[i]].type & ~DEF_SAVEGLOBAL)
+                               {
+                                       case ev_float:
+                                               val->_float = var->value;
+                                               break;
+                                       case ev_vector:
+                                               s = var->string;
+                                               VectorClear(val->vector);
+                                               for (j = 0;j < 3;j++)
+                                               {
+                                                       while (*s && ISWHITESPACE(*s))
+                                                               s++;
+                                                       if (!*s)
+                                                               break;
+                                                       val->vector[j] = atof(s);
+                                                       while (!ISWHITESPACE(*s))
+                                                               s++;
+                                                       if (!*s)
+                                                               break;
+                                               }
+                                               break;
+                                       case ev_string:
+                                               PRVM_ChangeEngineString(var->globaldefindex_stringno[i], var->string);
+                                               val->string = var->globaldefindex_stringno[i];
+                                               break;
+                               }
+                       }
+               }
+       }
+       prog = tmpprog;

 }
 
 void Cvar_SetQuick (cvar_t *var, const char *value)
 }
 
 void Cvar_SetQuick (cvar_t *var, const char *value)

diff --git a/cvar.h b/cvar.h
index 8fb6ca2c75e50e63f090be0ecbf9385b65f7104c..636ca40b6c0c963f0e55c74e6cc078e5b559ea40 100644 (file)
--- a/cvar.h
+++ b/cvar.h
@@ -124,6 +124,10 @@ typedef struct cvar_s
 
        char *defstring;
 
 
        char *defstring;
 

+       unsigned int globaldefindex_progid[3];
+       int globaldefindex[3];
+       int globaldefindex_stringno[3];
+

        //menucvar_t menuinfo;
        struct cvar_s *next;
        struct cvar_s *nextonhashchain;
        //menucvar_t menuinfo;
        struct cvar_s *next;
        struct cvar_s *nextonhashchain;

diff --git a/mvm_cmds.c b/mvm_cmds.c
index 2bcf93feaff9ff1f37da5eb7455c740152fe35b5..6042843ff6ee1c17d5bc974c6532698652ab6c21 100644 (file)
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -16,6 +16,7 @@ char *vm_m_extensions =
 "DP_GECKO_SUPPORT "
 "DP_MENU_EXTRESPONSEPACKET "
 "DP_QC_ASINACOSATANATAN2TAN "
 "DP_GECKO_SUPPORT "
 "DP_MENU_EXTRESPONSEPACKET "
 "DP_QC_ASINACOSATANATAN2TAN "

+"DP_QC_AUTOCVARS "

 "DP_QC_CMD "
 "DP_QC_CRC16 "
 "DP_QC_CVAR_TYPE "
 "DP_QC_CMD "
 "DP_QC_CRC16 "
 "DP_QC_CVAR_TYPE "

diff --git a/progsvm.h b/progsvm.h
index 1251944b3054f610e4a8abb75aa507de6a83ae4f..2dd9e0ff1f4d4fe7416e5c75e262dfae79f31886 100644 (file)
--- a/progsvm.h
+++ b/progsvm.h
@@ -358,6 +358,7 @@ prvm_stringbuffer_t;
 typedef struct prvm_prog_s
 {
        double              starttime;
 typedef struct prvm_prog_s
 {
        double              starttime;

+       unsigned int            id; // increasing unique id of progs instance

        dprograms_t                     *progs;
        mfunction_t                     *functions;
        char                            *strings;
        dprograms_t                     *progs;
        mfunction_t                     *functions;
        char                            *strings;


@@ -628,6 +629,7 @@ void PRVM_ED_PrintNum (int ent, const char *wildcard_fieldname);
 
 const char *PRVM_GetString(int num);
 int PRVM_SetEngineString(const char *s);
 
 const char *PRVM_GetString(int num);
 int PRVM_SetEngineString(const char *s);

+const char *PRVM_ChangeEngineString(int i, const char *s);

 int PRVM_SetTempString(const char *s);
 int PRVM_AllocString(size_t bufferlength, char **pointer);
 void PRVM_FreeString(int num);
 int PRVM_SetTempString(const char *s);
 int PRVM_AllocString(size_t bufferlength, char **pointer);
 void PRVM_FreeString(int num);

diff --git a/prvm_edict.c b/prvm_edict.c
index 5ac8db89643ba091159dd626f08065a530e0464c..35af00bf4be0e3e8744e38eb6ff6ab49b15b7da3 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -2059,6 +2059,74 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required
 
        PRVM_Init_Exec();
 
 
        PRVM_Init_Exec();
 

+       for (i=0 ; i<prog->progs->numglobaldefs ; i++)
+       {
+               const char *name;
+               cvar_t *cvar;
+               name = PRVM_GetString(prog->globaldefs[i].s_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'))
+               )
+               {
+                       
+                       cvar = Cvar_FindVar(name + 9);
+                       if(!cvar)
+                       {
+                               Con_Printf("PRVM_LoadProgs: no cvar for autocvar global %s in %s\n", name, PRVM_NAME);
+                               cvar = Cvar_Get(name + 9, "", 0, NULL);
+                               if(!cvar)
+                                       PRVM_ERROR("PRVM_LoadProgs: could not create cvar for autocvar global %s in %s", name, PRVM_NAME);
+                       }
+                       if(cvar && ((cvar->flags & CVAR_PRIVATE) == 0))
+                       {
+                               // MUST BE SYNCED WITH cvar.c Cvar_Set
+                               int j;
+                               const char *s;
+                               prvm_eval_t *val = (prvm_eval_t *)(prog->globals.generic + prog->globaldefs[i].ofs);
+                               switch(prog->globaldefs[i].type & ~DEF_SAVEGLOBAL)
+                               {
+                                       case ev_float:
+                                               val->_float = cvar->value;
+                                               cvar->globaldefindex_progid[prog - prog_list] = prog->id;
+                                               cvar->globaldefindex[prog - prog_list] = i;
+                                               break;
+                                       case ev_vector:
+                                               s = cvar->string;
+                                               VectorClear(val->vector);
+                                               for (j = 0;j < 3;j++)
+                                               {
+                                                       while (*s && ISWHITESPACE(*s))
+                                                               s++;
+                                                       if (!*s)
+                                                               break;
+                                                       val->vector[j] = atof(s);
+                                                       while (!ISWHITESPACE(*s))
+                                                               s++;
+                                                       if (!*s)
+                                                               break;
+                                               }
+                                               cvar->globaldefindex_progid[prog - prog_list] = prog->id;
+                                               cvar->globaldefindex[prog - prog_list] = i;
+                                               break;
+                                       case ev_string:
+                                               val->string = PRVM_SetEngineString(cvar->string);
+                                               cvar->globaldefindex_progid[prog - prog_list] = prog->id;
+                                               cvar->globaldefindex[prog - prog_list] = i;
+                                               cvar->globaldefindex_stringno[prog - prog_list] = val->string;
+                                               break;
+                                       default:
+                                               Con_Printf("PRVM_LoadProgs: invalid type of autocvar global %s in %s\n", name, PRVM_NAME);
+                                               break;
+                               }
+                       }
+                       else
+                               Con_Printf("PRVM_LoadProgs: private cvar for autocvar global %s in %s\n", name, PRVM_NAME);
+               }
+               if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_vector)
+                       i += 3; // skip the _x _y _z floats
+       }
+

        prog->loaded = TRUE;
 
        // set flags & ddef_ts in prog
        prog->loaded = TRUE;
 
        // set flags & ddef_ts in prog


@@ -2341,6 +2409,8 @@ PRVM_InitProg
 */
 void PRVM_InitProg(int prognr)
 {
 */
 void PRVM_InitProg(int prognr)
 {

+       static unsigned int progid = 0;
+

        if(prognr < 0 || prognr >= PRVM_MAXPROGS)
                Sys_Error("PRVM_InitProg: Invalid program number %i",prognr);
 
        if(prognr < 0 || prognr >= PRVM_MAXPROGS)
                Sys_Error("PRVM_InitProg: Invalid program number %i",prognr);
 


@@ -2351,6 +2421,7 @@ void PRVM_InitProg(int prognr)
 
        memset(prog, 0, sizeof(prvm_prog_t));
        prog->starttime = Sys_DoubleTime();
 
        memset(prog, 0, sizeof(prvm_prog_t));
        prog->starttime = Sys_DoubleTime();

+       prog->id = ++progid;

 
        prog->error_cmd = Host_Error;
        prog->leaktest_active = prvm_leaktest.integer != 0;
 
        prog->error_cmd = Host_Error;
        prog->leaktest_active = prvm_leaktest.integer != 0;


@@ -2449,6 +2520,17 @@ const char *PRVM_GetString(int num)
        }
 }
 
        }
 }
 

+const char *PRVM_ChangeEngineString(int i, const char *s)
+{
+       const char *old;
+       i = -1 - i;
+       if(i < 0 || i >= prog->numknownstrings)
+               PRVM_ERROR("PRVM_ChangeEngineString: s is not an engine string");
+       old = prog->knownstrings[i];
+       prog->knownstrings[i] = s;
+       return old;
+}
+

 int PRVM_SetEngineString(const char *s)
 {
        int i;
 int PRVM_SetEngineString(const char *s)
 {
        int i;

diff --git a/svvm_cmds.c b/svvm_cmds.c
index 6dc99e5c215462f7997815f0ac60e128aac2bec7..879f797493aa1d1d1421692330237315f378f8d7 100644 (file)
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -65,6 +65,7 @@ char *vm_sv_extensions =
 "DP_MOVETYPEFOLLOW "
 "DP_NULL_MODEL "
 "DP_QC_ASINACOSATANATAN2TAN "
 "DP_MOVETYPEFOLLOW "
 "DP_NULL_MODEL "
 "DP_QC_ASINACOSATANATAN2TAN "

+"DP_QC_AUTOCVARS "

 "DP_QC_CHANGEPITCH "
 "DP_QC_CMD "
 "DP_QC_COPYENTITY "
 "DP_QC_CHANGEPITCH "
 "DP_QC_CMD "
 "DP_QC_COPYENTITY "