#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);
}
extern cvar_t cl_noplayershadow;
-qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
+extern cvar_t r_equalize_entities_fullbright;
+qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum)
{
int renderflags;
int c;
if (!model)
return false;
- entrender = CL_NewTempEntity();
- if (!entrender)
- return false;
+ if (edictnum)
+ {
+ if (r_refdef.scene.numentities >= r_refdef.scene.maxentities)
+ return false;
+ entrender = cl.csqcrenderentities + edictnum;
+ r_refdef.scene.entities[r_refdef.scene.numentities++] = entrender;
+ entrender->entitynumber = edictnum;
+ //entrender->shadertime = 0; // shadertime was set by spawn()
+ entrender->alpha = 1;
+ entrender->scale = 1;
+ VectorSet(entrender->colormod, 1, 1, 1);
+ VectorSet(entrender->glowmod, 1, 1, 1);
+ entrender->allowdecals = true;
+ }
+ else
+ {
+ entrender = CL_NewTempEntity(0);
+ if (!entrender)
+ return false;
+ }
entrender->model = model;
entrender->skinnum = (int)ed->fields.client->skin;
if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.alpha)) && val->_float) entrender->alpha = val->_float;
if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.scale)) && val->_float) entrender->scale = scale = val->_float;
if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.colormod)) && VectorLength2(val->vector)) VectorCopy(val->vector, entrender->colormod);
+ if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.glowmod)) && VectorLength2(val->vector)) VectorCopy(val->vector, entrender->glowmod);
if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.effects)) && val->_float) entrender->effects |= (int)val->_float;
if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.tag_entity)) && val->edict)
{
}
else
Matrix4x4_CreateIdentity(&tagmatrix);
+ if (!VectorLength2(entrender->colormod))
+ VectorSet(entrender->colormod, 1, 1, 1);
+ if (!VectorLength2(entrender->glowmod))
+ VectorSet(entrender->glowmod, 1, 1, 1);
if (renderflags & RF_USEAXIS)
{
}
// set up the animation data
- // self.frame is the interpolation target (new frame)
- // 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;
+ VM_GenerateFrameGroupBlend(ed->priv.server->framegroupblend, ed);
+ VM_FrameBlendFromFrameGroupBlend(ed->priv.server->frameblend, ed->priv.server->framegroupblend, model);
+ VM_UpdateEdictSkeleton(ed, model, ed->priv.server->frameblend);
+ if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.shadertime))) entrender->shadertime = val->_float;
// concat the matrices to make the entity relative to its tag
Matrix4x4_Concat(&entrender->matrix, &tagmatrix, &matrix2);
+ // transparent offset
+ if ((renderflags & RF_USETRANSPARENTOFFSET) && (val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.transparent_offset)))
+ entrender->transparent_offset = val->_float;
+
if(renderflags)
{
- if(renderflags & RF_VIEWMODEL) entrender->flags |= RENDER_VIEWMODEL;
+ if(renderflags & RF_VIEWMODEL) entrender->flags |= RENDER_VIEWMODEL | RENDER_NODEPTHTEST;
if(renderflags & RF_EXTERNALMODEL)entrender->flags |= RENDER_EXTERIORMODEL;
- if(renderflags & RF_DEPTHHACK) entrender->effects |= EF_NODEPTHTEST;
- if(renderflags & RF_ADDITIVE) entrender->effects |= EF_ADDITIVE;
+ if(renderflags & RF_NOCULL) entrender->flags |= RENDER_NOCULL;
+ if(renderflags & RF_DEPTHHACK) entrender->flags |= RENDER_NODEPTHTEST;
+ if(renderflags & RF_ADDITIVE) entrender->flags |= RENDER_ADDITIVE;
+
}
c = (int)ed->fields.client->colormap;
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;
+ if(!r_fullbright.integer)
+ {
+ if (!(entrender->effects & EF_FULLBRIGHT))
+ entrender->flags |= RENDER_LIGHT;
+ else if(r_equalize_entities_fullbright.integer)
+ entrender->flags |= RENDER_LIGHT | RENDER_EQUALIZE;
+ }
// hide player shadow during intermission or nehahra movie
if (!(entrender->effects & (EF_NOSHADOW | EF_ADDITIVE | EF_NODEPTHTEST))
&& (entrender->alpha >= 1)
entrender->flags |= RENDER_SHADOW;
if (entrender->flags & RENDER_VIEWMODEL)
entrender->flags |= RENDER_NOSELFSHADOW;
+ if (entrender->effects & EF_NOSELFSHADOW)
+ entrender->flags |= RENDER_NOSELFSHADOW;
+ if (entrender->effects & EF_NODEPTHTEST)
+ entrender->flags |= RENDER_NODEPTHTEST;
+ if (entrender->effects & EF_ADDITIVE)
+ entrender->flags |= RENDER_ADDITIVE;
+ if (entrender->effects & EF_DOUBLESIDED)
+ entrender->flags |= RENDER_DOUBLESIDED;
// make the other useful stuff
+ memcpy(entrender->framegroupblend, ed->priv.server->framegroupblend, sizeof(ed->priv.server->framegroupblend));
CL_UpdateRenderEntity(entrender);
+ // override animation data with full control
+ memcpy(entrender->frameblend, ed->priv.server->frameblend, sizeof(ed->priv.server->frameblend));
+ if (ed->priv.server->skeleton.relativetransforms)
+ entrender->skeleton = &ed->priv.server->skeleton;
+ else
+ entrender->skeleton = NULL;
return true;
}
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);
int restorevm_tempstringsbuf_cursize;
if(!cl.csqc_loaded)
{
- SCR_CenterPrint((char*)msg);
+ SCR_CenterPrint(msg);
return;
}
CSQC_BEGIN
vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
}
else
- SCR_CenterPrint((char*)msg);
+ SCR_CenterPrint(msg);
CSQC_END
}
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
}
cl.csqc_server2csqcentitynumber[realentnum] = 0;
}
else
- Con_Printf("Bad csqc_server2csqcentitynumber map\n"); //[515]: never happens ?
+ {
+ // LordHavoc: removing an entity that is already gone on
+ // the csqc side is possible for legitimate reasons (such
+ // as a repeat of the remove message), so no warning is
+ // needed
+ //Con_Printf("Bad csqc_server2csqcentitynumber map\n"); //[515]: never happens ?
+ }
}
else
{
void CL_VM_CB_InitEdict(prvm_edict_t *e)
{
+ int edictnum = PRVM_NUM_FOR_EDICT(e);
+ entity_render_t *entrender;
+ CL_ExpandCSQCRenderEntities(edictnum);
+ entrender = cl.csqcrenderentities + edictnum;
e->priv.server->move = false; // don't move on first frame
+ memset(entrender, 0, sizeof(*entrender));
+ entrender->shadertime = cl.time;
}
+extern void R_DecalSystem_Reset(decalsystem_t *decalsystem);
+
void CL_VM_CB_FreeEdict(prvm_edict_t *ed)
{
+ entity_render_t *entrender = cl.csqcrenderentities + PRVM_NUM_FOR_EDICT(ed);
+ R_DecalSystem_Reset(&entrender->decalsystem);
+ memset(entrender, 0, sizeof(*entrender));
World_UnlinkEdict(ed);
memset(ed->fields.client, 0, sizeof(*ed->fields.client));
+ VM_RemoveEdictSkeleton(ed);
+ World_Physics_RemoveFromEntity(&cl.world, ed);
+ World_Physics_RemoveJointFromEntity(&cl.world, ed);
}
void CL_VM_CB_CountEdicts(void)
void Cmd_ClearCsqcFuncs (void);
+// 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, 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(protocol == PROTOCOL_QUAKEWORLD)
+ return false; // CSQC can't run in QW anyway
+
+ SZ_Clear(buf);
+ if(cnt == 0)
+ {
+ MSG_WriteByte(buf, svc_stufftext);
+ MSG_WriteString(buf, va("\ncl_downloadbegin %lu %s\n", len, filename));
+ return true;
+ }
+ else if(cnt >= 1 && cnt <= npackets)
+ {
+ unsigned long thispacketoffset = (cnt - 1) * packetsize;
+ int thispacketsize = len - thispacketoffset;
+ if(thispacketsize > packetsize)
+ thispacketsize = packetsize;
+
+ MSG_WriteByte(buf, svc_downloaddata);
+ MSG_WriteLong(buf, thispacketoffset);
+ MSG_WriteShort(buf, thispacketsize);
+ SZ_Write(buf, data + thispacketoffset, thispacketsize);
+
+ return true;
+ }
+ else if(cnt == npackets + 1)
+ {
+ MSG_WriteByte(buf, svc_stufftext);
+ MSG_WriteString(buf, va("\ncl_downloadfinished %lu %d\n", len, crc));
+ return true;
+ }
+ return false;
+}
+
void CL_VM_Init (void)
{
const char* csprogsfn;
if (csprogsdata)
{
csprogsdatacrc = CRC_Block(csprogsdata, csprogsdatasize);
- Mem_Free(csprogsdata);
if (csprogsdatacrc != requiredcrc || csprogsdatasize != requiredsize)
{
if (cls.demoplayback)
{
Con_Printf("^1Warning: Your %s is not the same version as the demo was recorded with (CRC/size are %i/%i but should be %i/%i)\n", csqc_progname.string, csprogsdatacrc, (int)csprogsdatasize, requiredcrc, requiredsize);
- return;
+ // Mem_Free(csprogsdata);
+ // return;
+ // We WANT to continue here, and play the demo with different csprogs!
+ // After all, this is just a warning. Sure things may go wrong from here.
}
else
{
+ Mem_Free(csprogsdata);
Con_Printf("^1Your %s is not the same version as the server (CRC is %i/%i but should be %i/%i)\n", csqc_progname.string, csprogsdatacrc, (int)csprogsdatasize, requiredcrc, requiredsize);
CL_Disconnect();
return;
prog->init_cmd = VM_CL_Cmd_Init;
prog->reset_cmd = VM_CL_Cmd_Reset;
prog->error_cmd = CL_VM_Error;
+ prog->ExecuteProgram = CLVM_ExecuteProgram;
PRVM_LoadProgs(csprogsfn, cl_numrequiredfunc, cl_required_func, 0, NULL, 0, NULL);
CL_VM_Error("CSQC %s ^2failed to load\n", csprogsfn);
if(!sv.active)
CL_Disconnect();
+ Mem_Free(csprogsdata);
return;
}
- Con_Printf("CSQC %s ^5loaded (crc=%i, size=%i)\n", csprogsfn, csprogsdatacrc, (int)csprogsdatasize);
+ Con_DPrintf("CSQC %s ^5loaded (crc=%i, size=%i)\n", csprogsfn, csprogsdatacrc, (int)csprogsdatasize);
+
+ if(cls.demorecording)
+ {
+ 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);
// check if OP_STATE animation is possible in this dat file
if (prog->fieldoffsets.nextthink >= 0 && prog->fieldoffsets.frame >= 0 && prog->fieldoffsets.think >= 0 && prog->globaloffsets.self >= 0)
void CL_VM_ShutDown (void)
{
Cmd_ClearCsqcFuncs();
- Cvar_SetValueQuick(&csqc_progcrc, -1);
- Cvar_SetValueQuick(&csqc_progsize, -1);
+ //Cvar_SetValueQuick(&csqc_progcrc, -1);
+ //Cvar_SetValueQuick(&csqc_progsize, -1);
if(!cl.csqc_loaded)
return;
CSQC_BEGIN
PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Shutdown, "QC function CSQC_Shutdown is missing");
PRVM_ResetProg();
CSQC_END
- Con_Print("CSQC ^1unloaded\n");
+ Con_DPrint("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 - MAX_EDICTS);
+
+ 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;
+}