From 102615408f5a35338753e1534ae8c6d143f40802 Mon Sep 17 00:00:00 2001 From: havoc Date: Sat, 12 Mar 2005 00:48:36 +0000 Subject: [PATCH] Willis disabled entity filtering based on skill/deathmatch in GAME_TRANSFUSION because it does the filtering in qc git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5083 d7cf8633-e32d-0410-b094-e92efae38249 --- pr_edict.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pr_edict.c b/pr_edict.c index 5e3f6a4f..0176661c 100644 --- a/pr_edict.c +++ b/pr_edict.c @@ -1167,24 +1167,26 @@ void ED_LoadFromFile (const char *data) parsed++; // remove things from different skill levels or deathmatch - if (deathmatch.integer) + if (gamemode != GAME_TRANSFUSION) //Transfusion does this in QC { - if (((int)ent->v->spawnflags & SPAWNFLAG_NOT_DEATHMATCH)) + if (deathmatch.integer) + { + if (((int)ent->v->spawnflags & SPAWNFLAG_NOT_DEATHMATCH)) + { + ED_Free (ent); + inhibited++; + continue; + } + } + else if ((current_skill <= 0 && ((int)ent->v->spawnflags & SPAWNFLAG_NOT_EASY )) + || (current_skill == 1 && ((int)ent->v->spawnflags & SPAWNFLAG_NOT_MEDIUM)) + || (current_skill >= 2 && ((int)ent->v->spawnflags & SPAWNFLAG_NOT_HARD ))) { ED_Free (ent); inhibited++; continue; } } - else if ((current_skill <= 0 && ((int)ent->v->spawnflags & SPAWNFLAG_NOT_EASY )) - || (current_skill == 1 && ((int)ent->v->spawnflags & SPAWNFLAG_NOT_MEDIUM)) - || (current_skill >= 2 && ((int)ent->v->spawnflags & SPAWNFLAG_NOT_HARD ))) - { - ED_Free (ent); - inhibited++; - continue; - } - // // immediately call spawn function // -- 2.39.2