OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Changed pickup sounds of local player to unpaused to resolve problems with

Browse source 
the time freezer and make them behave better.
- Fixed: When sounds are paused not all newly started sounds should actually
  be played.
- Fixed: SBARINFO had no means to check if a weapon uses any ammo at all and
  as a result the inventory icon was misplaced if a no-ammo weapon was selected.

SVN r1343 (trunk)
This commit is contained in:
Christoph Oelckers 2009-01-01 15:09:49 +00:00
commit 6a321fd8f5
11 changed files with 166 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/g_shared/a_pickups.cpp
View file

@ -972,6 +972,7 @@ const char *AInventory::PickupMessage ()
void AInventory::PlayPickupSound (AActor *toucher)
{
float atten;
int chan;
if (ItemFlags & IF_NOATTENPICKUPSOUND)
{
@ -988,7 +989,16 @@ void AInventory::PlayPickupSound (AActor *toucher)
{
atten = ATTN_NORM;
}
S_Sound (toucher, CHAN_PICKUP, PickupSound, 1, atten);
if (toucher != NULL && toucher->CheckLocalView(consoleplayer))
{
chan = CHAN_PICKUP|CHAN_NOPAUSE;
}
else
{
chan = CHAN_PICKUP;
}
S_Sound (toucher, chan, PickupSound, 1, atten);
}
//===========================================================================