zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-03-17 08:21:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added missing vm.h include, moved A_IsPlayingSound to p_actionfunctions.cpp.

Browse source
This commit is contained in:
Marisa Kirisame 2018-01-07 01:19:44 +01:00
parent 864ec0af9f
commit 8825ede9d1
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_actionfunctions.cpp
View file

@ -988,6 +988,14 @@ DEFINE_ACTION_FUNCTION(AActor, A_SoundVolume)
return 0;
}
DEFINE_ACTION_FUNCTION(AActor, A_IsPlayingSound)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_INT(channel);
PARAM_SOUND(sound);
ACTION_RETURN_BOOL(S_IsActorPlayingSomething(self,channel,sound));
}
//==========================================================================
//
// These come from a time when DECORATE constants did not exist yet and

1
src/s_advsound.cpp
View file

@ -53,6 +53,7 @@
#include "serializer.h"
#include "v_text.h"
#include "g_levellocals.h"
#include "vm.h"
// MACROS ------------------------------------------------------------------

8
src/s_sound.cpp
View file

@ -1895,14 +1895,6 @@ bool S_IsActorPlayingSomething (AActor *actor, int channel, int sound_id)
return false;
}
DEFINE_ACTION_FUNCTION(AActor, A_IsPlayingSound)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_INT(channel);
PARAM_SOUND(sound);
ACTION_RETURN_BOOL(S_IsActorPlayingSomething(self,channel,sound));
}
//==========================================================================
//
// S_PauseSound