X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=csprogs.c;h=4f47741b586ecc27cd2efac6ab5916893067718b;hb=5225f7ec9697b2a65a524956d6ee95c267d88145;hp=68dbd8394cabd71119ad0dcf2df71ed339b1efa1;hpb=b7014e4be0c6c3f4c78867c9db992e8cbccac071;p=xonotic%2Fdarkplaces.git diff --git a/csprogs.c b/csprogs.c index 68dbd839..4f47741b 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); @@ -286,7 +286,6 @@ void CSQC_Think (prvm_edict_t *ed) } 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; @@ -396,8 +395,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)) @@ -488,6 +485,8 @@ 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; @@ -566,7 +565,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 +598,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 +606,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 @@ -627,7 +626,7 @@ void CL_VM_Parse_StuffCmd (const char *msg) prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; } else - Cbuf_AddText(msg); + Cbuf_AddText(&cmd_clientfromserver, msg); CSQC_END } @@ -831,7 +830,7 @@ void CSQC_ReadEntities (void) } 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 @@ -885,7 +884,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 +1033,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 +1042,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 +1053,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 +1093,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 +1163,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)