From d0763f48209ee337c6fd3995dcd573b159c4dfbd Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sun, 1 Mar 2009 02:19:46 +0000 Subject: [PATCH] - Fixed: The TeleporterBeacon tried to enter its See state rather than its Drop state. Also changed it to fade out when it's done rather than disappearing abruptly. SVN r1453 (trunk) --- docs/rh-log.txt | 7 ++++++- src/g_strife/a_rebels.cpp | 4 ++-- wadsrc/static/actors/strife/rebels.txt | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index fd64569a79..62dff03e36 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,9 @@ -February 28, 2009 (Changes by Graf Zahl) +February 28, 2009 +- Fixed: The TeleporterBeacon tried to enter its See state rather than its + Drop state. Also changed it to fade out when it's done rather than + disappearing abruptly. + +February 28, 2009 (Changes by Graf Zahl) - Fixed: Strife's quest based line actions also work in Deathmatch. - Fixed: Gravity application was not correct. For actors with no vertical momentum the initial pull is supposed to be twice as strong as when diff --git a/src/g_strife/a_rebels.cpp b/src/g_strife/a_rebels.cpp index 56feee19d2..855da34fb7 100644 --- a/src/g_strife/a_rebels.cpp +++ b/src/g_strife/a_rebels.cpp @@ -63,7 +63,7 @@ bool ATeleporterBeacon::Use (bool pickup) } else { - drop->SetState (drop->SeeState); + drop->SetState(drop->FindState(NAME_Drop)); drop->target = Owner; return true; } @@ -112,6 +112,6 @@ DEFINE_ACTION_FUNCTION(AActor, A_Beacon) Spawn (rebel->x + 20*finecosine[an], rebel->y + 20*finesine[an], rebel->z + TELEFOGHEIGHT, ALLOW_REPLACE); if (--self->health < 0) { - self->Destroy (); + self->SetState(self->FindState(NAME_Death)); } } diff --git a/wadsrc/static/actors/strife/rebels.txt b/wadsrc/static/actors/strife/rebels.txt index 71cd55a193..ff6faeec2d 100644 --- a/wadsrc/static/actors/strife/rebels.txt +++ b/wadsrc/static/actors/strife/rebels.txt @@ -138,5 +138,8 @@ ACTOR TeleporterBeacon : Inventory 10 native BEAC A 30 BEAC A 160 A_Beacon Wait + Death: + BEAC A 1 A_FadeOut(0.015) + Loop } } \ No newline at end of file