}
}
+void CL_VM_Error (const char *format, ...) DP_FUNC_PRINTF(1);
void CL_VM_Error (const char *format, ...) //[515]: hope it will be never executed =)
{
char errorstring[4096];
csqc_loaded = false;
Mem_FreePool(&csqc_mempool);
- Cvar_SetValueQuick(&csqc_progcrc, 0);
+ Cvar_SetValueQuick(&csqc_progcrc, -1);
+ 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));
}
+model_t *CSQC_GetModelByIndex(int modelindex)
+{
+ if(!modelindex)
+ return NULL;
+ if (modelindex < 0)
+ {
+ modelindex = -(modelindex+1);
+ if (modelindex < MAX_MODELS)
+ return cl.csqc_model_precache[modelindex];
+ }
+ else
+ {
+ if(modelindex < MAX_MODELS)
+ return cl.model_precache[modelindex];
+ }
+ return NULL;
+}
+
+model_t *CSQC_GetModelFromEntity(prvm_edict_t *ed)
+{
+ if (!ed || ed->priv.server->free)
+ return NULL;
+ return CSQC_GetModelByIndex((int)ed->fields.client->modelindex);
+}
+
//[515]: set globals before calling R_UpdateView, WEIRD CRAP
static void CSQC_SetGlobals (void)
{
prog->globals.client->input_buttons = csqc_buttons;
VectorSet(prog->globals.client->input_movevalues, cl.cmd.forwardmove, cl.cmd.sidemove, cl.cmd.upmove);
//VectorCopy(cl.movement_origin, csqc_origin);
- VectorCopy(cl.entities[cl.viewentity].render.origin, csqc_origin);
+ Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, csqc_origin);
VectorCopy(csqc_origin, prog->globals.client->pmove_org);
prog->globals.client->maxclients = cl.maxclients;
//VectorCopy(cl.movement_velocity, prog->globals.client->pmove_vel);
qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
{
int i;
+ float scale;
prvm_eval_t *val;
entity_t *e;
+ model_t *model;
matrix4x4_t tagmatrix, matrix2;
- e = CL_NewTempEntity();
- if (!e)
+ model = CSQC_GetModelFromEntity(ed);
+ if (!model)
return false;
- i = (int)ed->fields.client->modelindex;
- if(i >= MAX_MODELS || i <= -MAX_MODELS) //[515]: make work as error ?
- {
- Con_Print("CSQC_AddRenderEdict: modelindex >= MAX_MODELS\n");
- ed->fields.client->modelindex = i = 0;
- }
-
- // model setup and some modelflags
- if (i < MAX_MODELS)
- e->render.model = cl.model_precache[e->state_current.modelindex];
- else
- e->render.model = cl.csqc_model_precache[65536-e->state_current.modelindex];
-
- if (!e->render.model)
+ e = CL_NewTempEntity();
+ if (!e)
return false;
+ e->render.model = model;
e->render.colormap = (int)ed->fields.client->colormap;
e->render.frame = (int)ed->fields.client->frame;
e->render.skinnum = (int)ed->fields.client->skin;
e->render.effects |= e->render.model->flags2 & (EF_FULLBRIGHT | EF_ADDITIVE);
+ scale = 1;
if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_alpha)) && val->_float) e->render.alpha = val->_float;
- if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_scale)) && val->_float) e->render.scale = val->_float;
+ if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_scale)) && val->_float) e->render.scale = scale = val->_float;
if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_colormod)) && VectorLength2(val->vector)) VectorCopy(val->vector, e->render.colormod);
if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_effects)) && val->_float) e->render.effects = (int)val->_float;
if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_tag_entity)) && val->edict)
{
int tagentity;
- int tagindex;
+ int tagindex = 0;
tagentity = val->edict;
if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_tag_index)) && val->_float)
tagindex = (int)val->_float;
angles[0] = -angles[0];
// set up the render matrix
- // FIXME: e->render.scale should go away
- Matrix4x4_CreateFromQuakeEntity(&matrix2, ed->fields.client->origin[0], ed->fields.client->origin[1], ed->fields.client->origin[2], angles[0], angles[1], angles[2], e->render.scale);
+ Matrix4x4_CreateFromQuakeEntity(&matrix2, ed->fields.client->origin[0], ed->fields.client->origin[1], ed->fields.client->origin[2], angles[0], angles[1], angles[2], scale);
}
- // concat the matrices to make the entity relative to its tag
- Matrix4x4_Concat(&e->render.matrix, &tagmatrix, &matrix2);
- // make the other useful stuff
- Matrix4x4_Invert_Simple(&e->render.inversematrix, &e->render.matrix);
- CL_BoundingBoxForEntity(&e->render);
-
// FIXME: csqc has frame1/frame2/frame1time/frame2time/lerpfrac but this implementation's cl_entvars_t lacks those fields
e->render.frame1 = e->render.frame = ed->fields.client->frame;
e->render.frame1time = e->render.frame2time = 0;
e->render.framelerp = 0;
- R_LerpAnimation(&e->render);
+
+ // concat the matrices to make the entity relative to its tag
+ Matrix4x4_Concat(&e->render.matrix, &tagmatrix, &matrix2);
+ // make the other useful stuff
+ CL_UpdateRenderEntity(&e->render);
i = 0;
if((val = PRVM_GETEDICTFIELDVALUE(ed, csqc_fieldoff_renderflags)) && val->_float)
return true;
}
-void CSQC_ClearCSQCEntities (void)
-{
- memset(cl.csqcentities_active, 0, sizeof(cl.csqcentities_active));
- cl.num_csqcentities = 0;
-}
-
-void CL_ExpandCSQCEntities (int num);
-
qboolean CL_VM_InputEvent (qboolean pressed, int key)
{
qboolean r;
//VectorCopy(cl.viewangles, oldangles);
*prog->time = cl.time;
CSQC_SetGlobals();
- cl.num_csqcentities = 0;
+ r_refdef.numentities = 0;
PRVM_ExecuteProgram (prog->globals.client->CSQC_UpdateView, CL_F_UPDATEVIEW);
//VectorCopy(oldangles, cl.viewangles);
CSQC_END
- csqc_frame = false;
return true;
}
void CL_VM_Parse_StuffCmd (const char *msg)
{
- if(!csqc_loaded) //[515]: add more here
if(msg[0] == 'c')
if(msg[1] == 's')
if(msg[2] == 'q')
if(msg[3] == 'c')
{
- Cvar_SetQuick(&csqc_progcrc, "0");
- csqc_progcrc.flags = 0;
+ // if this is setting a csqc variable, deprotect csqc_progcrc
+ // temporarily so that it can be set by the cvar command,
+ // and then reprotect it afterwards
+ int crcflags = csqc_progcrc.flags;
+ int sizeflags = csqc_progcrc.flags;
+ csqc_progcrc.flags &= ~CVAR_READONLY;
+ csqc_progsize.flags &= ~CVAR_READONLY;
Cmd_ExecuteString (msg, src_command);
- csqc_progcrc.flags = CVAR_READONLY;
+ csqc_progcrc.flags = crcflags;
+ csqc_progsize.flags = sizeflags;
return;
}
if(!csqc_loaded || !CSQC_Parse_StuffCmd)
void CL_VM_Init (void)
{
- entity_t *ent;
+ unsigned char *csprogsdata;
+ fs_offset_t csprogsdatasize;
+ int csprogsdatacrc, requiredcrc;
+ int requiredsize;
+
+ // reset csqc_progcrc after reading it, so that changing servers doesn't
+ // expect csqc on the next server
+ requiredcrc = csqc_progcrc.integer;
+ requiredsize = csqc_progsize.integer;
+ Cvar_SetValueQuick(&csqc_progcrc, -1);
+ Cvar_SetValueQuick(&csqc_progsize, -1);
csqc_loaded = false;
memset(cl.csqc_model_precache, 0, sizeof(cl.csqc_model_precache));
memset(&cl.csqc_vidvars, true, sizeof(csqc_vidvars_t));
- if(!FS_FileExists(csqc_progname.string))
+ // if the server is not requesting a csprogs, then we're done here
+ if (requiredcrc < 0)
+ return;
+
+ // see if the requested csprogs.dat file matches the requested crc
+ csprogsdatacrc = -1;
+ csprogsdata = FS_LoadFile(va("dlcache/%s.%i.%i", csqc_progname.string, requiredsize, requiredcrc), tempmempool, true, &csprogsdatasize);
+ if (!csprogsdata)
+ csprogsdata = FS_LoadFile(csqc_progname.string, tempmempool, true, &csprogsdatasize);
+ if (csprogsdata)
{
- if(!sv.active && csqc_progcrc.integer)
+ csprogsdatacrc = CRC_Block(csprogsdata, csprogsdatasize);
+ Mem_Free(csprogsdata);
+ if (csprogsdatacrc != requiredcrc || csprogsdatasize != requiredsize)
{
- Con_Printf("CL_VM_Init: server requires CSQC, but \"%s\" wasn't found\n", csqc_progname.string);
- CL_Disconnect();
+ 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;
+ }
+ else
+ {
+ 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;
+ }
}
- return;
}
else
{
- if (developer.integer < 100)
- {
- Con_DPrintf("CL_VM_Init: CSQC is broken, and is not being loaded because developer is less than 100.\n");
- return;
- }
- if(!sv.active && !csqc_progcrc.integer) //[515]: because cheaters may use csqc while server didn't allowed it !
+ if (requiredcrc >= 0)
{
- Con_Printf("CL_VM_Init: server didn't sent CSQC crc, so CSQC is disabled\n");
- return;
+ if (cls.demoplayback)
+ Con_Printf("CL_VM_Init: demo requires CSQC, but \"%s\" wasn't found\n", csqc_progname.string);
+ else
+ Con_Printf("CL_VM_Init: server requires CSQC, but \"%s\" wasn't found\n", csqc_progname.string);
+ CL_Disconnect();
}
+ return;
}
PRVM_Begin;
PRVM_LoadProgs(csqc_progname.string, cl_numrequiredfunc, cl_required_func, 0, NULL);
- if(!sv.active && !cls.demoplayback && prog->filecrc != (unsigned short)csqc_progcrc.integer)
- {
- Con_Printf("^1Your %s is not the same version as the server (CRC is %i but should be %i)\n", prog->filecrc, csqc_progcrc.integer);
- PRVM_ResetProg();
- CL_Disconnect();
- return;
- }
-
if(prog->loaded)
- {
- Cvar_SetValueQuick(&csqc_progcrc, prog->filecrc);
- Con_Printf("CSQC ^5loaded (crc=%i)\n", csqc_progcrc.integer);
- }
+ Con_Printf("CSQC ^5loaded (crc=%i, size=%i)\n", csprogsdatacrc, (int)csprogsdatasize);
else
{
CL_VM_Error("CSQC ^2failed to load\n");
cl.csqc_vidvars.drawcrosshair = false;
cl.csqc_vidvars.drawenginesbar = false;
-
- // local state
- ent = &cl.csqcentities[0];
- // entire entity array was cleared, so just fill in a few fields
- ent->state_current.active = true;
- ent->render.model = cl.worldmodel = cl.model_precache[1];
- ent->render.scale = 1; // some of the renderer still relies on scale
- ent->render.alpha = 1;
- ent->render.flags = RENDER_SHADOW | RENDER_LIGHT;
- Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, 0, 0, 0, 0, 0, 0, 1);
- Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
- CL_BoundingBoxForEntity(&ent->render);
}
void CL_VM_ShutDown (void)
{
Cmd_ClearCsqcFuncs();
- Cvar_SetValueQuick(&csqc_progcrc, 0);
+ Cvar_SetValueQuick(&csqc_progcrc, -1);
+ Cvar_SetValueQuick(&csqc_progsize, -1);
if(!csqc_loaded)
return;
CSQC_BEGIN
projects / xonotic / darkplaces.git / blobdiff