OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- migrate a large part of the sound code to FSoundIDs.

Browse source 
This has always been a wild mixture of IDs and ints.
This commit is contained in:
Christoph Oelckers 2022-11-24 15:22:07 +01:00
commit 160633a4a2
35 changed files with 224 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/playsim/p_switch.cpp
View file

@ -250,7 +250,7 @@ bool P_CheckSwitchRange(AActor *user, line_t *line, int sideno, const DVector3 *
bool P_ChangeSwitchTexture (side_t *side, int useAgain, uint8_t special, bool *quest)
{
int texture;
int sound;
FSoundID sound;
FSwitchDef *Switch;
if ((Switch = TexAnim.FindSwitch (side->GetTexture(side_t::top))) != NULL)
@ -275,7 +275,7 @@ bool P_ChangeSwitchTexture (side_t *side, int useAgain, uint8_t special, bool *q
}
// EXIT SWITCH?
if (Switch->Sound != 0)
if (Switch->Sound != NO_SOUND)
{
sound = Switch->Sound;
}
@ -404,7 +404,7 @@ void DActiveButton::Tick ()
{
m_Frame = -1;
S_Sound (Level, DVector3(m_Pos, 0), CHAN_VOICE, CHANF_LISTENERZ,
def->Sound != 0 ? FSoundID(def->Sound) : FSoundID("switches/normbutn"),
def->Sound != NO_SOUND ? FSoundID(def->Sound) : FSoundID("switches/normbutn"),
1, ATTN_STATIC);
bFlippable = false;
}