X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=prvm_edict.c;h=3c50397e70a4e324c5d4811758f4500418d6fdfe;hp=5efd5ed6eba0152ef48af9c7aa2a4083c4e92751;hb=8d2492ac4364e1a51e7f84c6ea1c34429f060939;hpb=f13419f00e3f8335e9a25498560a433597f28f50 diff --git a/prvm_edict.c b/prvm_edict.c index 5efd5ed6..3c50397e 100644 --- a/prvm_edict.c +++ b/prvm_edict.c @@ -1536,6 +1536,8 @@ void PRVM_ED_LoadFromFile (prvm_prog_t *prog, const char *data) continue; } + SV_LinkEdict(ent); + if(!PRVM_ED_CallSpawnFunction(prog, ent, data, start)) continue; @@ -2057,8 +2059,8 @@ void PRVM_Prog_Load(prvm_prog_t *prog, const char * filename, unsigned char * da dprograms_v7_t *v7 = (dprograms_v7_t*)dprograms; structtype = LittleLong(v7->secondaryversion); if (structtype == PROG_SECONDARYVERSION16 || - structtype == PROG_SECONDARYVERSION32) - ;//supported + structtype == PROG_SECONDARYVERSION32) // barely supported + Con_Printf(CON_WARN "WARNING: %s: %s targets FTEQW, for which support is incomplete. Proceed at your own risk.\n", prog->name, filename); else prog->error_cmd("%s: %s targets unknown engine", prog->name, filename); @@ -2458,7 +2460,7 @@ void PRVM_Prog_Load(prvm_prog_t *prog, const char * filename, unsigned char * da if ( a >= prog->progs_numglobals) prog->error_cmd("PRVM_LoadProgs: out of bounds global index (statement %d) in %s", i, prog->name); if (b || c) //Spike -- added this check just as a diagnostic... - Con_DPrintf("PRVM_LoadProgs: unxpected offset on call opcode in %s. Hexen2 format is not supported\n", prog->name); + Con_DPrintf("PRVM_LoadProgs: unexpected offset on call opcode in %s. Hexen2 format is not supported\n", prog->name); prog->statements[i].op = op; prog->statements[i].operand[0] = remapglobal(a); prog->statements[i].operand[1] = -1;