X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=csprogs.c;h=7bc6cee08e51bb8231b2511ed8e2688aea6064f4;hb=6d7ce4397972f050c17b11de2f75209bdd562b80;hp=3c90ff138281745fadcf5159c756eb3c42b967ee;hpb=6ad27355dfe4f50916169dc29bf06bcd4add0558;p=xonotic%2Fdarkplaces.git diff --git a/csprogs.c b/csprogs.c index 3c90ff13..7bc6cee0 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" @@ -555,53 +575,14 @@ 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; } - if(cls.demoplayback) - if(!strncmp(msg, "curl --clear_autodownload\ncurl --pak --forthismap --as ", 55)) - { - // special handling for map download commands - // run these commands IMMEDIATELY, instead of waiting for a client frame - // that way, there is no black screen when playing back demos - // I know this is a really ugly hack, but I can't think of any better way - // FIXME find the actual CAUSE of this, and make demo playback WAIT - // until all maps are loaded, then remove this hack - - char buf[MAX_INPUTLINE]; - const char *p, *q; - size_t l; - - p = msg; - - for(;;) - { - q = strchr(p, '\n'); - if(q) - l = q - p; - else - l = strlen(p); - if(l > sizeof(buf) - 1) - 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); - - p += l; - if(*p == '\n') - ++p; // skip the newline and continue - else - break; // end of string or overflow - } - Cmd_ExecuteString(cmd_client, "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 @@ -615,7 +596,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 } @@ -863,7 +844,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) CL_LinkEdict(ent); } @@ -886,8 +867,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) @@ -899,7 +882,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)) @@ -1021,8 +1004,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; } } @@ -1030,17 +1012,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); @@ -1072,11 +1048,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) @@ -1140,7 +1113,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) @@ -1171,7 +1144,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);