marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Explode: if-order 

Merged the three if-blocks in DoExplosion() into one if-block. If there was no container in the first if, there should be no container in the following calls.

(cherry picked from commit d504b1109de115f507a09e9e895104bd9552ac53)
shapetextures
Mark 2015-09-13 00:10:33 +02:00
parent de7db461fa
commit 055196155f
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
planet/System.ocg/Explode.c
View File

@ -158,13 +158,12 @@ global func DoExplosion(int x, int y, int level, object inobj, int cause_plr, ob
prev_container = container;
container = parent_container;
}
// Blast objects outside if there was no final container containing the blast.
if (!container)
BlastObjects(x + GetX(), y + GetY(), level, container, cause_plr, layer, prev_container);
// Explosion outside: Explosion effects.
if (!container)
{
// Blast objects outside if there was no final container containing the blast.
BlastObjects(x + GetX(), y + GetY(), level, container, cause_plr, layer, prev_container);
// Incinerate oil.
if (!IncinerateLandscape(x, y))
if (!IncinerateLandscape(x, y - 10))
@ -172,11 +171,9 @@ global func DoExplosion(int x, int y, int level, object inobj, int cause_plr, ob
IncinerateLandscape(x + 5, y - 5);
// Graphic effects.
Call("ExplosionEffect", level, x, y, 0, silent);
}
// Landscape destruction. Happens after BlastObjects, so that recently blown-free materials are not affected
if (!container)
// Landscape destruction. Happens after BlastObjects, so that recently blown-free materials are not affected
BlastFree(x, y, level, cause_plr);
}
return true;
}