Outdoor bullet puff fix is ignored for demos (to keep compatibily). Fast

doors play close sound only once. Sounds are no longer cutoff on object removal.
Slipyx · Jan 31, 2012 · 9818f8c · 9818f8c
1 parent 0426de7
commit 9818f8c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src/p_doors.c b/src/p_doors.c
@@ -122,7 +122,7 @@ void T_VerticalDoor(vldoor_t *door)
                     case blazeClose:
                         door->sector->specialdata = NULL;
                         P_RemoveThinker(&door->thinker); // unlink and free
-                        S_StartSound(&door->sector->soundorg, sfx_bdcls);
+                        // JoshK: Don't play blaze close sound twice
                         break;
 
                     case normal:

diff --git a/src/p_map.c b/src/p_map.c
@@ -1112,8 +1112,9 @@ boolean PTR_ShootTraverse(intercept_t *in)
 
             // it's a sky hack wall
             if (li->backsector && li->backsector->ceilingpic == skyflatnum
-             // JoshK: Outdoor bullet puffs bug fix (partially)
-             && li->backsector->ceilingheight < z)
+             // JoshK: Outdoor bullet puffs bug fix (Not in demos)
+             && ((demorecording || demoplayback)
+              || li->backsector->ceilingheight < z))
             {
                 return false;
             }

diff --git a/src/p_mobj.c b/src/p_mobj.c
@@ -594,17 +594,13 @@ void P_RemoveMobj (mobj_t* mobj)
 
     // unlink from sector and block lists
     P_UnsetThingPosition (mobj);
-
-    // stop any playing sound
-    S_StopSound (mobj);
-
+
+    // JoshK: Don't stop sound on object removal
+
     // free block
     P_RemoveThinker ((thinker_t*)mobj);
 }
 
-
-
-
 //
 // P_RespawnSpecials
 //