cvar_t prvm_reuseedicts_startuptime = {0, "prvm_reuseedicts_startuptime", "2", "allows immediate re-use of freed entity slots during start of new level (value in seconds)"};
cvar_t prvm_reuseedicts_neverinsameframe = {0, "prvm_reuseedicts_neverinsameframe", "1", "never allows re-use of freed entity slots during same frame"};
+static double prvm_reuseedicts_always_allow = 0;
qboolean prvm_runawaycheck = true;
-// LordHavoc: optional runtime bounds checking (speed drain, but worth it for security, on by default - breaks most QCCX features (used by CRMod and others))
-// enables detection of out of bounds memory access in the QuakeC code being run (in other words, prevents really exceedingly bad QuakeC code from doing nasty things to your computer)
-qboolean prvm_boundscheck = true;
-
extern sizebuf_t vm_tempstringsbuf;
//============================================================================
{
if(!e->priv.required->free)
return false;
+ if(prvm_reuseedicts_always_allow == realtime)
+ return true;
if(realtime <= e->priv.required->freetime && prvm_reuseedicts_neverinsameframe.integer)
return false; // never allow reuse in same frame (causes networking trouble)
if(e->priv.required->freetime < prog->starttime + prvm_reuseedicts_startuptime.value)
dpsnprintf (line, sizeof (line), "void");
break;
case ev_float:
- dpsnprintf (line, sizeof (line), "%f", val->_float);
+ dpsnprintf (line, sizeof (line), "%.9g", val->_float);
break;
case ev_vector:
- dpsnprintf (line, sizeof (line), "%f %f %f", val->vector[0], val->vector[1], val->vector[2]);
+ dpsnprintf (line, sizeof (line), "%.9g %.9g %.9g", val->vector[0], val->vector[1], val->vector[2]);
break;
default:
dpsnprintf (line, sizeof (line), "bad type %i", type);
spawned = 0;
died = 0;
+ prvm_reuseedicts_always_allow = realtime;
// parse ents
while (1)
}
Con_DPrintf("%s: %i new entities parsed, %i new inhibited, %i (%i new) spawned (whereas %i removed self, %i stayed)\n", PRVM_NAME, parsed, inhibited, prog->num_edicts, spawned, died, spawned - died);
+
+ prvm_reuseedicts_always_allow = 0;
}
void PRVM_FindOffsets(void)
prog->fieldoffsets.jointtype = PRVM_ED_FindFieldOffset("jointtype");
prog->fieldoffsets.movedir = PRVM_ED_FindFieldOffset("movedir");
+ prog->fieldoffsets.camera_transform = PRVM_ED_FindFieldOffset("camera_transform");
+
prog->funcoffsets.CSQC_ConsoleCommand = PRVM_ED_FindFunctionOffset("CSQC_ConsoleCommand");
prog->funcoffsets.CSQC_Ent_Remove = PRVM_ED_FindFunctionOffset("CSQC_Ent_Remove");
prog->funcoffsets.CSQC_Ent_Spawn = PRVM_ED_FindFunctionOffset("CSQC_Ent_Spawn");
prog->globaloffsets.dmg_save = PRVM_ED_FindGlobalOffset("dmg_save");
prog->globaloffsets.dmg_take = PRVM_ED_FindGlobalOffset("dmg_take");
prog->globaloffsets.drawfont = PRVM_ED_FindGlobalOffset("drawfont");
+ prog->globaloffsets.drawfontscale = PRVM_ED_FindGlobalOffset("drawfontscale");
prog->globaloffsets.gettaginfo_forward = PRVM_ED_FindGlobalOffset("gettaginfo_forward");
prog->globaloffsets.gettaginfo_name = PRVM_ED_FindGlobalOffset("gettaginfo_name");
prog->globaloffsets.gettaginfo_offset = PRVM_ED_FindGlobalOffset("gettaginfo_offset");
if((float)((int)(val->_float)) == val->_float)
dpsnprintf(buf, sizeof(buf), "%i", (int)(val->_float));
else
- dpsnprintf(buf, sizeof(buf), "%f", val->_float);
+ dpsnprintf(buf, sizeof(buf), "%.9g", val->_float);
value = buf;
break;
case ev_vector:
- dpsnprintf(buf, sizeof(buf), "%f %f %f", val->vector[0], val->vector[1], val->vector[2]); value = buf;
+ dpsnprintf(buf, sizeof(buf), "%.9g %.9g %.9g", val->vector[0], val->vector[1], val->vector[2]); value = buf;
break;
case ev_string:
value = PRVM_GetString(val->string);
Cmd_AddCommand ("menu_cmd", PRVM_GameCommand_Menu_f, "calls the menu QC function GameCommand with the supplied string as argument");
Cmd_AddCommand ("sv_cmd", PRVM_GameCommand_Server_f, "calls the server QC function GameCommand with the supplied string as argument");
- // COMMANDLINEOPTION: PRVM: -noboundscheck disables the bounds checks (security hole if CSQC is in use!)
- prvm_boundscheck = !COM_CheckParm("-noboundscheck");
-
Cvar_RegisterVariable (&prvm_language);
Cvar_RegisterVariable (&prvm_traceqc);
Cvar_RegisterVariable (&prvm_statementprofiling);
}
sizebuf_t vm_tempstringsbuf;
+#define PRVM_KNOWNSTRINGBASE 0x40000000
const char *PRVM_GetString(int num)
{
- if (num >= 0)
+ if (num < 0)
{
- if (num < prog->stringssize)
- return prog->strings + num;
- else
-#if 1
- if (num <= prog->stringssize + vm_tempstringsbuf.maxsize)
- {
- num -= prog->stringssize;
- if (num < vm_tempstringsbuf.cursize)
- return (char *)vm_tempstringsbuf.data + num;
- else
- {
- VM_Warning("PRVM_GetString: Invalid temp-string offset (%i >= %i vm_tempstringsbuf.cursize)\n", num, vm_tempstringsbuf.cursize);
- return "";
- }
- }
+ // invalid
+ VM_Warning("PRVM_GetString: Invalid string offset (%i < 0)\n", num);
+ return "";
+ }
+ else if (num < prog->stringssize)
+ {
+ // constant string from progs.dat
+ return prog->strings + num;
+ }
+ else if (num <= prog->stringssize + vm_tempstringsbuf.maxsize)
+ {
+ // tempstring returned by engine to QC (becomes invalid after returning to engine)
+ num -= prog->stringssize;
+ if (num < vm_tempstringsbuf.cursize)
+ return (char *)vm_tempstringsbuf.data + num;
else
-#endif
{
- VM_Warning("PRVM_GetString: Invalid constant-string offset (%i >= %i prog->stringssize)\n", num, prog->stringssize);
+ VM_Warning("PRVM_GetString: Invalid temp-string offset (%i >= %i vm_tempstringsbuf.cursize)\n", num, vm_tempstringsbuf.cursize);
return "";
}
}
- else
+ else if (num & PRVM_KNOWNSTRINGBASE)
{
- num = -1 - num;
-#if 0
- if (num >= (1<<30))
- {
- // special range reserved for tempstrings
- num -= (1<<30);
- if (num < vm_tempstringsbuf.cursize)
- return (char *)vm_tempstringsbuf.data + num;
- else
- {
- VM_Warning("PRVM_GetString: Invalid temp-string offset (%i >= %i vm_tempstringsbuf.cursize)\n", num, vm_tempstringsbuf.cursize);
- return "";
- }
- }
- else
-#endif
- if (num < prog->numknownstrings)
+ // allocated string
+ num = num - PRVM_KNOWNSTRINGBASE;
+ if (num >= 0 && num < prog->numknownstrings)
{
if (!prog->knownstrings[num])
{
return "";
}
}
+ else
+ {
+ // invalid string offset
+ VM_Warning("PRVM_GetString: Invalid constant-string offset (%i >= %i prog->stringssize)\n", num, prog->stringssize);
+ return "";
+ }
}
const char *PRVM_ChangeEngineString(int i, const char *s)
{
const char *old;
- i = -1 - i;
+ i = i - PRVM_KNOWNSTRINGBASE;
if(i < 0 || i >= prog->numknownstrings)
PRVM_ERROR("PRVM_ChangeEngineString: s is not an engine string");
old = prog->knownstrings[i];
if (s >= (char *)vm_tempstringsbuf.data && s < (char *)vm_tempstringsbuf.data + vm_tempstringsbuf.maxsize)
#if 1
return prog->stringssize + (s - (char *)vm_tempstringsbuf.data);
-#else
- return -1 - ((1<<30) + (s - (char *)vm_tempstringsbuf.data));
#endif
// see if it's a known string address
for (i = 0;i < prog->numknownstrings;i++)
if (prog->knownstrings[i] == s)
- return -1 - i;
+ return PRVM_KNOWNSTRINGBASE + i;
// new unknown engine string
- if (developer.integer >= 200)
- Con_Printf("new engine string %p = \"%s\"\n", s, s);
+ if (developer_insane.integer)
+ Con_DPrintf("new engine string %p = \"%s\"\n", s, s);
for (i = prog->firstfreeknownstring;i < prog->numknownstrings;i++)
if (!prog->knownstrings[i])
break;
prog->knownstrings_freeable[i] = false;
if(prog->leaktest_active)
prog->knownstrings_origin[i] = NULL;
- return -1 - i;
+ return PRVM_KNOWNSTRINGBASE + i;
}
// temp string handling
if (!s)
return 0;
size = (int)strlen(s) + 1;
- if (developer.integer >= 300)
- Con_Printf("PRVM_SetTempString: cursize %i, size %i\n", vm_tempstringsbuf.cursize, size);
+ if (developer_insane.integer)
+ Con_DPrintf("PRVM_SetTempString: cursize %i, size %i\n", vm_tempstringsbuf.cursize, size);
if (vm_tempstringsbuf.maxsize < vm_tempstringsbuf.cursize + size)
{
sizebuf_t old = vm_tempstringsbuf;
vm_tempstringsbuf.maxsize *= 2;
if (vm_tempstringsbuf.maxsize != old.maxsize || vm_tempstringsbuf.data == NULL)
{
- if (developer.integer >= 100)
- Con_Printf("PRVM_SetTempString: enlarging tempstrings buffer (%iKB -> %iKB)\n", old.maxsize/1024, vm_tempstringsbuf.maxsize/1024);
+ Con_DPrintf("PRVM_SetTempString: enlarging tempstrings buffer (%iKB -> %iKB)\n", old.maxsize/1024, vm_tempstringsbuf.maxsize/1024);
vm_tempstringsbuf.data = (unsigned char *) Mem_Alloc(sv_mempool, vm_tempstringsbuf.maxsize);
if (old.cursize)
memcpy(vm_tempstringsbuf.data, old.data, old.cursize);
if(prog->leaktest_active)
memcpy((char **)prog->knownstrings_origin, oldstrings_origin, prog->numknownstrings * sizeof(char *));
}
- // TODO why not Mem_Free the old ones?
+ if (oldstrings)
+ Mem_Free(oldstrings);
+ if (oldstrings_freeable)
+ Mem_Free((unsigned char *)oldstrings_freeable);
+ if (oldstrings_origin)
+ Mem_Free(oldstrings_origin);
}
prog->numknownstrings++;
}
prog->knownstrings_origin[i] = PRVM_AllocationOrigin();
if (pointer)
*pointer = (char *)(prog->knownstrings[i]);
- return -1 - i;
+ return PRVM_KNOWNSTRINGBASE + i;
}
void PRVM_FreeString(int num)
PRVM_ERROR("PRVM_FreeString: attempt to free a NULL string");
else if (num >= 0 && num < prog->stringssize)
PRVM_ERROR("PRVM_FreeString: attempt to free a constant string");
- else if (num < 0 && num >= -prog->numknownstrings)
+ else if (num >= PRVM_KNOWNSTRINGBASE && num < PRVM_KNOWNSTRINGBASE + prog->numknownstrings)
{
- num = -1 - num;
+ num = num - PRVM_KNOWNSTRINGBASE;
if (!prog->knownstrings[num])
PRVM_ERROR("PRVM_FreeString: attempt to free a non-existent or already freed string");
if (!prog->knownstrings_freeable[num])
projects / xonotic / darkplaces.git / blobdiff