Merge pull request #486 from jackrjli/sound-cutoff

Fix player sounds being cut off by item pickups in vanilla complevels

prboom2/src/p_inter.c

@@ -254,8 +254,10 @@ dboolean P_GiveWeapon(player_t *player, weapontype_t weapon, dboolean dropped)
       /* cph 20028/10 - for old-school DM addicts, allow old behavior
        * where only consoleplayer's pickup sounds are heard */
       // displayplayer, not consoleplayer, for viewing multiplayer demos
-      if (!comp[comp_sound] || player == &players[displayplayer])
+      if (!comp[comp_sound])
         S_StartSound (player->mo, sfx_wpnup|PICKUP_SOUND); // killough 4/25/98
+      else if (player == &players[displayplayer])
+        S_StartVoidSound (sfx_wpnup|PICKUP_SOUND);
       return false;
     }
 
@@ -799,8 +801,10 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
   /* cph 20028/10 - for old-school DM addicts, allow old behavior
    * where only consoleplayer's pickup sounds are heard */
   // displayplayer, not consoleplayer, for viewing multiplayer demos
-  if (!comp[comp_sound] || player == &players[displayplayer])
+  if (!comp[comp_sound])
     S_StartSound (player->mo, sound | PICKUP_SOUND);   // killough 4/25/98
+  else if (player == &players[displayplayer])
+    S_StartVoidSound (sound | PICKUP_SOUND);
 }
 
 //