zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-03-02 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- scriptified two more trivial functions.

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-06 09:22:03 +01:00
parent 0130bde077
commit c3ae560289
2 changed files with 3 additions and 31 deletions
Show stats 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; 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 // A_ActiveSound
@ -3086,25 +3072,11 @@ DEFINE_ACTION_FUNCTION(AActor, A_ActiveSound)
PARAM_SELF_PROLOGUE(AActor); PARAM_SELF_PROLOGUE(AActor);
if (self->ActiveSound) 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; 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 // Modifies the drop amount of this item according to the current skill's

4
wadsrc/static/zscript/actor.txt
View file

@ -130,6 +130,8 @@ class Actor : Thinker native
void A_SetRipperLevel(int level) { RipperLevel = level; } void A_SetRipperLevel(int level) { RipperLevel = level; }
void A_SetRipMin(int minimum) { RipLevelMin = minimum; } void A_SetRipMin(int minimum) { RipLevelMin = minimum; }
void A_SetRipMax(int maximum) { RipLevelMax = maximum; } void A_SetRipMax(int maximum) { RipLevelMax = maximum; }
void A_ScreamAndUnblock() { A_Scream(); A_NoBlocking(); }
void A_ActiveAndUnblock() { A_ActiveSound(); A_NoBlocking(); }
void A_SetScale(float scalex, float scaley = 0, int ptr = AAPTR_DEFAULT, bool usezero = false) void A_SetScale(float scalex, float scaley = 0, int ptr = AAPTR_DEFAULT, bool usezero = false)
{ {
@ -246,8 +248,6 @@ class Actor : Thinker native
native void A_M_Saw(sound fullsound = "weapons/sawfull", sound hitsound = "weapons/sawhit", int damage = 2, class<Actor> pufftype = "BulletPuff"); native void A_M_Saw(sound fullsound = "weapons/sawfull", sound hitsound = "weapons/sawhit", int damage = 2, class<Actor> pufftype = "BulletPuff");
native void A_ScreamAndUnblock();
native void A_ActiveAndUnblock();
native void A_ActiveSound(); native void A_ActiveSound();
native void A_FastChase(); native void A_FastChase();