X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=csprogs.c;h=4bacb5632e8a595d00d98ed5962766a128b7a67a;hp=80666f5edaaf06eb652cdd2a01021694a92d0316;hb=2f5dfa4708db4112f682b31146a8db1d456a0482;hpb=abfdafcf23981b3de44fcb031d462a568368111f diff --git a/csprogs.c b/csprogs.c index 80666f5e..4bacb563 100644 --- a/csprogs.c +++ b/csprogs.c @@ -1,3 +1,23 @@ +/* +Copyright (C) 2006-2021 DarkPlaces contributors + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +*/ + #include "quakedef.h" #include "progsvm.h" #include "clprogdefs.h" @@ -512,23 +532,7 @@ qbool CL_VM_UpdateView (double frametime) qbool CL_VM_ConsoleCommand (const char *text) { prvm_prog_t *prog = CLVM_prog; - int restorevm_tempstringsbuf_cursize; - qbool r = false; - if(!cl.csqc_loaded) - return false; - CSQC_BEGIN - if (PRVM_clientfunction(CSQC_ConsoleCommand)) - { - 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, text); - prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_ConsoleCommand), "QC function CSQC_ConsoleCommand is missing"); - prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; - r = CSQC_RETURNVAL != 0; - } - CSQC_END - return r; + return PRVM_ConsoleCommand(prog, text, &prog->funcoffsets.CSQC_ConsoleCommand, false, cl.csqc_server2csqcentitynumber[cl.playerentity], cl.time, cl.csqc_loaded, "QC function CSQC_ConsoleCommand is missing"); } qbool CL_VM_Parse_TempEntity (void) @@ -571,7 +575,7 @@ void CL_VM_Parse_StuffCmd (const char *msg) int crcflags = csqc_progcrc.flags; csqc_progcrc.flags &= ~CF_READONLY; csqc_progsize.flags &= ~CF_READONLY; - Cmd_ExecuteString(cmd_client, msg, src_local, true); + Cmd_ExecuteString(cmd_local, msg, src_local, true); csqc_progcrc.flags = csqc_progsize.flags = crcflags; return; } @@ -603,7 +607,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_client, buf, src_local, true); + Cmd_ExecuteString(cmd_local, buf, src_local, true); p += l; if(*p == '\n') @@ -611,13 +615,13 @@ void CL_VM_Parse_StuffCmd (const char *msg) else break; // end of string or overflow } - Cmd_ExecuteString(cmd_client, "curl --clear_autodownload", src_local, true); // don't inhibit CSQC loading + Cmd_ExecuteString(cmd_local, "curl --clear_autodownload", src_local, true); // don't inhibit CSQC loading return; } if(!cl.csqc_loaded) { - Cbuf_AddText(cmd_client, msg); + Cbuf_AddText(cmd_local, msg); return; } CSQC_BEGIN @@ -631,7 +635,7 @@ void CL_VM_Parse_StuffCmd (const char *msg) prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; } else - Cbuf_AddText(cmd_client, msg); + Cbuf_AddText(cmd_local, msg); CSQC_END } @@ -879,7 +883,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 && !VectorCompare(PRVM_clientedictvector(ent, absmin), PRVM_clientedictvector(ent, absmax))) + if (!ent->free && !VectorCompare(PRVM_clientedictvector(ent, absmin), PRVM_clientedictvector(ent, absmax))) CL_LinkEdict(ent); } @@ -902,8 +906,10 @@ static void CLVM_free_edict(prvm_prog_t *prog, prvm_edict_t *ed) World_UnlinkEdict(ed); memset(ed->fields.fp, 0, prog->entityfields * sizeof(prvm_vec_t)); VM_RemoveEdictSkeleton(prog, ed); +#ifdef USEODE World_Physics_RemoveFromEntity(&cl.world, ed); World_Physics_RemoveJointFromEntity(&cl.world, ed); +#endif } static void CLVM_count_edicts(prvm_prog_t *prog) @@ -915,7 +921,7 @@ static void CLVM_count_edicts(prvm_prog_t *prog) for (i=0 ; inum_edicts ; i++) { ent = PRVM_EDICT_NUM(i); - if (ent->priv.server->free) + if (ent->free) continue; active++; if (PRVM_clientedictfloat(ent, solid)) @@ -1037,8 +1043,7 @@ void CL_VM_Init (void) else { Mem_Free(csprogsdata); - 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(); + CL_DisconnectEx(false, "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); return; } } @@ -1046,17 +1051,11 @@ void CL_VM_Init (void) else { if (requiredcrc >= 0) - { - if (cls.demoplayback) - Con_Printf(CON_ERROR "CL_VM_Init: demo requires CSQC, but \"%s\" wasn't found\n", csqc_progname.string); - else - Con_Printf(CON_ERROR "CL_VM_Init: server requires CSQC, but \"%s\" wasn't found\n", csqc_progname.string); - CL_Disconnect(); - } + CL_DisconnectEx(false, CON_ERROR "CL_VM_Init: %s requires CSQC, but \"%s\" wasn't found\n", cls.demoplayback ? "demo" : "server", csqc_progname.string); return; } - PRVM_Prog_Init(prog, cmd_client); + PRVM_Prog_Init(prog, cmd_local); // allocate the mempools prog->progs_mempool = Mem_AllocPool(csqc_progname.string, 0, NULL); @@ -1088,11 +1087,8 @@ void CL_VM_Init (void) if (!prog->loaded) { - Host_Error("CSQC %s failed to load\n", csprogsfn); - if(!sv.active) - CL_Disconnect(); Mem_Free(csprogsdata); - return; + Host_Error("CSQC %s failed to load\n", csprogsfn); } if(cls.demorecording) @@ -1156,7 +1152,7 @@ void CL_VM_Init (void) void CL_VM_ShutDown (void) { prvm_prog_t *prog = CLVM_prog; - Cmd_ClearCSQCCommands(cmd_client); + Cmd_ClearCSQCCommands(cmd_local); //Cvar_SetValueQuick(&csqc_progcrc, -1); //Cvar_SetValueQuick(&csqc_progsize, -1); if(!cl.csqc_loaded) @@ -1187,7 +1183,7 @@ qbool CL_VM_GetEntitySoundOrigin(int entnum, vec3_t out) ed = PRVM_EDICT_NUM(entnum - MAX_EDICTS); - if(!ed->priv.required->free) + if(!ed->free) { mod = CL_GetModelFromEdict(ed); VectorCopy(PRVM_clientedictvector(ed, origin), out);