X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=prvm_cmds.c;h=81898814220ea84544a34924fb3505d86734c26b;hb=301e822944a45d6fd654aa6a0f75cc01f03261fb;hp=ec68d188628c88dbd9fe8722c994ef2b8ef39859;hpb=5225f7ec9697b2a65a524956d6ee95c267d88145;p=xonotic%2Fdarkplaces.git

diff --git a/prvm_cmds.c b/prvm_cmds.c
index ec68d188..81898814 100644
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -35,9 +35,9 @@ void VM_Warning(prvm_prog_t *prog, const char *fmt, ...)
 	Con_Warn(msg);
 
 	// TODO: either add a cvar/cmd to control the state dumping or replace some of the calls with Con_Printf [9/13/2006 Black]
-	if(prvm_backtraceforwarnings.integer && recursive != realtime) // NOTE: this compares to the time, just in case if PRVM_PrintState causes a Host_Error and keeps recursive set
+	if(prvm_backtraceforwarnings.integer && recursive != host.realtime) // NOTE: this compares to the time, just in case if PRVM_PrintState causes a Host_Error and keeps recursive set
 	{
-		recursive = realtime;
+		recursive = host.realtime;
 		PRVM_PrintState(prog, 0);
 		recursive = -1;
 	}
@@ -108,7 +108,7 @@ void VM_FrameBlendFromFrameGroupBlend(frameblend_t *frameblend, const framegroup
 		return;
 	}
 
-	nolerp = (model->type == mod_sprite) ? !r_lerpsprites.integer : !r_lerpmodels.integer;
+	nolerp = ((model->type == mod_sprite) ? !r_lerpsprites.integer : !r_lerpmodels.integer) || (model->nolerp == true);
 	numframes = model->numframes;
 	for (k = 0, g = framegroupblend;k < MAX_FRAMEGROUPBLENDS;k++, g++)
 	{
@@ -615,7 +615,7 @@ cmd (string, ...)
 void VM_localcmd_client(prvm_prog_t *prog)
 {
 	char string[VM_STRINGTEMP_LENGTH];
-	VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd);
+	VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd_client);
 	VM_VarString(prog, 0, string, sizeof(string));
 	Cbuf_AddText(&cmd_client, string);
 }
@@ -633,7 +633,7 @@ cmd (string, ...)
 void VM_localcmd_server(prvm_prog_t *prog)
 {
 	char string[VM_STRINGTEMP_LENGTH];
-	VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd);
+	VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd_server);
 	VM_VarString(prog, 0, string, sizeof(string));
 	Cbuf_AddText(&cmd_server, string);
 }
@@ -680,7 +680,7 @@ void VM_cvar_type(prvm_prog_t *prog)
 	cvar_t *cvar;
 	int ret;
 
-	VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar);
+	VM_SAFEPARMCOUNTRANGE(1, 8, VM_cvar_type);
 	VM_VarString(prog, 0, string, sizeof(string));
 	VM_CheckEmptyString(prog, string);
 	cvar = Cvar_FindVar(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask);
