mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-10 23:01:50 +00:00
- renamed Actor.NoiseAlert to Actor.SoundAlert to deconflict with the same-named action special.
This commit is contained in:
parent
d2d960672c
commit
aa758159c9
7 changed files with 9 additions and 9 deletions
|
@ -262,7 +262,7 @@ void P_NoiseAlert (AActor *target, AActor *emitter, bool splash, double maxdist)
|
|||
}
|
||||
}
|
||||
|
||||
DEFINE_ACTION_FUNCTION(AActor, NoiseAlert)
|
||||
DEFINE_ACTION_FUNCTION(AActor, SoundAlert)
|
||||
{
|
||||
PARAM_SELF_PROLOGUE(AActor);
|
||||
PARAM_OBJECT(target, AActor);
|
||||
|
|
|
@ -300,7 +300,7 @@ class Actor : Thinker native
|
|||
native bool isTeammate(Actor other);
|
||||
native int PlayerNumber();
|
||||
native void SetFriendPlayer(PlayerInfo player);
|
||||
native void NoiseAlert(Actor target, bool splash = false, double maxdist = 0);
|
||||
native void SoundAlert(Actor target, bool splash = false, double maxdist = 0);
|
||||
native void DaggerAlert(Actor target);
|
||||
native void ClearBounce();
|
||||
native TerrainDef GetFloorTerrain();
|
||||
|
|
|
@ -302,7 +302,7 @@ class AcolyteToBe : Acolyte
|
|||
Door_Close(999, 64);
|
||||
if (target != null && target.player != null)
|
||||
{
|
||||
NoiseAlert (target);
|
||||
SoundAlert (target);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -114,7 +114,7 @@ extend class Actor
|
|||
if (reactiontime == 2)
|
||||
{
|
||||
// [RH] Unalert monsters near the alarm and not just those in the same sector as it.
|
||||
NoiseAlert (NULL, false);
|
||||
SoundAlert (NULL, false);
|
||||
}
|
||||
else if (reactiontime > 50)
|
||||
{
|
||||
|
|
|
@ -173,7 +173,7 @@ extend class Actor
|
|||
|
||||
if (target != null && emitter != null)
|
||||
{
|
||||
emitter.NoiseAlert(target, false, maxdist);
|
||||
emitter.SoundAlert(target, false, maxdist);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -610,7 +610,7 @@ class RaiseAlarm : DummyStrifeItem
|
|||
|
||||
override bool TryPickup (in out Actor toucher)
|
||||
{
|
||||
toucher.NoiseAlert (toucher);
|
||||
toucher.SoundAlert (toucher);
|
||||
|
||||
ThinkerIterator it = ThinkerIterator.Create("AlienSpectre3");
|
||||
Actor spectre = Actor(it.Next());
|
||||
|
@ -629,7 +629,7 @@ class RaiseAlarm : DummyStrifeItem
|
|||
{
|
||||
if (dropper.target != null)
|
||||
{
|
||||
dropper.target.NoiseAlert(dropper.target);
|
||||
dropper.target.SoundAlert(dropper.target);
|
||||
if (dropper.target.CheckLocalView(consoleplayer))
|
||||
{
|
||||
A_Log("You Fool! You've set off the alarm.");
|
||||
|
@ -674,7 +674,7 @@ class CloseDoor222 : DummyStrifeItem
|
|||
{
|
||||
A_Log("You're dead! You set off the alarm.");
|
||||
}
|
||||
dropper.target.NoiseAlert(dropper.target);
|
||||
dropper.target.SoundAlert(dropper.target);
|
||||
}
|
||||
Destroy ();
|
||||
return true;
|
||||
|
|
|
@ -1857,7 +1857,7 @@ class PowerCoupling : Actor
|
|||
// [RH] In case the player broke it with the dagger, alert the guards now.
|
||||
if (LastHeard != source)
|
||||
{
|
||||
NoiseAlert (source);
|
||||
SoundAlert (source);
|
||||
}
|
||||
Door_Close(225, 16);
|
||||
Floor_LowerToHighestEE(44, 8);
|
||||
|
|
Loading…
Reference in a new issue