mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-03-22 15:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Make CRAY copy its own life to particles it creates (#335)

Browse Source
This commit is contained in:
cxi 2016-09-10 09:51:07 -07:00 committed by jacob1
parent 797f9357ff
commit ad4ef65cb3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/simulation/elements/CRAY.cpp
View File

@ -30,7 +30,7 @@ Element_CRAY::Element_CRAY()
HeatConduct = 0;
Description = "Particle Ray Emitter. Creates a beam of particles set by its ctype, with a range set by tmp.";
Properties = TYPE_SOLID|PROP_LIFE_DEC;
Properties = TYPE_SOLID;
LowPressure = IPL;
LowPressureTransition = NT;
@ -68,7 +68,7 @@ int Element_CRAY::update(UPDATE_FUNC_ARGS)
}
}
// only fire when life is 0, but nothing sets the life right now
else if (parts[i].life==0)
else
{
for (int rx =-1; rx <= 1; rx++)
for (int ry = -1; ry <= 1; ry++)
@ -98,6 +98,8 @@ int Element_CRAY::update(UPDATE_FUNC_ARGS)
if (colored)
parts[nr].dcolour = colored;
parts[nr].temp = parts[i].temp;
if (parts[i].life>0)
parts[nr].life = parts[i].life;
if(!--partsRemaining)
docontinue = 0;
}