diff --git a/src/objects/item-debris.c b/src/objects/item-debris.c index 941cdc24c..a5ddd5842 100644 --- a/src/objects/item-debris.c +++ b/src/objects/item-debris.c @@ -171,8 +171,8 @@ Obj_SpawnItemDebrisEffects spawn_cloud(collectible, collector, base_speed); - S_StartSound(collectible, sfx_kc2e); - S_StartSound(collectible, sfx_s1c9); + S_StartSound(spawner, sfx_kc2e); + S_StartSound(spawner, sfx_s1c9); } void diff --git a/src/p_inter.c b/src/p_inter.c index 438909980..7898d0b8e 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -275,7 +275,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) special->momx = special->momy = special->momz = 0; P_SetTarget(&special->target, toucher); P_KillMobj(special, toucher, toucher, DMG_NORMAL); - break; + return; case MT_SPHEREBOX: if (!P_CanPickupItem(player, 0)) return; @@ -283,7 +283,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) special->momx = special->momy = special->momz = 0; P_SetTarget(&special->target, toucher); P_KillMobj(special, toucher, toucher, DMG_NORMAL); - break; + return; case MT_ITEMCAPSULE: if ((gametyperules & GTR_BUMPERS) && player->bumpers <= 0) return;