OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- separated the channel number from the flags in the sound interface so that the 8 channel limit can be eliminated.

Browse source 
- added Marisa Kirisame's CHAN_OVERLAP flag.
- exported S_IsActorPlayingSomething to ZScript.

The sound API change required deprecating A_PlaySound and S_Sound. There are now new variants S_StartSound and A_StartSound which have two distinct parameters for channel and flags.
This commit is contained in:
Christoph Oelckers 2019-12-16 23:52:39 +01:00
commit e82565373f
43 changed files with 339 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/win32/st_start_util.cpp
View file

@ -511,7 +511,7 @@ void FHexenStartupScreen::Progress()
y = ST_PROGRESS_Y;
ST_Util_DrawBlock(StartupBitmap, NotchBits, x, y, ST_NOTCH_WIDTH / 2, ST_NOTCH_HEIGHT);
}
S_Sound(CHAN_BODY, "StartupTick", 1, ATTN_NONE);
S_Sound(CHAN_BODY, 0, "StartupTick", 1, ATTN_NONE);
}
}
I_GetEvent();
@ -539,7 +539,7 @@ void FHexenStartupScreen::NetProgress(int count)
y = ST_NETPROGRESS_Y;
ST_Util_DrawBlock(StartupBitmap, NetNotchBits, x, y, ST_NETNOTCH_WIDTH / 2, ST_NETNOTCH_HEIGHT);
}
S_Sound(CHAN_BODY, "misc/netnotch", 1, ATTN_NONE);
S_Sound(CHAN_BODY, 0, "misc/netnotch", 1, ATTN_NONE);
I_GetEvent();
}
}
@ -554,7 +554,7 @@ void FHexenStartupScreen::NetProgress(int count)
void FHexenStartupScreen::NetDone()
{
S_Sound(CHAN_BODY, "PickupWeapon", 1, ATTN_NORM);
S_Sound(CHAN_BODY, 0, "PickupWeapon", 1, ATTN_NORM);
FGraphicalStartupScreen::NetDone();
}