zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 14:41:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Eliminated Voc3D_Flags typedef.

Browse source
This commit is contained in:
Mitchell Richters 2022-01-01 08:36:56 +11:00
parent cd599a7a15
commit 1d51903a9e
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/games/sw/src/game.h
View file

@ -1613,18 +1613,18 @@ enum
short SoundDist(int x, int y, int z, int basedist);
short SoundAngle(int x, int y);
//void PlaySound(int num, short angle, short vol);
int _PlaySound(int num, DSWActor* sprite, PLAYER* player, vec3_t *pos, Voc3D_Flags flags, int channel, EChanFlags sndflags);
int _PlaySound(int num, DSWActor* sprite, PLAYER* player, vec3_t *pos, int flags, int channel, EChanFlags sndflags);
void InitAmbient(int num, DSWActor* actor);
inline void PlaySound(int num, PLAYER* player, Voc3D_Flags flags, int channel = 8, EChanFlags sndflags = CHANF_NONE)
inline void PlaySound(int num, PLAYER* player, int flags, int channel = 8, EChanFlags sndflags = CHANF_NONE)
{
_PlaySound(num, nullptr, player, nullptr, flags, channel, sndflags);
}
inline void PlaySound(int num, Voc3D_Flags flags, int channel = 8, EChanFlags sndflags = CHANF_NONE)
inline void PlaySound(int num, int flags, int channel = 8, EChanFlags sndflags = CHANF_NONE)
{
_PlaySound(num, nullptr, nullptr, nullptr, flags, channel, sndflags);
}
inline void PlaySound(int num, vec3_t *pos, Voc3D_Flags flags, int channel = 8, EChanFlags sndflags = CHANF_NONE)
inline void PlaySound(int num, vec3_t *pos, int flags, int channel = 8, EChanFlags sndflags = CHANF_NONE)
{
_PlaySound(num, nullptr, nullptr, pos, flags, channel, sndflags);
}
@ -2102,7 +2102,7 @@ inline bool PLAYER_MOVING(PLAYER* pp)
return (pp->vect.X | pp->vect.Y);
}
inline void PlaySound(int num, DSWActor* actor, Voc3D_Flags flags, int channel = 8, EChanFlags sndflags = CHANF_NONE)
inline void PlaySound(int num, DSWActor* actor, int flags, int channel = 8, EChanFlags sndflags = CHANF_NONE)
{
_PlaySound(num, actor, nullptr, nullptr, flags, channel, sndflags);
}

6
source/games/sw/src/sounds.cpp
View file

@ -627,7 +627,7 @@ void GameInterface::UpdateSounds(void)
//
//==========================================================================
int _PlaySound(int num, DSWActor* actor, PLAYER* pp, vec3_t* pos, Voc3D_Flags flags, int channel, EChanFlags cflags)
int _PlaySound(int num, DSWActor* actor, PLAYER* pp, vec3_t* pos, int flags, int channel, EChanFlags cflags)
{
if (Prediction || !SoundEnabled() || !soundEngine->isValidSoundId(num))
return -1;
@ -771,7 +771,7 @@ void Terminate3DSounds(void)
//
//==========================================================================
void PlaySpriteSound(DSWActor* actor, int attrib_ndx, Voc3D_Flags flags)
void PlaySpriteSound(DSWActor* actor, int attrib_ndx, int flags)
{
if (actor->hasU())
PlaySound(actor->user.Attrib->Sounds[attrib_ndx], actor, flags);
@ -979,7 +979,7 @@ DEFINE_ACTION_FUNCTION(_SW, PlaySound)
PARAM_INT(vflags);
PARAM_INT(channel);
PARAM_INT(cflags);
PlaySound(sound, Voc3D_Flags(vflags), channel, EChanFlags::FromInt(cflags));
PlaySound(sound, vflags, channel, EChanFlags::FromInt(cflags));
return 0;
}

5
source/games/sw/src/sounds.h
View file

@ -58,7 +58,6 @@ enum
// This is mainly used for intermittent sounds
v3df_nolookup = 128, // don't use ambient table lookup
};
typedef int Voc3D_Flags;
struct VOCstruct;
@ -66,7 +65,7 @@ void Terminate3DSounds(void);
class DSWActor;
void PlaySpriteSound(DSWActor* actor, int attrib_ndx, Voc3D_Flags flags);
void PlaySpriteSound(DSWActor* actor, int attrib_ndx, int flags);
void DeleteNoSoundOwner(DSWActor* actor);
void DeleteNoFollowSoundOwner(DSWActor*);
@ -86,7 +85,7 @@ struct AMB_INFO
{
int16_t name;
int16_t diginame;
Voc3D_Flags ambient_flags;
int ambient_flags;
int maxtics; // When tics reaches this number next
// sound happens
};