zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-14 08:30:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed radius attack that may inflict damage twice

Browse source 
https://forum.zdoom.org/viewtopic.php?t=66191
This commit is contained in:
alexey.lysiuk 2019-10-26 18:43:06 +03:00 committed by Christoph Oelckers
parent d54a7de284
commit ae2f7dd892
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/playsim/p_map.cpp
View file

@ -5855,6 +5855,7 @@ int P_RadiusAttack(AActor *bombspot, AActor *bombsource, int bombdamage, int bom
P_GeometryRadiusAttack(bombspot, bombsource, bombdamage, bombdistance, bombmod, fulldamagedistance); P_GeometryRadiusAttack(bombspot, bombsource, bombdamage, bombdistance, bombmod, fulldamagedistance);
TArray<AActor*> targets;
int count = 0; int count = 0;
while ((it.Next(&cres))) while ((it.Next(&cres)))
{ {
@ -5885,6 +5886,11 @@ int P_RadiusAttack(AActor *bombspot, AActor *bombsource, int bombdamage, int bom
) )
) continue; ) continue;
targets.Push(thing);
}
for (AActor *thing : targets)
{
// Barrels always use the original code, since this makes // Barrels always use the original code, since this makes
// them far too "active." BossBrains also use the old code // them far too "active." BossBrains also use the old code
// because some user levels require they have a height of 16, // because some user levels require they have a height of 16,