prog->error_cmd("%s: Bad string", prog->name);
}
+qbool PRVM_ConsoleCommand (prvm_prog_t *prog, const char *text, int *func, qbool preserve_self, int curself, double ptime, qbool prog_loaded, const char *error_message)
+{
+ int restorevm_tempstringsbuf_cursize;
+ int save_self;
+ qbool r = false;
+
+ if(!prog_loaded)
+ return false;
+
+ if(func)
+ {
+ if(preserve_self)
+ save_self = PRVM_gameglobaledict(self);
+ if(ptime)
+ PRVM_gameglobalfloat(time) = ptime;
+ PRVM_gameglobaledict(self) = curself;
+ restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
+ PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, text);
+ prog->ExecuteProgram(prog, *func, error_message);
+ prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
+ if(preserve_self)
+ PRVM_gameglobaledict(self) = save_self;
+ r = (int) PRVM_G_FLOAT(OFS_RETURN) != 0;
+ }
+
+ return r;
+}
+
void VM_GenerateFrameGroupBlend(prvm_prog_t *prog, framegroupblend_t *framegroupblend, const prvm_edict_t *ed)
{
// self.frame is the interpolation target (new frame)
char string[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd_client);
VM_VarString(prog, 0, string, sizeof(string));
- Cbuf_AddText(&cmd_client, string);
+ Cbuf_AddText(cmd_client, string);
}
/*
char string[VM_STRINGTEMP_LENGTH];
VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd_server);
VM_VarString(prog, 0, string, sizeof(string));
- Cbuf_AddText(&cmd_server, string);
+ Cbuf_AddText(cmd_server, string);
}
static qbool PRVM_Cvar_ReadOk(prvm_prog_t *prog, const char *string)
*/
void VM_coredump(prvm_prog_t *prog)
{
- cmd_state_t *cmd = !host_isclient.integer ? &cmd_server : &cmd_client;
+ cmd_state_t *cmd = !host_isclient.integer ? cmd_server : cmd_client;
VM_SAFEPARMCOUNT(0,VM_coredump);
Cbuf_AddText(cmd, "prvm_edicts ");
return;
svs.changelevel_issued = true;
- Cbuf_AddText(&cmd_server, va(vabuf, sizeof(vabuf), "changelevel %s\n", PRVM_G_STRING(OFS_PARM0)));
+ Cbuf_AddText(cmd_server, va(vabuf, sizeof(vabuf), "changelevel %s\n", PRVM_G_STRING(OFS_PARM0)));
}
/*
return;
// check for overlap with a command
- if (Cmd_Exists(&cmd_client, name) || Cmd_Exists(&cmd_server, name))
+ if (Cmd_Exists(cmd_client, name) || Cmd_Exists(cmd_server, name))
{
VM_Warning(prog, "VM_registercvar: %s is a command\n", name);
return;
static msurface_t *getsurface(model_t *model, int surfacenum)
{
- if (surfacenum < 0 || surfacenum >= model->nummodelsurfaces)
+ if (surfacenum < 0 || surfacenum >= model->submodelsurfaces_end - model->submodelsurfaces_start)
return NULL;
- return model->data_surfaces + surfacenum + model->firstmodelsurface;
+ return model->data_surfaces + surfacenum + model->submodelsurfaces_start;
}
applytransform_inverted(prog, point, ed, p);
best = -1;
bestdist = 1000000000;
- for (surfacenum = 0;surfacenum < model->nummodelsurfaces;surfacenum++)
+ for (surfacenum = model->submodelsurfaces_start;surfacenum < model->submodelsurfaces_end;surfacenum++)
{
- surface = model->data_surfaces + surfacenum + model->firstmodelsurface;
+ surface = model->data_surfaces + surfacenum;
// first see if the nearest point on the surface's box is closer than the previous match
clipped[0] = bound(surface->mins[0], p[0], surface->maxs[0]) - p[0];
clipped[1] = bound(surface->mins[1], p[1], surface->maxs[1]) - p[1];
if (dist < bestdist)
{
// that's closer too, store it as the best match
- best = surfacenum;
+ best = surfacenum - model->submodelsurfaces_start;
bestdist = dist;
}
}