Willis disabled entity filtering based on skill/deathmatch in GAME_TRANSFUSION becaus...
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sat, 12 Mar 2005 00:48:36 +0000 (00:48 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sat, 12 Mar 2005 00:48:36 +0000 (00:48 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5083 d7cf8633-e32d-0410-b094-e92efae38249

pr_edict.c

index 5e3f6a4..0176661 100644 (file)
@@ -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
 //