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 = 0; // hush compiler warning
+ 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)
// LadyHavoc: quite tempting to break apart this function to reuse the
// duplicated code, but I suspect it is better for performance
// this way
-void VM_FrameBlendFromFrameGroupBlend(frameblend_t *frameblend, const framegroupblend_t *framegroupblend, const dp_model_t *model, double curtime)
+void VM_FrameBlendFromFrameGroupBlend(frameblend_t *frameblend, const framegroupblend_t *framegroupblend, const model_t *model, double curtime)
{
int sub2, numframes, f, i, k;
int isfirstframegroup = true;
}
}
-void VM_UpdateEdictSkeleton(prvm_prog_t *prog, prvm_edict_t *ed, const dp_model_t *edmodel, const frameblend_t *frameblend)
+void VM_UpdateEdictSkeleton(prvm_prog_t *prog, prvm_edict_t *ed, const model_t *edmodel, const frameblend_t *frameblend)
{
if (ed->priv.server->skeleton.model != edmodel)
{
=========
VM_localsound
-localsound(string sample)
+localsound(string sample, float chan, float vol)
=========
*/
void VM_localsound(prvm_prog_t *prog)
{
const char *s;
+ float chan, vol;
- VM_SAFEPARMCOUNT(1,VM_localsound);
+ VM_SAFEPARMCOUNTRANGE(1, 3,VM_localsound);
s = PRVM_G_STRING(OFS_PARM0);
-
- if(!S_LocalSound (s))
+ if(prog->argc == 3)
+ {
+ chan = PRVM_G_FLOAT(OFS_PARM1);
+ vol = PRVM_G_FLOAT(OFS_PARM2) == 0 ? 1 : PRVM_G_FLOAT(OFS_PARM2);
+ if(!S_LocalSoundEx(s, chan, vol))
+ {
+ PRVM_G_FLOAT(OFS_RETURN) = -4;
+ VM_Warning(prog, "VM_localsound: Failed to play %s for %s !\n", s, prog->name);
+ return;
+ }
+ }
+ else if(!S_LocalSound (s))
{
PRVM_G_FLOAT(OFS_RETURN) = -4;
VM_Warning(prog, "VM_localsound: Failed to play %s for %s !\n", s, prog->name);
/*
=================
-VM_localcmd_client
+VM_localcmd_local
Sends text over to the client's execution buffer
cmd (string, ...)
=================
*/
-void VM_localcmd_client(prvm_prog_t *prog)
+void VM_localcmd_local(prvm_prog_t *prog)
{
char string[VM_STRINGTEMP_LENGTH];
- VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd_client);
+ VM_SAFEPARMCOUNTRANGE(1, 8, VM_localcmd_local);
VM_VarString(prog, 0, string, sizeof(string));
- Cbuf_AddText(&cmd_client, string);
+ Cbuf_AddText(cmd_local, 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_local, string);
}
static qbool PRVM_Cvar_ReadOk(prvm_prog_t *prog, const char *string)
{
cvar_t *cvar;
cvar = Cvar_FindVar(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask);
- return ((cvar) && ((cvar->flags & CVAR_PRIVATE) == 0));
+ return ((cvar) && ((cvar->flags & CF_PRIVATE) == 0));
}
/*
}
ret = 1; // CVAR_EXISTS
- if(cvar->flags & CVAR_SAVE)
+ if(cvar->flags & CF_ARCHIVE)
ret |= 2; // CVAR_TYPE_SAVED
- if(cvar->flags & CVAR_PRIVATE)
+ if(cvar->flags & CF_PRIVATE)
ret |= 4; // CVAR_TYPE_PRIVATE
- if(!(cvar->flags & CVAR_ALLOCATED))
+ if(!(cvar->flags & CF_ALLOCATED))
ret |= 8; // CVAR_TYPE_ENGINE
if(cvar->description != cvar_dummy_description)
ret |= 16; // CVAR_TYPE_HASDESCRIPTION
- if(cvar->flags & CVAR_READONLY)
+ if(cvar->flags & CF_READONLY)
ret |= 32; // CVAR_TYPE_READONLY
PRVM_G_FLOAT(OFS_RETURN) = ret;
VM_SAFEPARMCOUNT(1, VM_ftoe);
ent = (prvm_int_t)PRVM_G_FLOAT(OFS_PARM0);
- if (ent < 0 || ent >= prog->max_edicts || PRVM_PROG_TO_EDICT(ent)->priv.required->free)
+ if (ent < 0 || ent >= prog->max_edicts || PRVM_PROG_TO_EDICT(ent)->free)
ent = 0; // return world instead of a free or invalid entity
PRVM_G_INT(OFS_RETURN) = ent;
if (developer.integer > 0)
VM_Warning(prog, "VM_remove: tried to remove the null entity or a reserved entity!\n" );
}
- else if( ed->priv.required->free )
+ else if( ed->free )
{
if (developer.integer > 0)
VM_Warning(prog, "VM_remove: tried to remove an already freed entity!\n" );
{
prog->xfunction->builtinsprofile++;
ed = PRVM_EDICT_NUM(e);
- if (ed->priv.required->free)
+ if (ed->free)
continue;
t = PRVM_E_STRING(ed,f);
if (!t)
{
prog->xfunction->builtinsprofile++;
ed = PRVM_EDICT_NUM(e);
- if (ed->priv.required->free)
+ if (ed->free)
continue;
if (PRVM_E_FLOAT(ed,f) == s)
{
for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
{
prog->xfunction->builtinsprofile++;
- if (ent->priv.required->free)
+ if (ent->free)
continue;
t = PRVM_E_STRING(ent,f);
if (!t)
for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
{
prog->xfunction->builtinsprofile++;
- if (ent->priv.required->free)
+ if (ent->free)
continue;
if (PRVM_E_FLOAT(ent,f) != s)
continue;
{
prog->xfunction->builtinsprofile++;
ed = PRVM_EDICT_NUM(e);
- if (ed->priv.required->free)
+ if (ed->free)
continue;
if (!PRVM_E_FLOAT(ed,f))
continue;
for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent))
{
prog->xfunction->builtinsprofile++;
- if (ent->priv.required->free)
+ if (ent->free)
continue;
if (!PRVM_E_FLOAT(ent,f))
continue;
*/
void VM_coredump(prvm_prog_t *prog)
{
- cmd_state_t *cmd = cls.state == ca_dedicated ? &cmd_server : &cmd_client;
VM_SAFEPARMCOUNT(0,VM_coredump);
- Cbuf_AddText(cmd, "prvm_edicts ");
- Cbuf_AddText(cmd, prog->name);
- Cbuf_AddText(cmd, "\n");
+ Cbuf_AddText(cmd_local, "prvm_edicts ");
+ Cbuf_AddText(cmd_local, prog->name);
+ Cbuf_AddText(cmd_local, "\n");
}
/*
return;
}
ent = PRVM_EDICT_NUM(i);
- if (!ent->priv.required->free)
+ if (!ent->free)
{
VM_RETURN_EDICT(ent);
return;
return;
svs.changelevel_issued = true;
- Cbuf_AddText(&cmd_server, va(vabuf, sizeof(vabuf), "changelevel %s\n", PRVM_G_STRING(OFS_PARM0)));
+ Cbuf_AddText(cmd_local, va(vabuf, sizeof(vabuf), "changelevel %s\n", PRVM_G_STRING(OFS_PARM0)));
}
/*
flags = prog->argc >= 3 ? (int)PRVM_G_FLOAT(OFS_PARM2) : 0;
PRVM_G_FLOAT(OFS_RETURN) = 0;
- if(flags > CVAR_MAXFLAGSVAL)
+ if(flags > CF_MAXFLAGSVAL)
return;
// first check to see if it has already been defined
return;
// check for overlap with a command
- if (Cmd_Exists(&cmd_client, name) || Cmd_Exists(&cmd_server, name))
+ if (Cmd_Exists(cmd_local, name))
{
VM_Warning(prog, "VM_registercvar: %s is a command\n", name);
return;
}
ent = PRVM_G_EDICT(OFS_PARM1);
- if(ent->priv.required->free)
+ if(ent->free)
{
VM_Warning(prog, "VM_writetofile: %s: entity %i is free !\n", prog->name, PRVM_NUM_FOR_EDICT(ent));
return;
// get the entity
ent = PRVM_G_EDICT(OFS_PARM1);
- if(ent->priv.required->free)
+ if(ent->free)
{
PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "");
VM_Warning(prog, "VM_entityfielddata: %s: entity %i is free !\n", prog->name, PRVM_NUM_FOR_EDICT(ent));
// get the entity
ent = PRVM_G_EDICT(OFS_PARM1);
- if(ent->priv.required->free)
+ if(ent->free)
{
VM_Warning(prog, "VM_entityfielddata: %s: entity %i is free !\n", prog->name, PRVM_NUM_FOR_EDICT(ent));
PRVM_G_FLOAT(OFS_RETURN) = 0.0f;
PRVM_FreeString(prog, PRVM_G_INT(OFS_PARM0));
}
-/*
-=========
-VM_command (used by client and menu)
-
-clientcommand(float client, string s) (for client and menu)
-=========
-*/
-//void(entity e, string s) clientcommand = #440; // executes a command string as if it came from the specified client
-//this function originally written by KrimZon, made shorter by LadyHavoc
-void VM_clcommand (prvm_prog_t *prog)
-{
- client_t *temp_client;
- int i;
-
- VM_SAFEPARMCOUNT(2,VM_clcommand);
-
- i = (int)PRVM_G_FLOAT(OFS_PARM0);
- if (!sv.active || i < 0 || i >= svs.maxclients || !svs.clients[i].active)
- {
- VM_Warning(prog, "VM_clientcommand: %s: invalid client/server is not active !\n", prog->name);
- return;
- }
-
- temp_client = host_client;
- host_client = svs.clients + i;
- Cmd_ExecuteString (&cmd_serverfromclient, PRVM_G_STRING(OFS_PARM1), src_client, true);
- host_client = temp_client;
-}
-
-
/*
=========
VM_tokenize
// get edict and test it
ent = PRVM_G_EDICT(OFS_PARM0);
- if (ent->priv.required->free)
+ if (ent->free)
prog->error_cmd("VM_parseentitydata: %s: Can only set already spawned entities (entity %i is free)!", prog->name, PRVM_NUM_FOR_EDICT(ent));
data = PRVM_G_STRING(OFS_PARM1);
PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, tmp);
}
-//=============================================================================
-// Draw builtins (client & menu)
-
-/*
-=========
-VM_iscachedpic
-
-float iscachedpic(string pic)
-=========
-*/
-void VM_iscachedpic(prvm_prog_t *prog)
-{
- VM_SAFEPARMCOUNT(1,VM_iscachedpic);
-
- // drawq hasnt such a function, thus always return true
- PRVM_G_FLOAT(OFS_RETURN) = false;
-}
-
-/*
-=========
-VM_precache_pic
-
-string precache_pic(string pic)
-=========
-*/
-#define PRECACHE_PIC_FROMWAD 1 /* FTEQW, not supported here */
-#define PRECACHE_PIC_NOTPERSISTENT 2
-//#define PRECACHE_PIC_NOCLAMP 4
-#define PRECACHE_PIC_MIPMAP 8
-void VM_precache_pic(prvm_prog_t *prog)
-{
- const char *s;
- int flags = CACHEPICFLAG_FAILONMISSING;
-
- VM_SAFEPARMCOUNTRANGE(1, 2, VM_precache_pic);
-
- s = PRVM_G_STRING(OFS_PARM0);
- PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0);
- VM_CheckEmptyString(prog, s);
-
- if(prog->argc >= 2)
- {
- int f = PRVM_G_FLOAT(OFS_PARM1);
- if(f & PRECACHE_PIC_NOTPERSISTENT)
- flags |= CACHEPICFLAG_NOTPERSISTENT;
- //if(f & PRECACHE_PIC_NOCLAMP)
- // flags |= CACHEPICFLAG_NOCLAMP;
- if(f & PRECACHE_PIC_MIPMAP)
- flags |= CACHEPICFLAG_MIPMAP;
- }
-
- if( !Draw_IsPicLoaded(Draw_CachePic_Flags(s, flags | CACHEPICFLAG_QUIET)) )
- PRVM_G_INT(OFS_RETURN) = OFS_NULL;
-}
-
-/*
-=========
-VM_freepic
-
-freepic(string s)
-=========
-*/
-void VM_freepic(prvm_prog_t *prog)
-{
- const char *s;
-
- VM_SAFEPARMCOUNT(1,VM_freepic);
-
- s = PRVM_G_STRING(OFS_PARM0);
- VM_CheckEmptyString(prog, s);
-
- Draw_FreePic(s);
-}
-
-static void getdrawfontscale(prvm_prog_t *prog, float *sx, float *sy)
-{
- vec3_t v;
- *sx = *sy = 1;
- VectorCopy(PRVM_drawglobalvector(drawfontscale), v);
- if(VectorLength2(v) > 0)
- {
- *sx = v[0];
- *sy = v[1];
- }
-}
-
-static dp_font_t *getdrawfont(prvm_prog_t *prog)
-{
- int f = (int) PRVM_drawglobalfloat(drawfont);
- if(f < 0 || f >= dp_fonts.maxsize)
- return FONT_DEFAULT;
- return &dp_fonts.f[f];
-}
-
-/*
-=========
-VM_drawcharacter
-
-float drawcharacter(vector position, float character, vector scale, vector rgb, float alpha, float flag)
-=========
-*/
-void VM_drawcharacter(prvm_prog_t *prog)
-{
- prvm_vec_t *pos,*scale,*rgb;
- char character;
- int flag;
- float sx, sy;
- VM_SAFEPARMCOUNT(6,VM_drawcharacter);
-
- // polygonbegin without draw2d arg has to guess
- prog->polygonbegin_guess2d = true;
-
- character = (char) PRVM_G_FLOAT(OFS_PARM1);
- if(character == 0)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -1;
- VM_Warning(prog, "VM_drawcharacter: %s passed null character !\n",prog->name);
- return;
- }
-
- pos = PRVM_G_VECTOR(OFS_PARM0);
- scale = PRVM_G_VECTOR(OFS_PARM2);
- rgb = PRVM_G_VECTOR(OFS_PARM3);
- flag = (int)PRVM_G_FLOAT(OFS_PARM5);
-
- if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -2;
- VM_Warning(prog, "VM_drawcharacter: %s: wrong DRAWFLAG %i !\n",prog->name,flag);
- return;
- }
-
- if(pos[2] || scale[2])
- VM_Warning(prog, "VM_drawcharacter: z value%c from %s discarded\n",(pos[2] && scale[2]) ? 's' : 0,((pos[2] && scale[2]) ? "pos and scale" : (pos[2] ? "pos" : "scale")));
-
- if(!scale[0] || !scale[1])
- {
- PRVM_G_FLOAT(OFS_RETURN) = -3;
- VM_Warning(prog, "VM_drawcharacter: scale %s is null !\n", (scale[0] == 0) ? ((scale[1] == 0) ? "x and y" : "x") : "y");
- return;
- }
-
- getdrawfontscale(prog, &sx, &sy);
- DrawQ_String_Scale(pos[0], pos[1], &character, 1, scale[0], scale[1], sx, sy, rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag, NULL, true, getdrawfont(prog));
- PRVM_G_FLOAT(OFS_RETURN) = 1;
-}
-
-/*
-=========
-VM_drawstring
-
-float drawstring(vector position, string text, vector scale, vector rgb, float alpha[, float flag])
-=========
-*/
-void VM_drawstring(prvm_prog_t *prog)
-{
- prvm_vec_t *pos,*scale,*rgb;
- const char *string;
- int flag = 0;
- float sx, sy;
- VM_SAFEPARMCOUNTRANGE(5,6,VM_drawstring);
-
- // polygonbegin without draw2d arg has to guess
- prog->polygonbegin_guess2d = true;
-
- string = PRVM_G_STRING(OFS_PARM1);
- pos = PRVM_G_VECTOR(OFS_PARM0);
- scale = PRVM_G_VECTOR(OFS_PARM2);
- rgb = PRVM_G_VECTOR(OFS_PARM3);
- if (prog->argc >= 6)
- flag = (int)PRVM_G_FLOAT(OFS_PARM5);
-
- if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -2;
- VM_Warning(prog, "VM_drawstring: %s: wrong DRAWFLAG %i !\n",prog->name,flag);
- return;
- }
-
- if(!scale[0] || !scale[1])
- {
- PRVM_G_FLOAT(OFS_RETURN) = -3;
- VM_Warning(prog, "VM_drawstring: scale %s is null !\n", (scale[0] == 0) ? ((scale[1] == 0) ? "x and y" : "x") : "y");
- return;
- }
-
- if(pos[2] || scale[2])
- VM_Warning(prog, "VM_drawstring: z value%s from %s discarded\n",(pos[2] && scale[2]) ? "s" : " ",((pos[2] && scale[2]) ? "pos and scale" : (pos[2] ? "pos" : "scale")));
-
- getdrawfontscale(prog, &sx, &sy);
- DrawQ_String_Scale(pos[0], pos[1], string, 0, scale[0], scale[1], sx, sy, rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag, NULL, true, getdrawfont(prog));
- //Font_DrawString(pos[0], pos[1], string, 0, scale[0], scale[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag, NULL, true);
- PRVM_G_FLOAT(OFS_RETURN) = 1;
-}
-
-/*
-=========
-VM_drawcolorcodedstring
-
-float drawcolorcodedstring(vector position, string text, vector scale, float alpha, float flag)
-/
-float drawcolorcodedstring(vector position, string text, vector scale, vector rgb, float alpha, float flag)
-=========
-*/
-void VM_drawcolorcodedstring(prvm_prog_t *prog)
-{
- prvm_vec_t *pos, *scale;
- const char *string;
- int flag;
- vec3_t rgb;
- float sx, sy, alpha;
-
- VM_SAFEPARMCOUNTRANGE(5,6,VM_drawcolorcodedstring);
-
- // polygonbegin without draw2d arg has to guess
- prog->polygonbegin_guess2d = true;
-
- if (prog->argc == 6) // full 6 parms, like normal drawstring
- {
- pos = PRVM_G_VECTOR(OFS_PARM0);
- string = PRVM_G_STRING(OFS_PARM1);
- scale = PRVM_G_VECTOR(OFS_PARM2);
- VectorCopy(PRVM_G_VECTOR(OFS_PARM3), rgb);
- alpha = PRVM_G_FLOAT(OFS_PARM4);
- flag = (int)PRVM_G_FLOAT(OFS_PARM5);
- }
- else
- {
- pos = PRVM_G_VECTOR(OFS_PARM0);
- string = PRVM_G_STRING(OFS_PARM1);
- scale = PRVM_G_VECTOR(OFS_PARM2);
- rgb[0] = 1.0;
- rgb[1] = 1.0;
- rgb[2] = 1.0;
- alpha = PRVM_G_FLOAT(OFS_PARM3);
- flag = (int)PRVM_G_FLOAT(OFS_PARM4);
- }
-
- if(flag < DRAWFLAG_NORMAL || flag >= DRAWFLAG_NUMFLAGS)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -2;
- VM_Warning(prog, "VM_drawcolorcodedstring: %s: wrong DRAWFLAG %i !\n",prog->name,flag);
- return;
- }
-
- if(!scale[0] || !scale[1])
- {
- PRVM_G_FLOAT(OFS_RETURN) = -3;
- VM_Warning(prog, "VM_drawcolorcodedstring: scale %s is null !\n", (scale[0] == 0) ? ((scale[1] == 0) ? "x and y" : "x") : "y");
- return;
- }
-
- if(pos[2] || scale[2])
- VM_Warning(prog, "VM_drawcolorcodedstring: z value%s from %s discarded\n",(pos[2] && scale[2]) ? "s" : " ",((pos[2] && scale[2]) ? "pos and scale" : (pos[2] ? "pos" : "scale")));
-
- getdrawfontscale(prog, &sx, &sy);
- DrawQ_String_Scale(pos[0], pos[1], string, 0, scale[0], scale[1], sx, sy, rgb[0], rgb[1], rgb[2], alpha, flag, NULL, false, getdrawfont(prog));
- if (prog->argc == 6) // also return vector of last color
- VectorCopy(DrawQ_Color, PRVM_G_VECTOR(OFS_RETURN));
- else
- PRVM_G_FLOAT(OFS_RETURN) = 1;
-}
-/*
-=========
-VM_stringwidth
-
-float stringwidth(string text, float allowColorCodes, float size)
-=========
-*/
-void VM_stringwidth(prvm_prog_t *prog)
-{
- const char *string;
- vec2_t szv;
- float mult; // sz is intended font size so we can later add freetype support, mult is font size multiplier in pixels per character cell
- int colors;
- float sx, sy;
- size_t maxlen = 0;
- VM_SAFEPARMCOUNTRANGE(2, 3, VM_stringwidth);
-
- getdrawfontscale(prog, &sx, &sy);
- if(prog->argc == 3)
- {
- Vector2Copy(PRVM_G_VECTOR(OFS_PARM2), szv);
- mult = 1;
- }
- else
- {
- // we want the width for 8x8 font size, divided by 8
- Vector2Set(szv, 8, 8);
- mult = 0.125;
- // to make sure snapping is turned off, ALWAYS use a nontrivial scale in this case
- if(sx >= 0.9 && sx <= 1.1)
- {
- mult *= 2;
- sx /= 2;
- sy /= 2;
- }
- }
-
- string = PRVM_G_STRING(OFS_PARM0);
- colors = (int)PRVM_G_FLOAT(OFS_PARM1);
-
- PRVM_G_FLOAT(OFS_RETURN) = DrawQ_TextWidth_UntilWidth_TrackColors_Scale(string, &maxlen, szv[0], szv[1], sx, sy, NULL, !colors, getdrawfont(prog), 1000000000) * mult;
-/*
- if(prog->argc == 3)
- {
- mult = sz = PRVM_G_FLOAT(OFS_PARM2);
- }
- else
- {
- sz = 8;
- mult = 1;
- }
-
- string = PRVM_G_STRING(OFS_PARM0);
- colors = (int)PRVM_G_FLOAT(OFS_PARM1);
-
- PRVM_G_FLOAT(OFS_RETURN) = DrawQ_TextWidth(string, 0, !colors, getdrawfont()) * mult; // 1x1 characters, don't actually draw
-*/
-}
-
-/*
-=========
-VM_findfont
-
-float findfont(string s)
-=========
-*/
-
-static float getdrawfontnum(const char *fontname)
-{
- int i;
-
- for(i = 0; i < dp_fonts.maxsize; ++i)
- if(!strcmp(dp_fonts.f[i].title, fontname))
- return i;
- return -1;
-}
-
-void VM_findfont(prvm_prog_t *prog)
-{
- VM_SAFEPARMCOUNT(1,VM_findfont);
- PRVM_G_FLOAT(OFS_RETURN) = getdrawfontnum(PRVM_G_STRING(OFS_PARM0));
-}
-
-/*
-=========
-VM_loadfont
-
-float loadfont(string fontname, string fontmaps, string sizes, float slot)
-=========
-*/
-
-void VM_loadfont(prvm_prog_t *prog)
-{
- const char *fontname, *filelist, *sizes, *c, *cm;
- char mainfont[MAX_QPATH];
- int i, numsizes;
- float sz, scale, voffset;
- dp_font_t *f;
-
- VM_SAFEPARMCOUNTRANGE(3,6,VM_loadfont);
-
- fontname = PRVM_G_STRING(OFS_PARM0);
- if (!fontname[0])
- fontname = "default";
-
- filelist = PRVM_G_STRING(OFS_PARM1);
- if (!filelist[0])
- filelist = "gfx/conchars";
-
- sizes = PRVM_G_STRING(OFS_PARM2);
- if (!sizes[0])
- sizes = "10";
-
- // find a font
- f = NULL;
- if (prog->argc >= 4)
- {
- i = PRVM_G_FLOAT(OFS_PARM3);
- if (i >= 0 && i < dp_fonts.maxsize)
- {
- f = &dp_fonts.f[i];
- strlcpy(f->title, fontname, sizeof(f->title)); // replace name
- }
- }
- if (!f)
- f = FindFont(fontname, true);
- if (!f)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -1;
- return; // something go wrong
- }
-
- memset(f->fallbacks, 0, sizeof(f->fallbacks));
- memset(f->fallback_faces, 0, sizeof(f->fallback_faces));
-
- // first font is handled "normally"
- c = strchr(filelist, ':');
- cm = strchr(filelist, ',');
- if(c && (!cm || c < cm))
- f->req_face = atoi(c+1);
- else
- {
- f->req_face = 0;
- c = cm;
- }
- if(!c || (c - filelist) > MAX_QPATH)
- strlcpy(mainfont, filelist, sizeof(mainfont));
- else
- {
- memcpy(mainfont, filelist, c - filelist);
- mainfont[c - filelist] = 0;
- }
-
- // handle fallbacks
- for(i = 0; i < MAX_FONT_FALLBACKS; ++i)
- {
- c = strchr(filelist, ',');
- if(!c)
- break;
- filelist = c + 1;
- if(!*filelist)
- break;
- c = strchr(filelist, ':');
- cm = strchr(filelist, ',');
- if(c && (!cm || c < cm))
- f->fallback_faces[i] = atoi(c+1);
- else
- {
- f->fallback_faces[i] = 0; // f->req_face; could make it stick to the default-font's face index
- c = cm;
- }
- if(!c || (c-filelist) > MAX_QPATH)
- {
- strlcpy(f->fallbacks[i], filelist, sizeof(mainfont));
- }
- else
- {
- memcpy(f->fallbacks[i], filelist, c - filelist);
- f->fallbacks[i][c - filelist] = 0;
- }
- }
-
- // handle sizes
- for(i = 0; i < MAX_FONT_SIZES; ++i)
- f->req_sizes[i] = -1;
- for (numsizes = 0,c = sizes;;)
- {
- if (!COM_ParseToken_VM_Tokenize(&c, 0))
- break;
- sz = atof(com_token);
- // detect crap size
- if (sz < 0.001f || sz > 1000.0f)
- {
- VM_Warning(prog, "VM_loadfont: crap size %s", com_token);
- continue;
- }
- // check overflow
- if (numsizes == MAX_FONT_SIZES)
- {
- VM_Warning(prog, "VM_loadfont: MAX_FONT_SIZES = %i exceeded", MAX_FONT_SIZES);
- break;
- }
- f->req_sizes[numsizes] = sz;
- numsizes++;
- }
-
- // additional scale/hoffset parms
- scale = 1;
- voffset = 0;
- if (prog->argc >= 5)
- {
- scale = PRVM_G_FLOAT(OFS_PARM4);
- if (scale <= 0)
- scale = 1;
- }
- if (prog->argc >= 6)
- voffset = PRVM_G_FLOAT(OFS_PARM5);
-
- // load
- LoadFont(true, mainfont, f, scale, voffset);
-
- // return index of loaded font
- PRVM_G_FLOAT(OFS_RETURN) = (f - dp_fonts.f);
-}
-
-/*
-=========
-VM_drawpic
-
-float drawpic(vector position, string pic, vector size, vector rgb, float alpha, float flag)
-=========
-*/
-void VM_drawpic(prvm_prog_t *prog)
-{
- const char *picname;
- prvm_vec_t *size, *pos, *rgb;
- int flag = 0;
-
- VM_SAFEPARMCOUNTRANGE(5,6,VM_drawpic);
-
- // polygonbegin without draw2d arg has to guess
- prog->polygonbegin_guess2d = true;
-
- picname = PRVM_G_STRING(OFS_PARM1);
- VM_CheckEmptyString(prog, picname);
-
- // is pic cached ? no function yet for that
- if(!1)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -4;
- VM_Warning(prog, "VM_drawpic: %s: %s not cached !\n", prog->name, picname);
- return;
- }
-
- pos = PRVM_G_VECTOR(OFS_PARM0);
- size = PRVM_G_VECTOR(OFS_PARM2);
- rgb = PRVM_G_VECTOR(OFS_PARM3);
- if (prog->argc >= 6)
- flag = (int) PRVM_G_FLOAT(OFS_PARM5);
-
- if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -2;
- VM_Warning(prog, "VM_drawpic: %s: wrong DRAWFLAG %i !\n",prog->name,flag);
- return;
- }
-
- if(pos[2] || size[2])
- VM_Warning(prog, "VM_drawpic: z value%s from %s discarded\n",(pos[2] && size[2]) ? "s" : " ",((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size")));
-
- DrawQ_Pic(pos[0], pos[1], Draw_CachePic_Flags (picname, CACHEPICFLAG_NOTPERSISTENT), size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag);
- PRVM_G_FLOAT(OFS_RETURN) = 1;
-}
-/*
-=========
-VM_drawrotpic
-
-float drawrotpic(vector position, string pic, vector size, vector org, float angle, vector rgb, float alpha, float flag)
-=========
-*/
-void VM_drawrotpic(prvm_prog_t *prog)
-{
- const char *picname;
- prvm_vec_t *size, *pos, *org, *rgb;
- int flag;
-
- VM_SAFEPARMCOUNT(8,VM_drawrotpic);
-
- // polygonbegin without draw2d arg has to guess
- prog->polygonbegin_guess2d = true;
-
- picname = PRVM_G_STRING(OFS_PARM1);
- VM_CheckEmptyString(prog, picname);
-
- // is pic cached ? no function yet for that
- if(!1)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -4;
- VM_Warning(prog, "VM_drawrotpic: %s: %s not cached !\n", prog->name, picname);
- return;
- }
-
- pos = PRVM_G_VECTOR(OFS_PARM0);
- size = PRVM_G_VECTOR(OFS_PARM2);
- org = PRVM_G_VECTOR(OFS_PARM3);
- rgb = PRVM_G_VECTOR(OFS_PARM5);
- flag = (int) PRVM_G_FLOAT(OFS_PARM7);
-
- if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -2;
- VM_Warning(prog, "VM_drawrotpic: %s: wrong DRAWFLAG %i !\n",prog->name,flag);
- return;
- }
-
- if(pos[2] || size[2] || org[2])
- VM_Warning(prog, "VM_drawrotpic: z value from pos/size/org discarded\n");
-
- DrawQ_RotPic(pos[0], pos[1], Draw_CachePic_Flags(picname, CACHEPICFLAG_NOTPERSISTENT), size[0], size[1], org[0], org[1], PRVM_G_FLOAT(OFS_PARM4), rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM6), flag);
- PRVM_G_FLOAT(OFS_RETURN) = 1;
-}
-/*
-=========
-VM_drawsubpic
-
-float drawsubpic(vector position, vector size, string pic, vector srcPos, vector srcSize, vector rgb, float alpha, float flag)
-
-=========
-*/
-void VM_drawsubpic(prvm_prog_t *prog)
-{
- const char *picname;
- prvm_vec_t *size, *pos, *rgb, *srcPos, *srcSize, alpha;
- int flag;
-
- VM_SAFEPARMCOUNT(8,VM_drawsubpic);
-
- // polygonbegin without draw2d arg has to guess
- prog->polygonbegin_guess2d = true;
-
- picname = PRVM_G_STRING(OFS_PARM2);
- VM_CheckEmptyString(prog, picname);
-
- // is pic cached ? no function yet for that
- if(!1)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -4;
- VM_Warning(prog, "VM_drawsubpic: %s: %s not cached !\n", prog->name, picname);
- return;
- }
-
- pos = PRVM_G_VECTOR(OFS_PARM0);
- size = PRVM_G_VECTOR(OFS_PARM1);
- srcPos = PRVM_G_VECTOR(OFS_PARM3);
- srcSize = PRVM_G_VECTOR(OFS_PARM4);
- rgb = PRVM_G_VECTOR(OFS_PARM5);
- alpha = PRVM_G_FLOAT(OFS_PARM6);
- flag = (int) PRVM_G_FLOAT(OFS_PARM7);
-
- if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -2;
- VM_Warning(prog, "VM_drawsubpic: %s: wrong DRAWFLAG %i !\n",prog->name,flag);
- return;
- }
-
- if(pos[2] || size[2])
- VM_Warning(prog, "VM_drawsubpic: z value%s from %s discarded\n",(pos[2] && size[2]) ? "s" : " ",((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size")));
-
- DrawQ_SuperPic(pos[0], pos[1], Draw_CachePic_Flags (picname, CACHEPICFLAG_NOTPERSISTENT),
- size[0], size[1],
- srcPos[0], srcPos[1], rgb[0], rgb[1], rgb[2], alpha,
- srcPos[0] + srcSize[0], srcPos[1], rgb[0], rgb[1], rgb[2], alpha,
- srcPos[0], srcPos[1] + srcSize[1], rgb[0], rgb[1], rgb[2], alpha,
- srcPos[0] + srcSize[0], srcPos[1] + srcSize[1], rgb[0], rgb[1], rgb[2], alpha,
- flag);
- PRVM_G_FLOAT(OFS_RETURN) = 1;
-}
-
-/*
-=========
-VM_drawfill
-
-float drawfill(vector position, vector size, vector rgb, float alpha, float flag)
-=========
-*/
-void VM_drawfill(prvm_prog_t *prog)
-{
- prvm_vec_t *size, *pos, *rgb;
- int flag;
-
- VM_SAFEPARMCOUNT(5,VM_drawfill);
-
- // polygonbegin without draw2d arg has to guess
- prog->polygonbegin_guess2d = true;
-
- pos = PRVM_G_VECTOR(OFS_PARM0);
- size = PRVM_G_VECTOR(OFS_PARM1);
- rgb = PRVM_G_VECTOR(OFS_PARM2);
- flag = (int) PRVM_G_FLOAT(OFS_PARM4);
-
- if(flag < DRAWFLAG_NORMAL || flag >=DRAWFLAG_NUMFLAGS)
- {
- PRVM_G_FLOAT(OFS_RETURN) = -2;
- VM_Warning(prog, "VM_drawfill: %s: wrong DRAWFLAG %i !\n",prog->name,flag);
- return;
- }
-
- if(pos[2] || size[2])
- VM_Warning(prog, "VM_drawfill: z value%s from %s discarded\n",(pos[2] && size[2]) ? "s" : " ",((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size")));
-
- DrawQ_Fill(pos[0], pos[1], size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM3), flag);
- PRVM_G_FLOAT(OFS_RETURN) = 1;
-}
-
-/*
-=========
-VM_drawsetcliparea
-
-drawsetcliparea(float x, float y, float width, float height)
-=========
-*/
-void VM_drawsetcliparea(prvm_prog_t *prog)
-{
- float x,y,w,h;
- VM_SAFEPARMCOUNT(4,VM_drawsetcliparea);
-
- // polygonbegin without draw2d arg has to guess
- prog->polygonbegin_guess2d = true;
-
- x = bound(0, PRVM_G_FLOAT(OFS_PARM0), vid_conwidth.integer);
- y = bound(0, PRVM_G_FLOAT(OFS_PARM1), vid_conheight.integer);
- w = bound(0, PRVM_G_FLOAT(OFS_PARM2) + PRVM_G_FLOAT(OFS_PARM0) - x, (vid_conwidth.integer - x));
- h = bound(0, PRVM_G_FLOAT(OFS_PARM3) + PRVM_G_FLOAT(OFS_PARM1) - y, (vid_conheight.integer - y));
-
- DrawQ_SetClipArea(x, y, w, h);
-}
-
-/*
-=========
-VM_drawresetcliparea
-
-drawresetcliparea()
-=========
-*/
-void VM_drawresetcliparea(prvm_prog_t *prog)
-{
- VM_SAFEPARMCOUNT(0,VM_drawresetcliparea);
-
- // polygonbegin without draw2d arg has to guess
- prog->polygonbegin_guess2d = true;
-
- DrawQ_ResetClipArea();
-}
-
-/*
-=========
-VM_getimagesize
-
-vector getimagesize(string pic)
-=========
-*/
-void VM_getimagesize(prvm_prog_t *prog)
-{
- const char *p;
- cachepic_t *pic;
-
- VM_SAFEPARMCOUNT(1,VM_getimagesize);
-
- p = PRVM_G_STRING(OFS_PARM0);
- VM_CheckEmptyString(prog, p);
-
- pic = Draw_CachePic_Flags (p, CACHEPICFLAG_QUIET | CACHEPICFLAG_NOTPERSISTENT);
- if (!Draw_IsPicLoaded(pic))
- {
- PRVM_G_VECTOR(OFS_RETURN)[0] = 0;
- PRVM_G_VECTOR(OFS_RETURN)[1] = 0;
- }
- else
- {
- PRVM_G_VECTOR(OFS_RETURN)[0] = Draw_GetPicWidth(pic);
- PRVM_G_VECTOR(OFS_RETURN)[1] = Draw_GetPicHeight(pic);
- }
- PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
-}
-
/*
=========
VM_keynumtostring
PRVM_G_FLOAT(OFS_RETURN) = 1;
}
-// CL_Video interface functions
-
-/*
-========================
-VM_cin_open
-
-float cin_open(string file, string name)
-========================
-*/
-void VM_cin_open(prvm_prog_t *prog)
-{
- const char *file;
- const char *name;
-
- VM_SAFEPARMCOUNT( 2, VM_cin_open );
-
- file = PRVM_G_STRING( OFS_PARM0 );
- name = PRVM_G_STRING( OFS_PARM1 );
-
- VM_CheckEmptyString(prog, file );
- VM_CheckEmptyString(prog, name );
-
- if( CL_OpenVideo( file, name, MENUOWNER, "" ) )
- PRVM_G_FLOAT( OFS_RETURN ) = 1;
- else
- PRVM_G_FLOAT( OFS_RETURN ) = 0;
-}
-
-/*
-========================
-VM_cin_close
-
-void cin_close(string name)
-========================
-*/
-void VM_cin_close(prvm_prog_t *prog)
-{
- const char *name;
-
- VM_SAFEPARMCOUNT( 1, VM_cin_close );
-
- name = PRVM_G_STRING( OFS_PARM0 );
- VM_CheckEmptyString(prog, name );
-
- CL_CloseVideo( CL_GetVideoByName( name ) );
-}
-
-/*
-========================
-VM_cin_setstate
-void cin_setstate(string name, float type)
-========================
-*/
-void VM_cin_setstate(prvm_prog_t *prog)
-{
- const char *name;
- clvideostate_t state;
- clvideo_t *video;
-
- VM_SAFEPARMCOUNT( 2, VM_cin_setstate );
-
- name = PRVM_G_STRING( OFS_PARM0 );
- VM_CheckEmptyString(prog, name );
-
- state = (clvideostate_t)((int)PRVM_G_FLOAT( OFS_PARM1 ));
-
- video = CL_GetVideoByName( name );
- if( video && state > CLVIDEO_UNUSED && state < CLVIDEO_STATECOUNT )
- CL_SetVideoState( video, state );
-}
-
-/*
-========================
-VM_cin_getstate
-
-float cin_getstate(string name)
-========================
-*/
-void VM_cin_getstate(prvm_prog_t *prog)
-{
- const char *name;
- clvideo_t *video;
-
- VM_SAFEPARMCOUNT( 1, VM_cin_getstate );
-
- name = PRVM_G_STRING( OFS_PARM0 );
- VM_CheckEmptyString(prog, name );
-
- video = CL_GetVideoByName( name );
- if( video )
- PRVM_G_FLOAT( OFS_RETURN ) = (int)video->state;
- else
- PRVM_G_FLOAT( OFS_RETURN ) = 0;
-}
-
-/*
-========================
-VM_cin_restart
-
-void cin_restart(string name)
-========================
-*/
-void VM_cin_restart(prvm_prog_t *prog)
-{
- const char *name;
- clvideo_t *video;
-
- VM_SAFEPARMCOUNT( 1, VM_cin_restart );
-
- name = PRVM_G_STRING( OFS_PARM0 );
- VM_CheckEmptyString(prog, name );
-
- video = CL_GetVideoByName( name );
- if( video )
- CL_RestartVideo( video );
-}
-
/*
========================
VM_gecko_create
VectorCopy(up, PRVM_gameglobalvector(v_up));
}
-/*
-========================
-VM_drawline
-
-void drawline(float width, vector pos1, vector pos2, vector rgb, float alpha, float flags)
-========================
-*/
-void VM_drawline (prvm_prog_t *prog)
-{
- prvm_vec_t *c1, *c2, *rgb;
- float alpha, width;
- unsigned char flags;
-
- VM_SAFEPARMCOUNT(6, VM_drawline);
-
- // polygonbegin without draw2d arg has to guess
- prog->polygonbegin_guess2d = true;
-
- width = PRVM_G_FLOAT(OFS_PARM0);
- c1 = PRVM_G_VECTOR(OFS_PARM1);
- c2 = PRVM_G_VECTOR(OFS_PARM2);
- rgb = PRVM_G_VECTOR(OFS_PARM3);
- alpha = PRVM_G_FLOAT(OFS_PARM4);
- flags = (int)PRVM_G_FLOAT(OFS_PARM5);
- DrawQ_Line(width, c1[0], c1[1], c2[0], c2[1], rgb[0], rgb[1], rgb[2], alpha, flags);
-}
-
// float(float number, float quantity) bitshift (EXT_BITSHIFT)
void VM_bitshift (prvm_prog_t *prog)
{
VM_Warning(prog, "changeyaw: can not modify world entity\n");
return;
}
- if (ent->priv.server->free)
+ if (ent->free)
{
VM_Warning(prog, "changeyaw: can not modify free entity\n");
return;
VM_Warning(prog, "changepitch: can not modify world entity\n");
return;
}
- if (ent->priv.server->free)
+ if (ent->free)
{
VM_Warning(prog, "changepitch: can not modify free entity\n");
return;
void VM_wasfreed (prvm_prog_t *prog)
{
VM_SAFEPARMCOUNT(1, VM_wasfreed);
- PRVM_G_FLOAT(OFS_RETURN) = PRVM_G_EDICT(OFS_PARM0)->priv.required->free;
+ PRVM_G_FLOAT(OFS_RETURN) = PRVM_G_EDICT(OFS_PARM0)->free;
}
void VM_SetTraceGlobals(prvm_prog_t *prog, const trace_t *trace)
// surface querying
-static dp_model_t *getmodel(prvm_prog_t *prog, prvm_edict_t *ed)
+static model_t *getmodel(prvm_prog_t *prog, prvm_edict_t *ed)
{
if (prog == SVVM_prog)
return SV_GetModelFromEdict(ed);
struct animatemodel_cache
{
- dp_model_t *model;
+ model_t *model;
frameblend_t frameblend[MAX_FRAMEBLENDS];
skeleton_t *skeleton_p;
skeleton_t skeleton;
Mem_Free(prog->animatemodel_cache);
}
-static void animatemodel(prvm_prog_t *prog, dp_model_t *model, prvm_edict_t *ed)
+static void animatemodel(prvm_prog_t *prog, model_t *model, prvm_edict_t *ed)
{
skeleton_t *skeleton;
int skeletonindex = -1;
VectorCopy(p, out);
}
-static void clippointtosurface(prvm_prog_t *prog, prvm_edict_t *ed, dp_model_t *model, msurface_t *surface, vec3_t p, vec3_t out)
+static void clippointtosurface(prvm_prog_t *prog, prvm_edict_t *ed, model_t *model, msurface_t *surface, vec3_t p, vec3_t out)
{
int i, j, k;
float *v[3], facenormal[3], edgenormal[3], sidenormal[3], temp[3], offsetdist, dist, bestdist;
}
}
-static msurface_t *getsurface(dp_model_t *model, int surfacenum)
+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;
}
//PF_getsurfacenumpoints, // #434 float(entity e, float s) getsurfacenumpoints = #434;
void VM_getsurfacenumpoints(prvm_prog_t *prog)
{
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
VM_SAFEPARMCOUNT(2, VM_getsurfacenumpoints);
// return 0 if no such surface
void VM_getsurfacepoint(prvm_prog_t *prog)
{
prvm_edict_t *ed;
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
int pointnum;
vec3_t result;
void VM_getsurfacepointattribute(prvm_prog_t *prog)
{
prvm_edict_t *ed;
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
int pointnum;
int attributetype;
//PF_getsurfacenormal, // #436 vector(entity e, float s) getsurfacenormal = #436;
void VM_getsurfacenormal(prvm_prog_t *prog)
{
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
vec3_t normal;
vec3_t result;
//PF_getsurfacetexture, // #437 string(entity e, float s) getsurfacetexture = #437;
void VM_getsurfacetexture(prvm_prog_t *prog)
{
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
VM_SAFEPARMCOUNT(2, VM_getsurfacetexture);
PRVM_G_INT(OFS_RETURN) = OFS_NULL;
vec3_t clipped, p;
vec_t dist, bestdist;
prvm_edict_t *ed;
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
vec3_t point;
VM_SAFEPARMCOUNT(2, VM_getsurfacenearpoint);
ed = PRVM_G_EDICT(OFS_PARM0);
VectorCopy(PRVM_G_VECTOR(OFS_PARM1), point);
- if (!ed || ed->priv.server->free)
+ if (!ed || ed->free)
return;
model = getmodel(prog, ed);
if (!model || !model->num_surfaces)
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;
}
}
void VM_getsurfaceclippedpoint(prvm_prog_t *prog)
{
prvm_edict_t *ed;
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
vec3_t p, out, inp;
VM_SAFEPARMCOUNT(3, VM_getsurfaceclippedpoint);
//PF_getsurfacenumtriangles, // #??? float(entity e, float s) getsurfacenumtriangles = #???;
void VM_getsurfacenumtriangles(prvm_prog_t *prog)
{
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
VM_SAFEPARMCOUNT(2, VM_getsurfacenumtriangles);
// return 0 if no such surface
{
const vec3_t d = {-1, -1, -1};
prvm_edict_t *ed;
- dp_model_t *model;
+ model_t *model;
msurface_t *surface;
int trinum;
VM_SAFEPARMCOUNT(3, VM_getsurfacetriangle);
// physics builtins
//
+#ifdef USEODE
#define VM_physics_ApplyCmd(ed,f) if (!ed->priv.server->ode_body) VM_physics_newstackfunction(prog, ed, f); else World_Physics_ApplyCmd(ed, f)
static edict_odefunc_t *VM_physics_newstackfunction(prvm_prog_t *prog, prvm_edict_t *ed, edict_odefunc_t *f)
}
return newfunc;
}
+#endif
// void(entity e, float physics_enabled) physics_enable = #;
void VM_physics_enable(prvm_prog_t *prog)
{
+#ifdef USEODE
prvm_edict_t *ed;
edict_odefunc_t f;
-
+#endif
VM_SAFEPARMCOUNT(2, VM_physics_enable);
+#ifdef USEODE
ed = PRVM_G_EDICT(OFS_PARM0);
if (!ed)
{
}
f.type = PRVM_G_FLOAT(OFS_PARM1) == 0 ? ODEFUNC_DISABLE : ODEFUNC_ENABLE;
VM_physics_ApplyCmd(ed, &f);
+#endif
}
// void(entity e, vector force, vector relative_ofs) physics_addforce = #;
void VM_physics_addforce(prvm_prog_t *prog)
{
+#ifdef USEODE
prvm_edict_t *ed;
edict_odefunc_t f;
-
+#endif
VM_SAFEPARMCOUNT(3, VM_physics_addforce);
+#ifdef USEODE
ed = PRVM_G_EDICT(OFS_PARM0);
if (!ed)
{
VectorCopy(PRVM_G_VECTOR(OFS_PARM1), f.v1);
VectorCopy(PRVM_G_VECTOR(OFS_PARM2), f.v2);
VM_physics_ApplyCmd(ed, &f);
+#endif
}
// void(entity e, vector torque) physics_addtorque = #;
void VM_physics_addtorque(prvm_prog_t *prog)
{
+#ifdef USEODE
prvm_edict_t *ed;
edict_odefunc_t f;
-
+#endif
VM_SAFEPARMCOUNT(2, VM_physics_addtorque);
+#ifdef USEODE
ed = PRVM_G_EDICT(OFS_PARM0);
if (!ed)
{
f.type = ODEFUNC_TORQUE;
VectorCopy(PRVM_G_VECTOR(OFS_PARM1), f.v1);
VM_physics_ApplyCmd(ed, &f);
+#endif
}
extern cvar_t prvm_coverage;
projects / xonotic / darkplaces.git / blobdiff