OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- scriptified two more trivial functions.

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-06 09:22:03 +01:00
commit c3ae560289
2 changed files with 3 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/p_enemy.cpp
View file

@ -3061,20 +3061,6 @@ DEFINE_ACTION_FUNCTION(AActor, A_XScream)
return 0;
}
//===========================================================================
//
// A_ScreamAndUnblock
//
//===========================================================================
DEFINE_ACTION_FUNCTION(AActor, A_ScreamAndUnblock)
{
PARAM_SELF_PROLOGUE(AActor);
CALL_ACTION(A_Scream, self);
A_Unblock(self, true);
return 0;
}
//===========================================================================
//
// A_ActiveSound
@ -3086,25 +3072,11 @@ DEFINE_ACTION_FUNCTION(AActor, A_ActiveSound)
PARAM_SELF_PROLOGUE(AActor);
if (self->ActiveSound)
{
S_Sound (self, CHAN_VOICE, self->ActiveSound, 1, ATTN_NORM);
S_Sound(self, CHAN_VOICE, self->ActiveSound, 1, ATTN_NORM);
}
return 0;
}
//===========================================================================
//
// A_ActiveAndUnblock
//
//===========================================================================
DEFINE_ACTION_FUNCTION(AActor, A_ActiveAndUnblock)
{
PARAM_SELF_PROLOGUE(AActor);
CALL_ACTION(A_ActiveSound, self);
A_Unblock(self, true);
return 0;
}
//---------------------------------------------------------------------------
//
// Modifies the drop amount of this item according to the current skill's