int c;
float scale;
prvm_eval_t *val;
- entity_t *e;
- model_t *model;
+ entity_render_t *entrender;
+ dp_model_t *model;
matrix4x4_t tagmatrix, matrix2;
model = CL_GetModelFromEdict(ed);
if (!model)
return false;
- e = CL_NewTempEntity();
- if (!e)
+ entrender = CL_NewTempEntity();
+ if (!entrender)
return false;
- e->render.model = model;
- e->render.skinnum = (int)ed->fields.client->skin;
- e->render.effects |= e->render.model->effects;
+ entrender->model = model;
+ entrender->skinnum = (int)ed->fields.client->skin;
+ entrender->effects |= entrender->model->effects;
scale = 1;
renderflags = 0;
if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.renderflags)) && val->_float) renderflags = (int)val->_float;
- if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.alpha)) && val->_float) e->render.alpha = val->_float;
- if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.scale)) && val->_float) e->render.scale = scale = val->_float;
- if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.colormod)) && VectorLength2(val->vector)) VectorCopy(val->vector, e->render.colormod);
- if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.effects)) && val->_float) e->render.effects |= (int)val->_float;
+ 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.effects)) && val->_float) entrender->effects |= (int)val->_float;
if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.tag_entity)) && val->edict)
{
int tagentity;
vec3_t angles;
VectorCopy(ed->fields.client->angles, angles);
// if model is alias, reverse pitch direction
- if (e->render.model->type == mod_alias)
+ if (entrender->model->type == mod_alias)
angles[0] = -angles[0];
// set up the render matrix
// 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
- e->render.frame1 = e->render.frame2 = ed->fields.client->frame;
- if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2))) e->render.frame2 = val->_float;
- if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame1time))) e->render.frame2time = val->_float;
- if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2time))) e->render.frame1time = val->_float;
- if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.lerpfrac))) e->render.framelerp = val->_float;
+ 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;
// concat the matrices to make the entity relative to its tag
- Matrix4x4_Concat(&e->render.matrix, &tagmatrix, &matrix2);
+ Matrix4x4_Concat(&entrender->matrix, &tagmatrix, &matrix2);
if(renderflags)
{
- if(renderflags & RF_VIEWMODEL) e->render.flags |= RENDER_VIEWMODEL;
- if(renderflags & RF_EXTERNALMODEL)e->render.flags |= RENDER_EXTERIORMODEL;
- if(renderflags & RF_DEPTHHACK) e->render.effects |= EF_NODEPTHTEST;
- if(renderflags & RF_ADDITIVE) e->render.effects |= EF_ADDITIVE;
+ if(renderflags & RF_VIEWMODEL) entrender->flags |= RENDER_VIEWMODEL;
+ if(renderflags & RF_EXTERNALMODEL)entrender->flags |= RENDER_EXTERIORMODEL;
+ if(renderflags & RF_DEPTHHACK) entrender->effects |= EF_NODEPTHTEST;
+ if(renderflags & RF_ADDITIVE) entrender->effects |= EF_ADDITIVE;
}
c = (int)ed->fields.client->colormap;
if (c <= 0)
- CL_SetEntityColormapColors(&e->render, -1);
+ CL_SetEntityColormapColors(entrender, -1);
else if (c <= cl.maxclients && cl.scores != NULL)
- CL_SetEntityColormapColors(&e->render, cl.scores[c-1].colors);
+ CL_SetEntityColormapColors(entrender, cl.scores[c-1].colors);
else
- CL_SetEntityColormapColors(&e->render, c);
+ CL_SetEntityColormapColors(entrender, c);
// either fullbright or lit
- if (!(e->render.effects & EF_FULLBRIGHT) && !r_fullbright.integer)
- e->render.flags |= RENDER_LIGHT;
+ if (!(entrender->effects & EF_FULLBRIGHT) && !r_fullbright.integer)
+ entrender->flags |= RENDER_LIGHT;
// hide player shadow during intermission or nehahra movie
- if (!(e->render.effects & (EF_NOSHADOW | EF_ADDITIVE | EF_NODEPTHTEST))
- && (e->render.alpha >= 1)
- && !(e->render.flags & RENDER_VIEWMODEL)
- && (!(e->render.flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cls.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer)))
- e->render.flags |= RENDER_SHADOW;
- if (e->render.flags & RENDER_VIEWMODEL)
- e->render.flags |= RENDER_NOSELFSHADOW;
+ if (!(entrender->effects & (EF_NOSHADOW | EF_ADDITIVE | EF_NODEPTHTEST))
+ && (entrender->alpha >= 1)
+ && !(entrender->flags & RENDER_VIEWMODEL)
+ && (!(entrender->flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cls.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer)))
+ entrender->flags |= RENDER_SHADOW;
+ if (entrender->flags & RENDER_VIEWMODEL)
+ entrender->flags |= RENDER_NOSELFSHADOW;
// make the other useful stuff
- CL_UpdateRenderEntity(&e->render);
+ CL_UpdateRenderEntity(entrender);
return true;
}
qboolean CL_VM_InputEvent (qboolean down, int key, int ascii)
{
qboolean r;
- prvm_eval_t* val;
+
if(!cl.csqc_loaded)
return false;
+
CSQC_BEGIN
if (!prog->funcoffsets.CSQC_InputEvent)
r = false;
else
{
prog->globals.client->time = cl.time;
+ prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity];
PRVM_G_FLOAT(OFS_PARM0) = !down; // 0 is down, 1 is up
PRVM_G_FLOAT(OFS_PARM1) = key;
- if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.input_ascii)))
- val->_float = ascii;
+ PRVM_G_FLOAT(OFS_PARM2) = ascii;
PRVM_ExecuteProgram(prog->funcoffsets.CSQC_InputEvent, "QC function CSQC_InputEvent is missing");
r = CSQC_RETURNVAL;
}
CSQC_BEGIN
//VectorCopy(cl.viewangles, oldangles);
prog->globals.client->time = cl.time;
+ prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity];
CSQC_SetGlobals();
// clear renderable entity and light lists to prevent crashes if the
// CSQC_UpdateView function does not call R_ClearScene as it should
- r_refdef.numentities = 0;
- r_refdef.numlights = 0;
+ r_refdef.scene.numentities = 0;
+ r_refdef.scene.numlights = 0;
PRVM_ExecuteProgram(prog->funcoffsets.CSQC_UpdateView, "QC function CSQC_UpdateView is missing");
//VectorCopy(oldangles, cl.viewangles);
// Dresk : Reset Dmg Globals Here
if (prog->funcoffsets.CSQC_ConsoleCommand)
{
prog->globals.client->time = cl.time;
+ prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity];
restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(cmd);
PRVM_ExecuteProgram(prog->funcoffsets.CSQC_ConsoleCommand, "QC function CSQC_ConsoleCommand is missing");
{
t = msg_readcount;
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;
if(!r)
if(prog->funcoffsets.CSQC_Parse_StuffCmd)
{
prog->globals.client->time = cl.time;
+ prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity];
restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(msg);
PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Parse_StuffCmd, "QC function CSQC_Parse_StuffCmd is missing");
{
int restorevm_tempstringsbuf_cursize;
prog->globals.client->time = cl.time;
+ prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity];
restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(msg);
PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Parse_Print, "QC function CSQC_Parse_Print is missing");
int restorevm_tempstringsbuf_cursize;
if(!cl.csqc_loaded)
{
- SCR_CenterPrint((char*)msg);
+ SCR_CenterPrint(msg);
return;
}
CSQC_BEGIN
if(prog->funcoffsets.CSQC_Parse_CenterPrint)
{
prog->globals.client->time = cl.time;
+ prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity];
restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(msg);
PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Parse_CenterPrint, "QC function CSQC_Parse_CenterPrint is missing");
vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
}
else
- SCR_CenterPrint((char*)msg);
+ SCR_CenterPrint(msg);
CSQC_END
}
if(prog->funcoffsets.CSQC_Event_Sound)
{
prog->globals.client->time = cl.time;
+ prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity];
PRVM_G_FLOAT(OFS_PARM0) = ent;
PRVM_G_FLOAT(OFS_PARM1) = channel;
PRVM_G_INT(OFS_PARM2) = PRVM_SetTempString(cl.sound_name[sound_num] );
if(prog->funcoffsets.CSQC_Event)
{
prog->globals.client->time = cl.time;
+ prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity];
PRVM_G_FLOAT(OFS_PARM0) = event;
PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Event, "QC function CSQC_Event is missing");
r = CSQC_RETURNVAL;
cl.csqc_server2csqcentitynumber[realentnum] = 0;
}
else
- Con_Printf("Smth bad happens in csqc...\n"); //[515]: never happens ?
+ Con_Printf("Bad csqc_server2csqcentitynumber map\n"); //[515]: never happens ?
}
else
{
if(!prog->globals.client->self)
{
- prvm_edict_t *ed;
- ed = PRVM_ED_Alloc();
- ed->fields.client->entnum = realentnum;
- prog->globals.client->self = cl.csqc_server2csqcentitynumber[realentnum] = PRVM_EDICT_TO_PROG(ed);
+ if(!prog->funcoffsets.CSQC_Ent_Spawn)
+ {
+ prvm_edict_t *ed;
+ ed = PRVM_ED_Alloc();
+ ed->fields.client->entnum = realentnum;
+ prog->globals.client->self = cl.csqc_server2csqcentitynumber[realentnum] = PRVM_EDICT_TO_PROG(ed);
+ }
+ else
+ {
+ // entity( float entnum ) CSQC_Ent_Spawn;
+ // the qc function should set entnum, too (this way it also can return world [2/1/2008 Andreas]
+ PRVM_G_FLOAT(OFS_PARM0) = (float) realentnum;
+ // make sure no one gets wrong ideas
+ prog->globals.client->self = 0;
+ PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Ent_Spawn, "QC function CSQC_Ent_Spawn is missing");
+ prog->globals.client->self = cl.csqc_server2csqcentitynumber[realentnum] = PRVM_EDICT( PRVM_G_INT( OFS_RETURN ) );
+ }
PRVM_G_FLOAT(OFS_PARM0) = 1;
+ PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Ent_Update, "QC function CSQC_Ent_Update is missing");
}
- else
+ else {
PRVM_G_FLOAT(OFS_PARM0) = 0;
- PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Ent_Update, "QC function CSQC_Ent_Update is missing");
+ PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Ent_Update, "QC function CSQC_Ent_Update is missing");
+ }
}
}
prog->globals.client->self = oldself;
void CL_VM_CB_BeginIncreaseEdicts(void)
{
- int i;
- prvm_edict_t *ent;
-
// links don't survive the transition, so unlink everything
- for (i = 0, ent = prog->edicts;i < prog->max_edicts;i++, ent++)
- {
- if (!ent->priv.server->free)
- World_UnlinkEdict(prog->edicts + i);
- memset(&ent->priv.server->areagrid, 0, sizeof(ent->priv.server->areagrid));
- }
- World_Clear(&cl.world);
+ World_UnlinkAll(&cl.world);
}
void CL_VM_CB_EndIncreaseEdicts(void)
// set time
prog->globals.client->time = cl.time;
+ prog->globals.client->self = 0;
- prog->globals.client->mapname = PRVM_SetEngineString(cl.worldmodel->name);
+ prog->globals.client->mapname = cl.worldmodel ? PRVM_SetEngineString(cl.worldmodel->name) : PRVM_SetEngineString("");
prog->globals.client->player_localentnum = cl.playerentity;
// set map description (use world entity 0)
val = PRVM_EDICTFIELDVALUE(prog->edicts, prog->fieldoffsets.message);
if(val)
val->string = PRVM_SetEngineString(cl.levelname);
+ VectorCopy(cl.world.mins, prog->edicts->fields.client->mins);
+ VectorCopy(cl.world.maxs, prog->edicts->fields.client->maxs);
// call the prog init
PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Init, "QC function CSQC_Init is missing");
return;
CSQC_BEGIN
prog->globals.client->time = cl.time;
+ prog->globals.client->self = 0;
if (prog->funcoffsets.CSQC_Shutdown)
PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Shutdown, "QC function CSQC_Shutdown is missing");
PRVM_ResetProg();
projects / xonotic / darkplaces.git / blobdiff