X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=csprogs.c;h=94e3b9d0aa6e6ad9feb641184925ade922222ea5;hb=60b66168f294813392ec91c4943f181a0e77520a;hp=fb37cba069df80f097eca368b59ecbab582eb7cd;hpb=46acef5491629d06eddb8e78ed01e50b175d2bd8;p=xonotic%2Fdarkplaces.git diff --git a/csprogs.c b/csprogs.c index fb37cba0..94e3b9d0 100644 --- a/csprogs.c +++ b/csprogs.c @@ -20,10 +20,10 @@ void CL_VM_PreventInformationLeaks(void) prvm_prog_t *prog = CLVM_prog; if(!cl.csqc_loaded) return; - CSQC_BEGIN - VM_ClearTraceGlobals(prog); - PRVM_clientglobalfloat(trace_networkentity) = 0; - CSQC_END +CSQC_BEGIN + VM_ClearTraceGlobals(prog); + PRVM_clientglobalfloat(trace_networkentity) = 0; +CSQC_END } //[515]: these are required funcs @@ -227,7 +227,7 @@ static void CSQC_SetGlobals (double frametime) prvm_prog_t *prog = CLVM_prog; CSQC_BEGIN PRVM_clientglobalfloat(time) = cl.time; - PRVM_clientglobalfloat(cltime) = realtime; // Spike named it that way. + PRVM_clientglobalfloat(cltime) = host.realtime; // Spike named it that way. PRVM_clientglobalfloat(frametime) = frametime; PRVM_clientglobalfloat(servercommandframe) = cls.servermovesequence; PRVM_clientglobalfloat(clientcommandframe) = cl.movecmd[0].sequence; @@ -286,14 +286,14 @@ void CSQC_Think (prvm_edict_t *ed) } extern cvar_t cl_noplayershadow; -qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum) +qbool CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum) { prvm_prog_t *prog = CLVM_prog; int renderflags; int c; float scale; entity_render_t *entrender; - dp_model_t *model; + model_t *model; prvm_vec3_t modellight_origin; model = CL_GetModelFromEdict(ed); @@ -434,34 +434,34 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum) // 1 = keyup, key, character (EXT_CSQC) // 2 = mousemove relative, x, y (EXT_CSQC) // 3 = mousemove absolute, x, y (DP_CSQC) -qboolean CL_VM_InputEvent (int eventtype, float x, float y) +qbool CL_VM_InputEvent (int eventtype, float x, float y) { prvm_prog_t *prog = CLVM_prog; - qboolean r; + qbool r; if(!cl.csqc_loaded) return false; - CSQC_BEGIN - if (!PRVM_clientfunction(CSQC_InputEvent)) - r = false; - else - { - PRVM_clientglobalfloat(time) = cl.time; - PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity]; - PRVM_G_FLOAT(OFS_PARM0) = eventtype; - PRVM_G_FLOAT(OFS_PARM1) = x; // key or x - PRVM_G_FLOAT(OFS_PARM2) = y; // ascii or y - prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_InputEvent), "QC function CSQC_InputEvent is missing"); - r = CSQC_RETURNVAL != 0; - } - CSQC_END +CSQC_BEGIN + if (!PRVM_clientfunction(CSQC_InputEvent)) + r = false; + else + { + PRVM_clientglobalfloat(time) = cl.time; + PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity]; + PRVM_G_FLOAT(OFS_PARM0) = eventtype; + PRVM_G_FLOAT(OFS_PARM1) = x; // key or x + PRVM_G_FLOAT(OFS_PARM2) = y; // ascii or y + prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_InputEvent), "QC function CSQC_InputEvent is missing"); + r = CSQC_RETURNVAL != 0; + } +CSQC_END return r; } extern r_refdef_view_t csqc_original_r_refdef_view; extern r_refdef_view_t csqc_main_r_refdef_view; -qboolean CL_VM_UpdateView (double frametime) +qbool CL_VM_UpdateView (double frametime) { prvm_prog_t *prog = CLVM_prog; vec3_t emptyvector; @@ -502,11 +502,11 @@ qboolean CL_VM_UpdateView (double frametime) return true; } -qboolean CL_VM_ConsoleCommand (const char *cmd) +qbool CL_VM_ConsoleCommand (const char *text) { prvm_prog_t *prog = CLVM_prog; int restorevm_tempstringsbuf_cursize; - qboolean r = false; + qbool r = false; if(!cl.csqc_loaded) return false; CSQC_BEGIN @@ -515,7 +515,7 @@ 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, text); prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_ConsoleCommand), "QC function CSQC_ConsoleCommand is missing"); prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; r = CSQC_RETURNVAL != 0; @@ -524,11 +524,11 @@ qboolean CL_VM_ConsoleCommand (const char *cmd) return r; } -qboolean CL_VM_Parse_TempEntity (void) +qbool CL_VM_Parse_TempEntity (void) { prvm_prog_t *prog = CLVM_prog; int t; - qboolean r = false; + qbool r = false; if(!cl.csqc_loaded) return false; CSQC_BEGIN @@ -562,12 +562,10 @@ void CL_VM_Parse_StuffCmd (const char *msg) // 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(&cmd_clientfromserver, msg, src_command, true); - csqc_progcrc.flags = crcflags; - csqc_progsize.flags = sizeflags; + csqc_progcrc.flags &= ~CF_READONLY; + csqc_progsize.flags &= ~CF_READONLY; + Cmd_ExecuteString(&cmd_client, msg, src_local, true); + csqc_progcrc.flags = csqc_progsize.flags = crcflags; return; } @@ -598,7 +596,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(&cmd_clientfromserver, buf, src_command, true); + Cmd_ExecuteString(&cmd_client, buf, src_local, true); p += l; if(*p == '\n') @@ -606,13 +604,13 @@ void CL_VM_Parse_StuffCmd (const char *msg) else break; // end of string or overflow } - Cmd_ExecuteString(&cmd_clientfromserver, "curl --clear_autodownload", src_command, true); // don't inhibit CSQC loading + Cmd_ExecuteString(&cmd_client, "curl --clear_autodownload", src_local, true); // don't inhibit CSQC loading return; } if(!cl.csqc_loaded) { - Cbuf_AddText(&cmd_clientfromserver, msg); + Cbuf_AddText(&cmd_client, msg); return; } CSQC_BEGIN @@ -626,7 +624,7 @@ void CL_VM_Parse_StuffCmd (const char *msg) prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; } else - Cbuf_AddText(&cmd_clientfromserver, msg); + Cbuf_AddText(&cmd_client, msg); CSQC_END } @@ -646,13 +644,8 @@ void CSQC_AddPrintText (const char *msg) { prvm_prog_t *prog = CLVM_prog; size_t i; - if(!cl.csqc_loaded) - { - Con_Print(msg); - return; - } CSQC_BEGIN - if(PRVM_clientfunction(CSQC_Parse_Print)) + if(cl.csqc_loaded && PRVM_clientfunction(CSQC_Parse_Print)) { // FIXME: is this bugged? i = strlen(msg)-1; @@ -680,13 +673,8 @@ void CL_VM_Parse_CenterPrint (const char *msg) { prvm_prog_t *prog = CLVM_prog; int restorevm_tempstringsbuf_cursize; - if(!cl.csqc_loaded) - { - SCR_CenterPrint(msg); - return; - } CSQC_BEGIN - if(PRVM_clientfunction(CSQC_Parse_CenterPrint)) + if(cl.csqc_loaded && PRVM_clientfunction(CSQC_Parse_CenterPrint)) { PRVM_clientglobalfloat(time) = cl.time; PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity]; @@ -720,10 +708,10 @@ void CL_VM_UpdateShowingScoresState (int showingscores) CSQC_END } } -qboolean CL_VM_Event_Sound(int sound_num, float fvolume, int channel, float attenuation, int ent, vec3_t pos, int flags, float speed) +qbool CL_VM_Event_Sound(int sound_num, float fvolume, int channel, float attenuation, int ent, vec3_t pos, int flags, float speed) { prvm_prog_t *prog = CLVM_prog; - qboolean r = false; + qbool r = false; if(cl.csqc_loaded) { CSQC_BEGIN @@ -884,7 +872,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); } @@ -935,14 +923,14 @@ static void CLVM_count_edicts(prvm_prog_t *prog) Con_Printf("touch :%3i\n", solid); } -static qboolean CLVM_load_edict(prvm_prog_t *prog, prvm_edict_t *ent) +static qbool CLVM_load_edict(prvm_prog_t *prog, prvm_edict_t *ent) { return true; } // 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, size_t len, int crc, int cnt, sizebuf_t *buf, int protocol) +qbool MakeDownloadPacket(const char *filename, unsigned char *data, size_t len, int crc, int cnt, sizebuf_t *buf, int protocol) { int packetsize = buf->maxsize - 7; // byte short long int npackets = ((int)len + packetsize - 1) / (packetsize); @@ -1017,7 +1005,7 @@ void CL_VM_Init (void) } else { - Con_DPrintf("Not using buffered \"%s\" (buffered: %p, %d)\n", csprogsfn, cls.caughtcsprogsdata, (int) cls.caughtcsprogsdatasize); + Con_DPrintf("Not using buffered \"%s\" (buffered: %p, %d)\n", csprogsfn, (void *)cls.caughtcsprogsdata, (int) cls.caughtcsprogsdatasize); csprogsdata = FS_LoadFile(csprogsfn, tempmempool, true, &csprogsdatasize); } } @@ -1033,7 +1021,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_Printf(CON_WARN "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! @@ -1042,7 +1030,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_Printf(CON_ERROR "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; } @@ -1053,9 +1041,9 @@ 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_Printf(CON_ERROR "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_Printf(CON_ERROR "CL_VM_Init: server requires CSQC, but \"%s\" wasn't found\n", csqc_progname.string); CL_Disconnect(); } return; @@ -1093,15 +1081,13 @@ 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); return; } - 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) @@ -1149,7 +1135,7 @@ void CL_VM_Init (void) prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Init), "QC function CSQC_Init is missing"); // Once CSQC_Init was called, we consider csqc code fully initialized. - prog->inittime = realtime; + prog->inittime = host.realtime; cl.csqc_loaded = true; @@ -1168,27 +1154,27 @@ void CL_VM_ShutDown (void) //Cvar_SetValueQuick(&csqc_progsize, -1); if(!cl.csqc_loaded) return; - CSQC_BEGIN - if (prog->loaded) - { - PRVM_clientglobalfloat(time) = cl.time; - PRVM_clientglobaledict(self) = 0; - if (PRVM_clientfunction(CSQC_Shutdown)) - prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Shutdown), "QC function CSQC_Shutdown is missing"); - } - PRVM_Prog_Reset(prog); - CSQC_END +CSQC_BEGIN + if (prog->loaded) + { + PRVM_clientglobalfloat(time) = cl.time; + PRVM_clientglobaledict(self) = 0; + if (PRVM_clientfunction(CSQC_Shutdown)) + prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Shutdown), "QC function CSQC_Shutdown is missing"); + } + PRVM_Prog_Reset(prog); +CSQC_END Con_DPrint("CSQC ^1unloaded\n"); cl.csqc_loaded = false; } -qboolean CL_VM_GetEntitySoundOrigin(int entnum, vec3_t out) +qbool CL_VM_GetEntitySoundOrigin(int entnum, vec3_t out) { prvm_prog_t *prog = CLVM_prog; prvm_edict_t *ed; - dp_model_t *mod; + model_t *mod; matrix4x4_t matrix; - qboolean r = 0; + qbool r = 0; CSQC_BEGIN; @@ -1210,10 +1196,10 @@ qboolean CL_VM_GetEntitySoundOrigin(int entnum, vec3_t out) return r; } -qboolean CL_VM_TransformView(int entnum, matrix4x4_t *viewmatrix, mplane_t *clipplane, vec3_t visorigin) +qbool CL_VM_TransformView(int entnum, matrix4x4_t *viewmatrix, mplane_t *clipplane, vec3_t visorigin) { prvm_prog_t *prog = CLVM_prog; - qboolean ret = false; + qbool ret = false; prvm_edict_t *ed; vec3_t forward, left, up, origin, ang; matrix4x4_t mat, matq;