#include "cl_collision.h"
#include "snd_main.h"
#include "clvm_cmds.h"
+#include "prvm_cmds.h"
//============================================================================
// Client prog handling
#define CSQC_RETURNVAL prog->globals.generic[OFS_RETURN]
#define CSQC_BEGIN csqc_tmpprog=prog;prog=0;PRVM_SetProg(PRVM_CLIENTPROG);
#define CSQC_END prog=csqc_tmpprog;
+
static prvm_prog_t *csqc_tmpprog;
+void CL_VM_PreventInformationLeaks(void)
+{
+ prvm_eval_t *val;
+ if(!cl.csqc_loaded)
+ return;
+ CSQC_BEGIN
+ VM_ClearTraceGlobals();
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.trace_networkentity)))
+ val->_float = 0;
+ CSQC_END
+}
+
//[515]: these are required funcs
static char *cl_required_func[] =
{
Cvar_SetValueQuick(&csqc_progsize, -1);
// Host_AbortCurrentFrame(); //[515]: hmmm... if server says it needs csqc then client MUST disconnect
- Host_Error(va("CL_VM_Error: %s", errorstring));
+ Host_Error("CL_VM_Error: %s", errorstring);
}
void CL_VM_UpdateDmgGlobals (int dmg_take, int dmg_save, vec3_t dmg_origin)
{
CSQC_END
}
}
+
+void CSQC_UpdateNetworkTimes(double newtime, double oldtime)
+{
+ prvm_eval_t *val;
+ if(!cl.csqc_loaded)
+ return;
+ CSQC_BEGIN
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.servertime)))
+ val->_float = newtime;
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.serverprevtime)))
+ val->_float = oldtime;
+ if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.serverdeltatime)))
+ val->_float = newtime - oldtime;
+ CSQC_END
+}
+
//[515]: set globals before calling R_UpdateView, WEIRD CRAP
static void CSQC_SetGlobals (void)
{
// CSQC is useless as it can't alter the view origin without
// completely replacing it
VectorCopy(cl.csqc_origin, prog->globals.client->pmove_org);
- VectorCopy(cl.velocity, prog->globals.client->pmove_vel);
+ VectorCopy(cl.movement_velocity, prog->globals.client->pmove_vel);
if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.view_angles)))
VectorCopy(cl.viewangles, val->vector);
if (!model)
return false;
- entrender = CL_NewTempEntity();
+ entrender = CL_NewTempEntity(0);
if (!entrender)
return false;
// self.frame1time is the animation base time for the interpolation target
// self.frame2 is the interpolation start (previous frame)
// self.frame2time is the animation base time for the interpolation start
- entrender->frame1 = entrender->frame2 = ed->fields.client->frame;
- if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2))) entrender->frame2 = val->_float;
- if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame1time))) entrender->frame2time = val->_float;
- if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2time))) entrender->frame1time = val->_float;
- if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.lerpfrac))) entrender->framelerp = val->_float;
+ // self.lerpfrac is the interpolation strength for self.frame
+ // 3+ are for additional blends (the main use for this feature is lerping
+ // pitch angle on a player model where the animator set up 5 sets of
+ // animations and the csqc simply lerps between sets)
+ entrender->framegroupblend[0].frame = entrender->framegroupblend[1].frame = (int) ed->fields.client->frame;
+ if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2))) entrender->framegroupblend[1].frame = (int) val->_float;
+ if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame3))) entrender->framegroupblend[2].frame = (int) val->_float;
+ if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame4))) entrender->framegroupblend[3].frame = (int) val->_float;
+ if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame1time))) entrender->framegroupblend[0].start = val->_float;
+ if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2time))) entrender->framegroupblend[1].start = val->_float;
+ if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame3time))) entrender->framegroupblend[2].start = val->_float;
+ if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame4time))) entrender->framegroupblend[3].start = val->_float;
+ if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.lerpfrac))) entrender->framegroupblend[0].lerp = val->_float;
+ if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.lerpfrac3))) entrender->framegroupblend[2].lerp = val->_float;
+ if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.lerpfrac4))) entrender->framegroupblend[3].lerp = val->_float;
+ if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.shadertime))) entrender->shadertime = val->_float;
+ // assume that the (missing) lerpfrac2 is whatever remains after lerpfrac+lerpfrac3+lerpfrac4 are summed
+ entrender->framegroupblend[1].lerp = 1 - entrender->framegroupblend[0].lerp - entrender->framegroupblend[2].lerp - entrender->framegroupblend[3].lerp;
// concat the matrices to make the entity relative to its tag
Matrix4x4_Concat(&entrender->matrix, &tagmatrix, &matrix2);
else
CL_SetEntityColormapColors(entrender, c);
+ entrender->flags &= ~(RENDER_SHADOW | RENDER_LIGHT | RENDER_NOSELFSHADOW);
// either fullbright or lit
if (!(entrender->effects & EF_FULLBRIGHT) && !r_fullbright.integer)
entrender->flags |= RENDER_LIGHT;
entrender->flags |= RENDER_SHADOW;
if (entrender->flags & RENDER_VIEWMODEL)
entrender->flags |= RENDER_NOSELFSHADOW;
+ if (entrender->effects & EF_NOSELFSHADOW)
+ entrender->flags |= RENDER_NOSELFSHADOW;
// make the other useful stuff
CL_UpdateRenderEntity(entrender);
PRVM_G_FLOAT(OFS_PARM1) = key;
PRVM_G_FLOAT(OFS_PARM2) = ascii;
PRVM_ExecuteProgram(prog->funcoffsets.CSQC_InputEvent, "QC function CSQC_InputEvent is missing");
- r = CSQC_RETURNVAL;
+ r = CSQC_RETURNVAL != 0;
}
CSQC_END
return r;
// CSQC_UpdateView function does not call R_ClearScene as it should
r_refdef.scene.numentities = 0;
r_refdef.scene.numlights = 0;
+ // pass in width and height as parameters (EXT_CSQC_1)
+ PRVM_G_FLOAT(OFS_PARM0) = vid.width;
+ PRVM_G_FLOAT(OFS_PARM1) = vid.height;
PRVM_ExecuteProgram(prog->funcoffsets.CSQC_UpdateView, "QC function CSQC_UpdateView is missing");
//VectorCopy(oldangles, cl.viewangles);
// Dresk : Reset Dmg Globals Here
PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(cmd);
PRVM_ExecuteProgram(prog->funcoffsets.CSQC_ConsoleCommand, "QC function CSQC_ConsoleCommand is missing");
vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
- r = CSQC_RETURNVAL;
+ r = CSQC_RETURNVAL != 0;
}
CSQC_END
return r;
prog->globals.client->time = cl.time;
prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity];
PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Parse_TempEntity, "QC function CSQC_Parse_TempEntity is missing");
- r = CSQC_RETURNVAL;
+ r = CSQC_RETURNVAL != 0;
if(!r)
{
msg_readcount = t;
csqc_progsize.flags = sizeflags;
return;
}
+
+ if(cls.demoplayback)
+ if(!strncmp(msg, "curl --clear_autodownload\ncurl --pak --forthismap --as ", 55))
+ {
+ // special handling for map download commands
+ // run these commands IMMEDIATELY, instead of waiting for a client frame
+ // that way, there is no black screen when playing back demos
+ // I know this is a really ugly hack, but I can't think of any better way
+ // FIXME find the actual CAUSE of this, and make demo playback WAIT
+ // until all maps are loaded, then remove this hack
+
+ char buf[MAX_INPUTLINE];
+ const char *p, *q;
+ size_t l;
+
+ p = msg;
+
+ for(;;)
+ {
+ q = strchr(p, '\n');
+ if(q)
+ l = q - p;
+ else
+ l = strlen(p);
+ if(l > sizeof(buf) - 1)
+ l = sizeof(buf) - 1;
+ strlcpy(buf, p, l + 1); // strlcpy needs a + 1 as it includes the newline!
+
+ Cmd_ExecuteString(buf, src_command);
+
+ p += l;
+ if(*p == '\n')
+ ++p; // skip the newline and continue
+ else
+ break; // end of string or overflow
+ }
+ Cmd_ExecuteString("curl --clear_autodownload", src_command); // don't inhibit CSQC loading
+ return;
+ }
+
if(!cl.csqc_loaded)
{
Cbuf_AddText(msg);
CSQC_END
}
}
-qboolean CL_VM_Event_Sound(int sound_num, int volume, int channel, float attenuation, int ent, vec3_t pos)
+qboolean CL_VM_Event_Sound(int sound_num, float volume, int channel, float attenuation, int ent, vec3_t pos)
{
qboolean r = false;
if(cl.csqc_loaded)
PRVM_G_FLOAT(OFS_PARM4) = attenuation;
VectorCopy(pos, PRVM_G_VECTOR(OFS_PARM5) );
PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Event_Sound, "QC function CSQC_Event_Sound is missing");
- r = CSQC_RETURNVAL;
+ r = CSQC_RETURNVAL != 0;
}
CSQC_END
}
// returns true if the packet is valid, false if end of file is reached
// used for dumping the CSQC download into demo files
-qboolean MakeDownloadPacket(const char *filename, void *data, unsigned long len, int crc, int cnt, sizebuf_t *buf, int protocol)
+qboolean MakeDownloadPacket(const char *filename, unsigned char *data, unsigned long len, int crc, int cnt, sizebuf_t *buf, int protocol)
{
int packetsize = buf->maxsize - 7; // byte short long
int npackets = (len + packetsize - 1) / (packetsize);
if(cls.demorecording)
{
- int i;
- char buf[NET_MAXMESSAGE];
- sizebuf_t sb;
- void *demobuf; fs_offset_t demofilesize;
-
- sb.data = (void *) buf;
- sb.maxsize = sizeof(buf);
- i = 0;
-
- CL_CutDemo(&demobuf, &demofilesize);
- while(MakeDownloadPacket(csprogsfn, csprogsdata, csprogsdatasize, csprogsdatacrc, i++, &sb, cls.protocol))
- CL_WriteDemoMessage(&sb);
- CL_PasteDemo(&demobuf, &demofilesize);
+ if(cls.demo_lastcsprogssize != csprogsdatasize || cls.demo_lastcsprogscrc != csprogsdatacrc)
+ {
+ int i;
+ char buf[NET_MAXMESSAGE];
+ sizebuf_t sb;
+ unsigned char *demobuf; fs_offset_t demofilesize;
+
+ sb.data = (unsigned char *) buf;
+ sb.maxsize = sizeof(buf);
+ i = 0;
+
+ CL_CutDemo(&demobuf, &demofilesize);
+ while(MakeDownloadPacket(csqc_progname.string, csprogsdata, csprogsdatasize, csprogsdatacrc, i++, &sb, cls.protocol))
+ CL_WriteDemoMessage(&sb);
+ CL_PasteDemo(&demobuf, &demofilesize);
+
+ cls.demo_lastcsprogssize = csprogsdatasize;
+ cls.demo_lastcsprogscrc = csprogsdatacrc;
+ }
}
Mem_Free(csprogsdata);
Con_Print("CSQC ^1unloaded\n");
cl.csqc_loaded = false;
}
+
+qboolean CL_VM_GetEntitySoundOrigin(int entnum, vec3_t out)
+{
+ prvm_edict_t *ed;
+ dp_model_t *mod;
+ matrix4x4_t matrix;
+ qboolean r = 0;
+
+ CSQC_BEGIN;
+
+ // FIXME consider attachments here!
+
+ ed = PRVM_EDICT_NUM(entnum - 32768);
+
+ if(!ed->priv.required->free)
+ {
+ mod = CL_GetModelFromEdict(ed);
+ VectorCopy(ed->fields.client->origin, out);
+ if(CL_GetTagMatrix (&matrix, ed, 0) == 0)
+ Matrix4x4_OriginFromMatrix(&matrix, out);
+ if (mod && mod->soundfromcenter)
+ VectorMAMAM(1.0f, out, 0.5f, mod->normalmins, 0.5f, mod->normalmaxs, out);
+ r = 1;
+ }
+
+ CSQC_END;
+
+ return r;
+}