zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-04 01:41:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed (un)morphing of more than one actor from ACS

Browse source 
https://forum.zdoom.org/viewtopic.php?t=68847

# Conflicts:
#	src/p_acs.cpp
This commit is contained in:
alexey.lysiuk 2020-06-07 12:16:46 +03:00 committed by drfrag
parent 55bbc4a86b
commit 8c877cb36a
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/p_acs.cpp
View file

@ -10149,9 +10149,14 @@ scriptwait:
else
{
FActorIterator iterator (tag);
AActor *actor;
TArray<AActor*> actorsToMorph;
while ( (actor = iterator.Next ()) )
while (AActor *actor = iterator.Next())
{
actorsToMorph.Push(actor);
}
for (AActor *actor : actorsToMorph)
{
changes += P_MorphActor(activator, actor, playerclass, monsterclass, duration, style, morphflash, unmorphflash);
}
@ -10175,9 +10180,14 @@ scriptwait:
else
{
FActorIterator iterator (tag);
AActor *actor;
TArray<AActor*> actorsToUnmorph;
while ( (actor = iterator.Next ()) )
while (AActor *actor = iterator.Next())
{
actorsToUnmorph.Push(actor);
}
for (AActor *actor : actorsToUnmorph)
{
changes += P_UnmorphActor(activator, actor, 0, force);
}