insta-death sector type 4096

monsters and players gibs
jmtd · Jul 17, 2017 · e81c447 · e81c447
1 parent c7c4b2e
commit e81c447
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/prboom2/src/p_map.c b/prboom2/src/p_map.c
@@ -835,6 +835,22 @@ dboolean P_CheckPosition (mobj_t* thing,fixed_t x,fixed_t y)
 }
 
 
+static void CheckForInstaDeath(mobj_t* thing)
+{
+  struct msecnode_s* ms;
+  sector_t *s;
+
+  for(ms = thing->touching_sectorlist; ms; ms = ms->m_tnext)
+  {
+    s = ms->m_sector;
+    if(s->special == 4096 && s->floorheight >= thing->floorz)
+    {
+      P_DamageMobj(thing, NULL, NULL, 4*thing->health); // gib
+      return;
+    }
+  }
+}
+
 //
 // P_TryMove
 // Attempt to move to a new position,
@@ -959,6 +975,8 @@ dboolean P_TryMove(mobj_t* thing,fixed_t x,fixed_t y,
       P_CrossSpecialLine(spechit[numspechit], oldside, thing, false);
   }
 
+  CheckForInstaDeath(thing);
+
   return true;
   }
 

diff --git a/prboom2/src/p_spec.c b/prboom2/src/p_spec.c
@@ -2379,6 +2379,11 @@ void P_PlayerInSpecialSector (player_t* player)
           G_ExitLevel();
         break;
 
+      case 4096:
+        // BOOM++ insta-death
+        P_DamageMobj(player->mo, NULL, NULL, 999);
+        break;
+
       default:
         //jff 1/24/98 Don't exit as DOOM2 did, just ignore
         break;