matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove leftover cooldown-related code from ARAY and DRAY

Browse Source
This commit is contained in:
Tamás Bálint Misius 2020-07-26 19:05:05 +02:00
parent 41254a2f95
commit 94353a9a3b
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
2 changed files with 220 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/simulation/elements/ARAY.cpp
View File

@ -31,7 +31,7 @@ void Element::Element_ARAY()
HeatConduct = 0; HeatConduct = 0;
Description = "Ray Emitter. Rays create points when they collide."; Description = "Ray Emitter. Rays create points when they collide.";
Properties = TYPE_SOLID|PROP_LIFE_DEC; Properties = TYPE_SOLID;
LowPressure = IPL; LowPressure = IPL;
LowPressureTransition = NT; LowPressureTransition = NT;
@ -46,11 +46,11 @@ void Element::Element_ARAY()
} }
static int update(UPDATE_FUNC_ARGS) static int update(UPDATE_FUNC_ARGS)
{
if (!parts[i].life)
{ {
for (int rx = -1; rx <= 1; rx++) for (int rx = -1; rx <= 1; rx++)
{
for (int ry = -1; ry <= 1; ry++) for (int ry = -1; ry <= 1; ry++)
{
if (BOUNDS_CHECK && (rx || ry)) if (BOUNDS_CHECK && (rx || ry))
{ {
int r = pmap[y+ry][x+rx]; int r = pmap[y+ry][x+rx];
@ -206,5 +206,6 @@ static int update(UPDATE_FUNC_ARGS)
//parts[i].life = 4; //parts[i].life = 4;
} }
} }
}
return 0; return 0;
} }

8
src/simulation/elements/DRAY.cpp
View File

@ -31,7 +31,7 @@ void Element::Element_DRAY()
HeatConduct = 0; HeatConduct = 0;
Description = "Duplicator ray. Replicates a line of particles in front of it."; Description = "Duplicator ray. Replicates a line of particles in front of it.";
Properties = TYPE_SOLID | PROP_LIFE_DEC; Properties = TYPE_SOLID;
LowPressure = IPL; LowPressure = IPL;
LowPressureTransition = NT; LowPressureTransition = NT;
@ -62,10 +62,11 @@ static int update(UPDATE_FUNC_ARGS)
copyLength = parts[i].tmp = 0; copyLength = parts[i].tmp = 0;
else if (copyLength > 0) else if (copyLength > 0)
copySpaces++; //strange hack copySpaces++; //strange hack
if (!parts[i].life) // only fire when life is 0, but nothing sets the life right now
{
for (int rx = -1; rx <= 1; rx++) for (int rx = -1; rx <= 1; rx++)
{
for (int ry = -1; ry <= 1; ry++) for (int ry = -1; ry <= 1; ry++)
{
if (BOUNDS_CHECK && (rx || ry)) if (BOUNDS_CHECK && (rx || ry))
{ {
int r = pmap[y+ry][x+rx]; int r = pmap[y+ry][x+rx];
@ -168,5 +169,6 @@ static int update(UPDATE_FUNC_ARGS)
} }
} }
} }
}
return 0; return 0;
} }