X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=csprogs.c;h=6d83a7849d7951c27f00bc02804c3a63cb93acc2;hb=1afcf4f1345700afbfe8fa77d8b02477a744bad3;hp=6c2d1eff6b9c74d9c2dbb71f92c6c1a33ebf5aff;hpb=9d6f77621de650ffaaecb65a3485d51378632925;p=xonotic%2Fdarkplaces.git diff --git a/csprogs.c b/csprogs.c index 6c2d1eff..6d83a784 100644 --- a/csprogs.c +++ b/csprogs.c @@ -238,7 +238,7 @@ static void CSQC_SetGlobals (double frametime) VectorCopy(cl.csqc_vieworiginfromengine, cl.csqc_vieworigin); VectorCopy(cl.csqc_viewanglesfromengine, cl.csqc_viewangles); - // LordHavoc: Spike says not to do this, but without pmove_org the + // LadyHavoc: Spike says not to do this, but without pmove_org the // CSQC is useless as it can't alter the view origin without // completely replacing it Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, pmove_org); @@ -266,6 +266,8 @@ void CSQC_Predraw (prvm_edict_t *ed) return; b = PRVM_clientglobaledict(self); PRVM_clientglobaledict(self) = PRVM_EDICT_TO_PROG(ed); + // optional entity parameter for self (EXT_ENTITYPARAM) + PRVM_G_INT(OFS_PARM0) = PRVM_EDICT_TO_PROG(ed); prog->ExecuteProgram(prog, PRVM_clientedictfunction(ed, predraw), "CSQC_Predraw: NULL function\n"); PRVM_clientglobaledict(self) = b; } @@ -280,13 +282,14 @@ void CSQC_Think (prvm_edict_t *ed) PRVM_clientedictfloat(ed, nextthink) = 0; b = PRVM_clientglobaledict(self); PRVM_clientglobaledict(self) = PRVM_EDICT_TO_PROG(ed); + // optional entity parameter for self (EXT_ENTITYPARAM) + PRVM_G_INT(OFS_PARM0) = PRVM_EDICT_TO_PROG(ed); prog->ExecuteProgram(prog, PRVM_clientedictfunction(ed, think), "CSQC_Think: NULL function\n"); PRVM_clientglobaledict(self) = b; } } extern cvar_t cl_noplayershadow; -extern cvar_t r_equalize_entities_fullbright; qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum) { prvm_prog_t *prog = CLVM_prog; @@ -349,8 +352,8 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum) // LadyHavoc: use the CL_GetTagMatrix function on self to ensure consistent behavior (duplicate code would be bad) // this also sets the custommodellight_origin for us - VectorCopy(modellight_origin, entrender->custommodellight_origin); CL_GetTagMatrix(prog, &entrender->matrix, ed, 0, modellight_origin); + VectorCopy(modellight_origin, entrender->custommodellight_origin); // set up the animation data VM_GenerateFrameGroupBlend(prog, ed->priv.server->framegroupblend, ed); @@ -396,8 +399,6 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum) { if (!(entrender->effects & EF_FULLBRIGHT) && !(renderflags & RF_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)) @@ -455,6 +456,8 @@ qboolean CL_VM_InputEvent (int eventtype, float x, float y) PRVM_G_FLOAT(OFS_PARM0) = eventtype; PRVM_G_FLOAT(OFS_PARM1) = x; // key or x PRVM_G_FLOAT(OFS_PARM2) = y; // ascii or y + // optional entity parameter for self (EXT_ENTITYPARAM) + PRVM_G_INT(OFS_PARM3) = cl.csqc_server2csqcentitynumber[cl.playerentity]; prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_InputEvent), "QC function CSQC_InputEvent is missing"); r = CSQC_RETURNVAL != 0; } @@ -488,9 +491,12 @@ qboolean CL_VM_UpdateView (double frametime) r_refdef.scene.numlights = 0; // polygonbegin without draw2d arg has to guess prog->polygonbegin_guess2d = false; + // free memory for resources that are no longer referenced + PRVM_GarbageCollection(prog); // 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_G_INT(OFS_PARM2) = cl.csqc_server2csqcentitynumber[cl.playerentity]; prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_UpdateView), "QC function CSQC_UpdateView is missing"); //VectorCopy(oldangles, cl.viewangles); // Dresk : Reset Dmg Globals Here @@ -503,7 +509,9 @@ qboolean CL_VM_UpdateView (double frametime) return true; } -qboolean CL_VM_ConsoleCommand (const char *cmd) +hook_t *csqc_concmd; + +qboolean CL_VM_ConsoleCommand (hook_val_t *arg) { prvm_prog_t *prog = CLVM_prog; int restorevm_tempstringsbuf_cursize; @@ -516,7 +524,9 @@ qboolean CL_VM_ConsoleCommand (const char *cmd) PRVM_clientglobalfloat(time) = cl.time; PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity]; restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize; - PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, cmd); + PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, arg->str); + // optional entity parameter for self (EXT_ENTITYPARAM) + PRVM_G_INT(OFS_PARM1) = cl.csqc_server2csqcentitynumber[cl.playerentity]; prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_ConsoleCommand), "QC function CSQC_ConsoleCommand is missing"); prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; r = CSQC_RETURNVAL != 0; @@ -538,6 +548,8 @@ qboolean CL_VM_Parse_TempEntity (void) t = cl_message.readcount; PRVM_clientglobalfloat(time) = cl.time; PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity]; + // optional entity parameter for self (EXT_ENTITYPARAM) + PRVM_G_INT(OFS_PARM0) = cl.csqc_server2csqcentitynumber[cl.playerentity]; prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Parse_TempEntity), "QC function CSQC_Parse_TempEntity is missing"); r = CSQC_RETURNVAL != 0; if(!r) @@ -566,7 +578,7 @@ void CL_VM_Parse_StuffCmd (const char *msg) int sizeflags = csqc_progcrc.flags; csqc_progcrc.flags &= ~CVAR_READONLY; csqc_progsize.flags &= ~CVAR_READONLY; - Cmd_ExecuteString (msg, src_command, true); + Cmd_ExecuteString(&cmd_clientfromserver, msg, src_command, true); csqc_progcrc.flags = crcflags; csqc_progsize.flags = sizeflags; return; @@ -599,7 +611,7 @@ void CL_VM_Parse_StuffCmd (const char *msg) l = sizeof(buf) - 1; strlcpy(buf, p, l + 1); // strlcpy needs a + 1 as it includes the newline! - Cmd_ExecuteString(buf, src_command, true); + Cmd_ExecuteString(&cmd_clientfromserver, buf, src_command, true); p += l; if(*p == '\n') @@ -607,13 +619,13 @@ void CL_VM_Parse_StuffCmd (const char *msg) else break; // end of string or overflow } - Cmd_ExecuteString("curl --clear_autodownload", src_command, true); // don't inhibit CSQC loading + Cmd_ExecuteString(&cmd_clientfromserver, "curl --clear_autodownload", src_command, true); // don't inhibit CSQC loading return; } if(!cl.csqc_loaded) { - Cbuf_AddText(msg); + Cbuf_AddText(&cmd_clientfromserver, msg); return; } CSQC_BEGIN @@ -623,11 +635,13 @@ void CL_VM_Parse_StuffCmd (const char *msg) PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity]; restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize; PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, msg); + // optional entity parameter for self (EXT_ENTITYPARAM) + PRVM_G_INT(OFS_PARM1) = cl.csqc_server2csqcentitynumber[cl.playerentity]; prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Parse_StuffCmd), "QC function CSQC_Parse_StuffCmd is missing"); prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; } else - Cbuf_AddText(msg); + Cbuf_AddText(&cmd_clientfromserver, msg); CSQC_END } @@ -639,6 +653,8 @@ static void CL_VM_Parse_Print (const char *msg) PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity]; restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize; PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, msg); + // optional entity parameter for self (EXT_ENTITYPARAM) + PRVM_G_INT(OFS_PARM1) = cl.csqc_server2csqcentitynumber[cl.playerentity]; prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Parse_Print), "QC function CSQC_Parse_Print is missing"); prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; } @@ -693,6 +709,8 @@ void CL_VM_Parse_CenterPrint (const char *msg) PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity]; restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize; PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, msg); + // optional entity parameter for self (EXT_ENTITYPARAM) + PRVM_G_INT(OFS_PARM1) = cl.csqc_server2csqcentitynumber[cl.playerentity]; prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Parse_CenterPrint), "QC function CSQC_Parse_CenterPrint is missing"); prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; } @@ -740,6 +758,7 @@ qboolean CL_VM_Event_Sound(int sound_num, float fvolume, int channel, float atte VectorCopy(pos, PRVM_G_VECTOR(OFS_PARM5) ); PRVM_G_FLOAT(OFS_PARM6) = speed * 100.0f; PRVM_G_FLOAT(OFS_PARM7) = flags; // flags + // NOTE: entity parameter can't be used here, as there are not enough offsets available prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Event_Sound), "QC function CSQC_Event_Sound is missing"); r = CSQC_RETURNVAL != 0; } @@ -826,12 +845,14 @@ void CSQC_ReadEntities (void) { if(PRVM_clientglobaledict(self)) { + // optional entity parameter for self (EXT_ENTITYPARAM) + PRVM_G_INT(OFS_PARM0) = cl.csqc_server2csqcentitynumber[realentnum]; prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Ent_Remove), "QC function CSQC_Ent_Remove is missing"); cl.csqc_server2csqcentitynumber[realentnum] = 0; } else { - // LordHavoc: removing an entity that is already gone on + // LadyHavoc: 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 @@ -860,10 +881,14 @@ void CSQC_ReadEntities (void) PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[realentnum] = PRVM_EDICT( PRVM_G_INT( OFS_RETURN ) ); } PRVM_G_FLOAT(OFS_PARM0) = 1; + // optional entity parameter for self (EXT_ENTITYPARAM) + PRVM_G_INT(OFS_PARM1) = cl.csqc_server2csqcentitynumber[realentnum]; prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Ent_Update), "QC function CSQC_Ent_Update is missing"); } else { PRVM_G_FLOAT(OFS_PARM0) = 0; + // optional entity parameter for self (EXT_ENTITYPARAM) + PRVM_G_INT(OFS_PARM1) = cl.csqc_server2csqcentitynumber[realentnum]; prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Ent_Update), "QC function CSQC_Ent_Update is missing"); } } @@ -885,7 +910,7 @@ static void CLVM_end_increase_edicts(prvm_prog_t *prog) // link every entity except world for (i = 1, ent = prog->edicts;i < prog->num_edicts;i++, ent++) - if (!ent->priv.server->free) + if (!ent->priv.server->free && !VectorCompare(PRVM_clientedictvector(ent, absmin), PRVM_clientedictvector(ent, absmax))) CL_LinkEdict(ent); } @@ -1034,7 +1059,7 @@ void CL_VM_Init (void) { 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); + Con_Warnf("Warning: 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); // Mem_Free(csprogsdata); // return; // We WANT to continue here, and play the demo with different csprogs! @@ -1043,7 +1068,7 @@ void CL_VM_Init (void) 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); + Con_Errorf("Your %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; } @@ -1054,15 +1079,15 @@ void CL_VM_Init (void) if (requiredcrc >= 0) { if (cls.demoplayback) - Con_Printf("CL_VM_Init: demo requires CSQC, but \"%s\" wasn't found\n", csqc_progname.string); + Con_Errorf("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); + Con_Errorf("CL_VM_Init: server requires CSQC, but \"%s\" wasn't found\n", csqc_progname.string); CL_Disconnect(); } return; } - PRVM_Prog_Init(prog); + PRVM_Prog_Init(prog, &cmd_client); // allocate the mempools prog->progs_mempool = Mem_AllocPool(csqc_progname.string, 0, NULL); @@ -1094,7 +1119,7 @@ void CL_VM_Init (void) if (!prog->loaded) { - Host_Error("CSQC %s ^2failed to load\n", csprogsfn); + Host_Error("CSQC %s failed to load\n", csprogsfn); if(!sv.active) CL_Disconnect(); Mem_Free(csprogsdata); @@ -1164,7 +1189,7 @@ void CL_VM_Init (void) void CL_VM_ShutDown (void) { prvm_prog_t *prog = CLVM_prog; - Cmd_ClearCsqcFuncs(); + Cmd_ClearCSQCCommands(&cmd_client); //Cvar_SetValueQuick(&csqc_progcrc, -1); //Cvar_SetValueQuick(&csqc_progsize, -1); if(!cl.csqc_loaded) @@ -1234,6 +1259,8 @@ qboolean CL_VM_TransformView(int entnum, matrix4x4_t *viewmatrix, mplane_t *clip PRVM_clientglobaledict(self) = entnum; VectorCopy(origin, PRVM_G_VECTOR(OFS_PARM0)); VectorCopy(ang, PRVM_G_VECTOR(OFS_PARM1)); + // optional entity parameter for self (EXT_ENTITYPARAM) + PRVM_G_INT(OFS_PARM2) = entnum; VectorCopy(forward, PRVM_clientglobalvector(v_forward)); VectorScale(left, -1, PRVM_clientglobalvector(v_right)); VectorCopy(up, PRVM_clientglobalvector(v_up));