mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-10 23:01:59 +00:00
- added Gez's patch to have D'Sparil transfer his translations to his second state and the teleport effect.
SVN r3525 (trunk)
This commit is contained in:
parent
fd2af54724
commit
53f4776914
1 changed files with 2 additions and 0 deletions
|
@ -117,6 +117,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_SorcererRise)
|
||||||
|
|
||||||
self->flags &= ~MF_SOLID;
|
self->flags &= ~MF_SOLID;
|
||||||
mo = Spawn("Sorcerer2", self->x, self->y, self->z, ALLOW_REPLACE);
|
mo = Spawn("Sorcerer2", self->x, self->y, self->z, ALLOW_REPLACE);
|
||||||
|
mo->Translation = self->Translation;
|
||||||
mo->SetState (mo->FindState("Rise"));
|
mo->SetState (mo->FindState("Rise"));
|
||||||
mo->angle = self->angle;
|
mo->angle = self->angle;
|
||||||
mo->CopyFriendliness (self, true);
|
mo->CopyFriendliness (self, true);
|
||||||
|
@ -148,6 +149,7 @@ void P_DSparilTeleport (AActor *actor)
|
||||||
if (P_TeleportMove (actor, spot->x, spot->y, spot->z, false))
|
if (P_TeleportMove (actor, spot->x, spot->y, spot->z, false))
|
||||||
{
|
{
|
||||||
mo = Spawn("Sorcerer2Telefade", prevX, prevY, prevZ, ALLOW_REPLACE);
|
mo = Spawn("Sorcerer2Telefade", prevX, prevY, prevZ, ALLOW_REPLACE);
|
||||||
|
if (mo) mo->Translation = actor->Translation;
|
||||||
S_Sound (mo, CHAN_BODY, "misc/teleport", 1, ATTN_NORM);
|
S_Sound (mo, CHAN_BODY, "misc/teleport", 1, ATTN_NORM);
|
||||||
actor->SetState (actor->FindState("Teleport"));
|
actor->SetState (actor->FindState("Teleport"));
|
||||||
S_Sound (actor, CHAN_BODY, "misc/teleport", 1, ATTN_NORM);
|
S_Sound (actor, CHAN_BODY, "misc/teleport", 1, ATTN_NORM);
|
||||||
|
|
Loading…
Reference in a new issue