X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=prvm_edict.c;h=7ad872f433000035b6fabea3c81016781fa6cea1;hb=9b45490b9b06f85f30c3b1a0da0bdb3a9032b8eb;hp=ceb0e3cb2d3bc34a1309defc485e137b3dece84e;hpb=b848fc3cc231ce9ff17e69975e70ad95e07a20f4;p=xonotic%2Fdarkplaces.git diff --git a/prvm_edict.c b/prvm_edict.c index ceb0e3cb..7ad872f4 100644 --- a/prvm_edict.c +++ b/prvm_edict.c @@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "progsvm.h" +#include "csprogs.h" prvm_prog_t *prog; @@ -31,11 +32,12 @@ int prvm_type_size[8] = {1,sizeof(string_t)/4,1,3,1,1,sizeof(func_t)/4,sizeof(v ddef_t *PRVM_ED_FieldAtOfs(int ofs); qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s, qboolean parsebackslash); -cvar_t prvm_language = {0, "prvm_language", "", "when set, loads progs.dat.LANGUAGENAME.po for string translations; when set to dump, progs.dat.dump.po is written from the strings in the progs"}; +cvar_t prvm_language = {CVAR_SAVE, "prvm_language", "", "when set, loads progs.dat.LANGUAGENAME.po for string translations; when set to dump, progs.dat.pot is written from the strings in the progs"}; // LordHavoc: prints every opcode as it executes - warning: this is significant spew cvar_t prvm_traceqc = {0, "prvm_traceqc", "0", "prints every QuakeC statement as it is executed (only for really thorough debugging!)"}; // LordHavoc: counts usage of each QuakeC statement cvar_t prvm_statementprofiling = {0, "prvm_statementprofiling", "0", "counts how many times each QuakeC statement has been executed, these counts are displayed in prvm_printfunction output (if enabled)"}; +cvar_t prvm_timeprofiling = {0, "prvm_timeprofiling", "0", "counts how long each function has been executed, these counts are displayed in prvm_profile output (if enabled)"}; cvar_t prvm_backtraceforwarnings = {0, "prvm_backtraceforwarnings", "0", "print a backtrace for warnings too"}; cvar_t prvm_leaktest = {0, "prvm_leaktest", "0", "try to detect memory leaks in strings or entities"}; cvar_t prvm_leaktest_ignore_classnames = {0, "prvm_leaktest_ignore_classnames", "", "classnames of entities to NOT leak check because they are found by find(world, classname, ...) but are actually spawned by QC code (NOT map entities)"}; @@ -647,7 +649,7 @@ void PRVM_ED_Print(prvm_edict_t *ed, const char *wildcard_fieldname) { d = &prog->fielddefs[i]; name = PRVM_GetString(d->s_name); - if (name[strlen(name)-2] == '_') + if(strlen(name) > 1 && name[strlen(name)-2] == '_' && (name[strlen(name)-1] == 'x' || name[strlen(name)-1] == 'y' || name[strlen(name)-1] == 'z')) continue; // skip _x, _y, _z vars // Check Field Name Wildcard @@ -731,8 +733,9 @@ void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed) if(developer_entityparsing.integer) Con_Printf("PRVM_ED_Write: at entity %d field %s\n", PRVM_NUM_FOR_EDICT(ed), name); - if (name[strlen(name)-2] == '_') - continue; // skip _x, _y, _z vars + //if(strlen(name) > 1 && name[strlen(name)-2] == '_' && (name[strlen(name)-1] == 'x' || name[strlen(name)-1] == 'y' || name[strlen(name)-1] == 'z')) + if(strlen(name) > 1 && name[strlen(name)-2] == '_') + continue; // skip _x, _y, _z vars, and ALSO other _? vars as some mods expect them to be never saved (TODO: a gameplayfix for using the "more precise" condition above?) v = (int *)(ed->fields.vp + d->ofs); @@ -1181,7 +1184,7 @@ void PRVM_ED_EdictGet_f(void) } v = (prvm_eval_t *)(ed->fields.vp + key->ofs); - s = PRVM_UglyValueString(key->type, v); + s = PRVM_UglyValueString((etype_t)key->type, v); if(Cmd_Argc() == 5) { cvar_t *cvar = Cvar_FindVar(Cmd_Argv(4)); @@ -1226,7 +1229,7 @@ void PRVM_ED_GlobalGet_f(void) } v = (prvm_eval_t *) &prog->globals.generic[key->ofs]; - s = PRVM_UglyValueString(key->type, v); + s = PRVM_UglyValueString((etype_t)key->type, v); if(Cmd_Argc() == 4) { cvar_t *cvar = Cvar_FindVar(Cmd_Argv(3)); @@ -1613,8 +1616,8 @@ void PRVM_FindOffsets(void) prog->fieldoffsets.nodrawtoclient = PRVM_ED_FindFieldOffset("nodrawtoclient"); prog->fieldoffsets.pflags = PRVM_ED_FindFieldOffset("pflags"); prog->fieldoffsets.ping = PRVM_ED_FindFieldOffset("ping"); - prog->fieldoffsets.packetloss = PRVM_ED_FindFieldOffset("ping_packetloss"); - prog->fieldoffsets.movementloss = PRVM_ED_FindFieldOffset("ping_movementloss"); + prog->fieldoffsets.ping_packetloss = PRVM_ED_FindFieldOffset("ping_packetloss"); + prog->fieldoffsets.ping_movementloss = PRVM_ED_FindFieldOffset("ping_movementloss"); prog->fieldoffsets.pitch_speed = PRVM_ED_FindFieldOffset("pitch_speed"); prog->fieldoffsets.playermodel = PRVM_ED_FindFieldOffset("playermodel"); prog->fieldoffsets.playerskin = PRVM_ED_FindFieldOffset("playerskin"); @@ -1635,6 +1638,7 @@ void PRVM_FindOffsets(void) prog->fieldoffsets.yaw_speed = PRVM_ED_FindFieldOffset("yaw_speed"); prog->fieldoffsets.bouncefactor = PRVM_ED_FindFieldOffset("bouncefactor"); prog->fieldoffsets.bouncestop = PRVM_ED_FindFieldOffset("bouncestop"); + prog->fieldoffsets.sendcomplexanimation = PRVM_ED_FindFieldOffset("sendcomplexanimation"); prog->fieldoffsets.solid = PRVM_ED_FindFieldOffset("solid"); prog->fieldoffsets.movetype = PRVM_ED_FindFieldOffset("movetype"); @@ -1656,6 +1660,16 @@ void PRVM_FindOffsets(void) prog->fieldoffsets.movedir = PRVM_ED_FindFieldOffset("movedir"); prog->fieldoffsets.camera_transform = PRVM_ED_FindFieldOffset("camera_transform"); + prog->fieldoffsets.userwavefunc_param0 = PRVM_ED_FindFieldOffset("userwavefunc_param0"); + prog->fieldoffsets.userwavefunc_param1 = PRVM_ED_FindFieldOffset("userwavefunc_param1"); + prog->fieldoffsets.userwavefunc_param2 = PRVM_ED_FindFieldOffset("userwavefunc_param2"); + prog->fieldoffsets.userwavefunc_param3 = PRVM_ED_FindFieldOffset("userwavefunc_param3"); + + prog->fieldoffsets.crypto_keyfp = PRVM_ED_FindFieldOffset("crypto_keyfp"); + prog->fieldoffsets.crypto_mykeyfp = PRVM_ED_FindFieldOffset("crypto_mykeyfp"); + prog->fieldoffsets.crypto_idfp = PRVM_ED_FindFieldOffset("crypto_idfp"); + prog->fieldoffsets.crypto_encryptmethod = PRVM_ED_FindFieldOffset("crypto_encryptmethod"); + prog->fieldoffsets.crypto_signmethod = PRVM_ED_FindFieldOffset("crypto_signmethod"); prog->funcoffsets.CSQC_ConsoleCommand = PRVM_ED_FindFunctionOffset("CSQC_ConsoleCommand"); prog->funcoffsets.CSQC_Ent_Remove = PRVM_ED_FindFunctionOffset("CSQC_Ent_Remove"); @@ -1725,6 +1739,8 @@ void PRVM_FindOffsets(void) prog->globaloffsets.v_right = PRVM_ED_FindGlobalOffset("v_right"); prog->globaloffsets.v_up = PRVM_ED_FindGlobalOffset("v_up"); prog->globaloffsets.view_angles = PRVM_ED_FindGlobalOffset("view_angles"); + prog->globaloffsets.view_punchangle = PRVM_ED_FindGlobalOffset("view_punchangle"); + prog->globaloffsets.view_punchvector = PRVM_ED_FindGlobalOffset("view_punchvector"); prog->globaloffsets.worldstatus = PRVM_ED_FindGlobalOffset("worldstatus"); prog->globaloffsets.particles_alphamin = PRVM_ED_FindGlobalOffset("particles_alphamin"); prog->globaloffsets.particles_alphamax = PRVM_ED_FindGlobalOffset("particles_alphamax"); @@ -1738,6 +1754,7 @@ void PRVM_FindOffsets(void) prog->funcoffsets.m_keyup = PRVM_ED_FindFunctionOffset("m_keyup"); prog->funcoffsets.m_shutdown = PRVM_ED_FindFunctionOffset("m_shutdown"); prog->funcoffsets.m_toggle = PRVM_ED_FindFunctionOffset("m_toggle"); + prog->funcoffsets.m_newmap = PRVM_ED_FindFunctionOffset("m_newmap"); } // not used @@ -1889,7 +1906,9 @@ po_t *PRVM_PO_Load(const char *filename, mempool_t *pool) if(!buf) return NULL; - po = Mem_Alloc(pool, sizeof(*po)); + memset(&thisstr, 0, sizeof(thisstr)); // hush compiler warning + + po = (po_t *)Mem_Alloc(pool, sizeof(*po)); memset(po, 0, sizeof(*po)); p = buf; @@ -1953,16 +1972,16 @@ po_t *PRVM_PO_Load(const char *filename, mempool_t *pool) { if(thisstr.key) Mem_Free(thisstr.key); - thisstr.key = Mem_Alloc(pool, decodedpos + 1); + thisstr.key = (char *)Mem_Alloc(pool, decodedpos + 1); memcpy(thisstr.key, decodedbuf, decodedpos + 1); } else if(decodedpos > 0 && thisstr.key) // skip empty translation results { - thisstr.value = Mem_Alloc(pool, decodedpos + 1); + thisstr.value = (char *)Mem_Alloc(pool, decodedpos + 1); memcpy(thisstr.value, decodedbuf, decodedpos + 1); hashindex = CRC_Block((const unsigned char *) thisstr.key, strlen(thisstr.key)) % PO_HASHSIZE; thisstr.nextonhashchain = po->hashtable[hashindex]; - po->hashtable[hashindex] = Mem_Alloc(pool, sizeof(thisstr)); + po->hashtable[hashindex] = (po_string_t *)Mem_Alloc(pool, sizeof(thisstr)); memcpy(po->hashtable[hashindex], &thisstr, sizeof(thisstr)); memset(&thisstr, 0, sizeof(thisstr)); } @@ -2065,7 +2084,7 @@ void PRVM_LoadLNO( const char *progname ) { PRVM_LoadProgs =============== */ -void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required_func, int numrequiredfields, prvm_required_field_t *required_field, int numrequiredglobals, char **required_global) +void PRVM_LoadProgs (const char * filename, int numrequiredfunc, const char **required_func, int numrequiredfields, prvm_required_field_t *required_field, int numrequiredglobals, char **required_global) { int i; dstatement_t *st; @@ -2318,6 +2337,7 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required // later idea: include a list of authorized .po file checksums with the csprogs { qboolean deftrans = !!strcmp(PRVM_NAME, "client"); + const char *realfilename = (strcmp(PRVM_NAME, "client") ? filename : csqc_progname.string); if(deftrans) // once we have dotranslate_ strings, ALWAYS use the opt-in method! { for (i=0 ; iprogs->numglobaldefs ; i++) @@ -2334,16 +2354,16 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required } if(!strcmp(prvm_language.string, "dump")) { - qfile_t *f = FS_OpenRealFile(va("%s.%s.po", filename, prvm_language.string), "w", false); - Con_Printf("Dumping to %s.%s.po\n", filename, prvm_language.string); + qfile_t *f = FS_OpenRealFile(va("%s.pot", realfilename), "w", false); + Con_Printf("Dumping to %s.pot\n", realfilename); if(f) { for (i=0 ; iprogs->numglobaldefs ; i++) { const char *name; name = PRVM_GetString(prog->globaldefs[i].s_name); - if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_string) if(deftrans ? (!name || strncmp(name, "notranslate_", 12)) : (name && !strncmp(name, "dotranslate_", 12))) + if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_string) { prvm_eval_t *val = (prvm_eval_t *)(prog->globals.generic + prog->globaldefs[i].ofs); const char *value = PRVM_GetString(val->string); @@ -2360,7 +2380,7 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required } else { - po_t *po = PRVM_PO_Load(va("%s.%s.po", filename, prvm_language.string), prog->progs_mempool); + po_t *po = PRVM_PO_Load(va("%s.%s.po", realfilename, prvm_language.string), prog->progs_mempool); if(po) { for (i=0 ; iprogs->numglobaldefs ; i++) @@ -2401,7 +2421,7 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required { const char *value; char buf[64]; - Con_Printf("PRVM_LoadProgs: no cvar for autocvar global %s in %s, creating...\n", name, PRVM_NAME); + Con_DPrintf("PRVM_LoadProgs: no cvar for autocvar global %s in %s, creating...\n", name, PRVM_NAME); switch(prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) { case ev_float: @@ -2736,6 +2756,7 @@ void PRVM_Init (void) Cvar_RegisterVariable (&prvm_language); Cvar_RegisterVariable (&prvm_traceqc); Cvar_RegisterVariable (&prvm_statementprofiling); + Cvar_RegisterVariable (&prvm_timeprofiling); Cvar_RegisterVariable (&prvm_backtraceforwarnings); Cvar_RegisterVariable (&prvm_leaktest); Cvar_RegisterVariable (&prvm_leaktest_ignore_classnames); @@ -2798,7 +2819,7 @@ void _PRVM_FreeAll(const char *filename, int fileline) } // LordHavoc: turned PRVM_EDICT_NUM into a #define for speed reasons -unsigned int PRVM_EDICT_NUM_ERROR(unsigned int n, char *filename, int fileline) +unsigned int PRVM_EDICT_NUM_ERROR(unsigned int n, const char *filename, int fileline) { PRVM_ERROR ("PRVM_EDICT_NUM: %s: bad number %i (called at %s:%i)", PRVM_NAME, n, filename, fileline); return 0; @@ -3225,7 +3246,7 @@ void PRVM_LeakTest(void) if(prog->knownstrings[i]) if(prog->knownstrings_freeable[i]) if(prog->knownstrings_origin[i]) - if(!PRVM_IsStringReferenced(-1 - i)) + if(!PRVM_IsStringReferenced(PRVM_KNOWNSTRINGBASE + i)) { Con_Printf("Unreferenced string found!\n Value: %s\n Origin: %s\n", prog->knownstrings[i], prog->knownstrings_origin[i]); leaked = true;