@@ -1080,7 +1080,7 @@ void VM_findfloat(prvm_prog_t *prog)
 {
 	int		e;
 	int		f;
-	float	s;
+	prvm_vec_t	s;
 	prvm_edict_t	*ed;
 
 	VM_SAFEPARMCOUNT(3,VM_findfloat);
@@ -1173,7 +1173,7 @@ void VM_findchainfloat(prvm_prog_t *prog)
 {
 	int		i;
 	int		f;
-	float	s;
+	prvm_vec_t	s;
 	prvm_edict_t	*ent, *chain;
 	int chainfield;
 
@@ -2459,7 +2459,7 @@ void VM_strireplace(prvm_prog_t *prog)
 	char string[VM_STRINGTEMP_LENGTH];
 	int search_len, replace_len, subject_len;
 
-	VM_SAFEPARMCOUNT(3,VM_strreplace);
+	VM_SAFEPARMCOUNT(3, VM_strireplace);
 
 	search = PRVM_G_STRING(OFS_PARM0);
 	replace = PRVM_G_STRING(OFS_PARM1);
@@ -2645,7 +2645,7 @@ void VM_tokenize_console (prvm_prog_t *prog)
 {
 	const char *p;
 
-	VM_SAFEPARMCOUNT(1,VM_tokenize);
+	VM_SAFEPARMCOUNT(1, VM_tokenize_console);
 
 	strlcpy(tokenize_string, PRVM_G_STRING(OFS_PARM0), sizeof(tokenize_string));
 	p = tokenize_string;
@@ -2813,7 +2813,7 @@ float	isserver()
 */
 void VM_isserver(prvm_prog_t *prog)
 {
-	VM_SAFEPARMCOUNT(0,VM_serverstate);
+	VM_SAFEPARMCOUNT(0, VM_isserver);
 
 	PRVM_G_FLOAT(OFS_RETURN) = sv.active;
 }
@@ -2903,7 +2903,7 @@ void VM_gettime(prvm_prog_t *prog)
 
 	if(prog->argc == 0)
 	{
-		PRVM_G_FLOAT(OFS_RETURN) = (prvm_vec_t) realtime;
+		PRVM_G_FLOAT(OFS_RETURN) = (prvm_vec_t) host.realtime;
 	}
 	else
 	{
@@ -2911,23 +2911,23 @@ void VM_gettime(prvm_prog_t *prog)
 		switch(timer_index)
 		{
 			case 0: // GETTIME_FRAMESTART
-				PRVM_G_FLOAT(OFS_RETURN) = realtime;
+				PRVM_G_FLOAT(OFS_RETURN) = host.realtime;
 				break;
 			case 1: // GETTIME_REALTIME
 				PRVM_G_FLOAT(OFS_RETURN) = Sys_DirtyTime();
 				break;
 			case 2: // GETTIME_HIRES
-				PRVM_G_FLOAT(OFS_RETURN) = (Sys_DirtyTime() - host_dirtytime);
+				PRVM_G_FLOAT(OFS_RETURN) = (Sys_DirtyTime() - host.dirtytime);
 				break;
 			case 3: // GETTIME_UPTIME
-				PRVM_G_FLOAT(OFS_RETURN) = realtime;
+				PRVM_G_FLOAT(OFS_RETURN) = host.realtime;
 				break;
 			case 4: // GETTIME_CDTRACK
 				PRVM_G_FLOAT(OFS_RETURN) = CDAudio_GetPosition();
 				break;
 			default:
 				VM_Warning(prog, "VM_gettime: %s: unsupported timer specified, returning realtime\n", prog->name);
-				PRVM_G_FLOAT(OFS_RETURN) = realtime;
+				PRVM_G_FLOAT(OFS_RETURN) = host.realtime;
 				break;
 		}
 	}
@@ -2989,7 +2989,7 @@ loadfromdata(string data)
 */
 void VM_loadfromdata(prvm_prog_t *prog)
 {
-	VM_SAFEPARMCOUNT(1,VM_loadentsfromfile);
+	VM_SAFEPARMCOUNT(1, VM_loadfromdata);
 
 	PRVM_ED_LoadFromFile(prog, PRVM_G_STRING(OFS_PARM0));
 }
@@ -3066,7 +3066,7 @@ float	mod(float val, float m)
 void VM_modulo(prvm_prog_t *prog)
 {
 	prvm_int_t val, m;
-	VM_SAFEPARMCOUNT(2,VM_module);
+	VM_SAFEPARMCOUNT(2, VM_modulo);
 
 	val = (prvm_int_t) PRVM_G_FLOAT(OFS_PARM0);
 	m	= (prvm_int_t) PRVM_G_FLOAT(OFS_PARM1);
@@ -3176,7 +3176,7 @@ float	search_getsize(float handle)
 void VM_search_getsize(prvm_prog_t *prog)
 {
 	int handle;
-	VM_SAFEPARMCOUNT(1, VM_M_search_getsize);
+	VM_SAFEPARMCOUNT(1, VM_search_getsize);
 
 	handle = (int)PRVM_G_FLOAT(OFS_PARM0);
 
@@ -3533,7 +3533,7 @@ void VM_stringwidth(prvm_prog_t *prog)
 	int colors;
 	float sx, sy;
 	size_t maxlen = 0;
-	VM_SAFEPARMCOUNTRANGE(2,3,VM_drawstring);
+	VM_SAFEPARMCOUNTRANGE(2, 3, VM_stringwidth);
 
 	getdrawfontscale(prog, &sx, &sy);
 	if(prog->argc == 3)
@@ -4067,7 +4067,7 @@ float stringtokeynum(string key)
 */
 void VM_stringtokeynum (prvm_prog_t *prog)
 {
-	VM_SAFEPARMCOUNT( 1, VM_keynumtostring );
+	VM_SAFEPARMCOUNT( 1, VM_stringtokeynum );
 
 	PRVM_G_FLOAT(OFS_RETURN) = Key_StringToKeynum(PRVM_G_STRING(OFS_PARM0));
 }
@@ -4082,7 +4082,7 @@ string getkeybind(float key, float bindmap)
 void VM_getkeybind (prvm_prog_t *prog)
 {
 	int bindmap;
-	VM_SAFEPARMCOUNTRANGE(1, 2, VM_CL_getkeybind);
+	VM_SAFEPARMCOUNTRANGE(1, 2, VM_getkeybind);
 	if(prog->argc == 2)
 		bindmap = bound(-1, PRVM_G_FLOAT(OFS_PARM1), MAX_BINDMAPS-1);
 	else
@@ -4101,7 +4101,7 @@ float setkeybind(float key, string cmd, float bindmap)
 void VM_setkeybind (prvm_prog_t *prog)
 {
 	int bindmap;
-	VM_SAFEPARMCOUNTRANGE(2, 3, VM_CL_setkeybind);
+	VM_SAFEPARMCOUNTRANGE(2, 3, VM_setkeybind);
 	if(prog->argc == 3)
 		bindmap = bound(-1, PRVM_G_FLOAT(OFS_PARM2), MAX_BINDMAPS-1);
 	else
@@ -4122,7 +4122,7 @@ vector getbindmaps()
 void VM_getbindmaps (prvm_prog_t *prog)
 {
 	int fg, bg;
-	VM_SAFEPARMCOUNT(0, VM_CL_getbindmap);
+	VM_SAFEPARMCOUNT(0, VM_getbindmaps);
 	Key_GetBindMap(&fg, &bg);
 	PRVM_G_VECTOR(OFS_RETURN)[0] = fg;
 	PRVM_G_VECTOR(OFS_RETURN)[1] = bg;
@@ -4138,7 +4138,7 @@ float setbindmaps(vector bindmap)
 */
 void VM_setbindmaps (prvm_prog_t *prog)
 {
-	VM_SAFEPARMCOUNT(1, VM_CL_setbindmap);
+	VM_SAFEPARMCOUNT(1, VM_setbindmaps);
 	PRVM_G_FLOAT(OFS_RETURN) = 0;
 	if(PRVM_G_VECTOR(OFS_PARM0)[2] == 0)
 		if(Key_SetBindMap((int)PRVM_G_VECTOR(OFS_PARM0)[0], (int)PRVM_G_VECTOR(OFS_PARM0)[1]))
@@ -4204,7 +4204,7 @@ void VM_cin_setstate(prvm_prog_t *prog)
 	clvideostate_t 	state;
 	clvideo_t		*video;
 
-	VM_SAFEPARMCOUNT( 2, VM_cin_netstate );
+	VM_SAFEPARMCOUNT( 2, VM_cin_setstate );
 
 	name = PRVM_G_STRING( OFS_PARM0 );
 	VM_CheckEmptyString(prog,  name );
@@ -4787,9 +4787,9 @@ void VM_buf_create (prvm_prog_t *prog)
 {
 	prvm_stringbuffer_t *stringbuffer;
 	int i;
-	
+
 	VM_SAFEPARMCOUNTRANGE(0, 2, VM_buf_create);
-	
+
 	// VorteX: optional parm1 (buffer format) is unfinished, to keep intact with future databuffers extension must be set to "string"
 	if(prog->argc >= 1 && strcmp(PRVM_G_STRING(OFS_PARM0), "string"))
 	{
@@ -6494,7 +6494,7 @@ void VM_callfunction(prvm_prog_t *prog)
 	func = PRVM_ED_FindFunction(prog, s);
 
 	if(!func)
-		prog->error_cmd("VM_callfunciton: function %s not found !", s);
+		prog->error_cmd("VM_callfunction: function %s not found !", s);
 	else if (func->first_statement < 0)
 	{
 		// negative statements are built in functions
@@ -7108,7 +7108,7 @@ void VM_getsurfacepointattribute(prvm_prog_t *prog)
 	int attributetype;
 	vec3_t result;
 
-	VM_SAFEPARMCOUNT(4, VM_getsurfacepoint);
+	VM_SAFEPARMCOUNT(4, VM_getsurfacepointattribute);
 	VectorClear(PRVM_G_VECTOR(OFS_RETURN));
 	ed = PRVM_G_EDICT(OFS_PARM0);
 	if (!(model = getmodel(prog, ed)) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
@@ -7256,7 +7256,7 @@ void VM_getsurfaceclippedpoint(prvm_prog_t *prog)
 	dp_model_t *model;
 	msurface_t *surface;
 	vec3_t p, out, inp;
-	VM_SAFEPARMCOUNT(3, VM_te_getsurfaceclippedpoint);
+	VM_SAFEPARMCOUNT(3, VM_getsurfaceclippedpoint);
 	VectorClear(PRVM_G_VECTOR(OFS_RETURN));
 	ed = PRVM_G_EDICT(OFS_PARM0);
 	if (!(model = getmodel(prog, ed)) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
@@ -7273,7 +7273,7 @@ void VM_getsurfacenumtriangles(prvm_prog_t *prog)
 {
        dp_model_t *model;
        msurface_t *surface;
-       VM_SAFEPARMCOUNT(2, VM_SV_getsurfacenumtriangles);
+       VM_SAFEPARMCOUNT(2, VM_getsurfacenumtriangles);
        // return 0 if no such surface
        if (!(model = getmodel(prog, PRVM_G_EDICT(OFS_PARM0))) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
        {
@@ -7291,7 +7291,7 @@ void VM_getsurfacetriangle(prvm_prog_t *prog)
        dp_model_t *model;
        msurface_t *surface;
        int trinum;
-       VM_SAFEPARMCOUNT(3, VM_SV_getsurfacetriangle);
+       VM_SAFEPARMCOUNT(3, VM_getsurfacetriangle);
        VectorClear(PRVM_G_VECTOR(OFS_RETURN));
        ed = PRVM_G_EDICT(OFS_PARM0);
        if (!(model = getmodel(prog, ed)) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))