mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-21 07:31:26 +02:00
Code Issues Projects Releases Wiki Activity

DRAY only copies enery or non-energy particles, depending on the first one it sees

Browse Source
This commit is contained in:
jacob1
2015-09-25 13:52:59 -04:00
parent b2840de173
commit 74471dcda4
1 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,11 +78,27 @@ int Element_DRAY::update(UPDATE_FUNC_ARGS)
continue; continue;
//figure out where the copying will start/end //figure out where the copying will start/end
bool foundParticle = false;
bool isEnergy = false;
for (int xStep = rx*-1, yStep = ry*-1, xCurrent = x+xStep, yCurrent = y+yStep; ; xCurrent+=xStep, yCurrent+=yStep) for (int xStep = rx*-1, yStep = ry*-1, xCurrent = x+xStep, yCurrent = y+yStep; ; xCurrent+=xStep, yCurrent+=yStep)
{ {
int rr = pmap[yCurrent][xCurrent]; int rr;
if (!foundParticle)
{
rr = pmap[yCurrent][xCurrent];
if (!rr) if (!rr)
{
rr = sim->photons[yCurrent][xCurrent]; rr = sim->photons[yCurrent][xCurrent];
foundParticle = isEnergy = true;
}
else
foundParticle = true;
}
else if (isEnergy)
rr = sim->photons[yCurrent][xCurrent];
else
rr = pmap[yCurrent][xCurrent];
if ((!copyLength && (rr&0xFF) == ctype && (ctype != PT_LIFE || parts[rr>>8].ctype == ctypeExtra)) if ((!copyLength && (rr&0xFF) == ctype && (ctype != PT_LIFE || parts[rr>>8].ctype == ctypeExtra))
|| !(--partsRemaining && InBounds(xCurrent+xStep, yCurrent+yStep))) || !(--partsRemaining && InBounds(xCurrent+xStep, yCurrent+yStep)))
{ {
@@ -95,28 +111,39 @@ int Element_DRAY::update(UPDATE_FUNC_ARGS)
//now, actually copy the particles //now, actually copy the particles
partsRemaining = copyLength + 1; partsRemaining = copyLength + 1;
int type, p;
for (int xStep = rx*-1, yStep = ry*-1, xCurrent = x+xStep, yCurrent = y+yStep; InBounds(xCopyTo, yCopyTo) && --partsRemaining; xCurrent+=xStep, yCurrent+=yStep, xCopyTo+=xStep, yCopyTo+=yStep) for (int xStep = rx*-1, yStep = ry*-1, xCurrent = x+xStep, yCurrent = y+yStep; InBounds(xCopyTo, yCopyTo) && --partsRemaining; xCurrent+=xStep, yCurrent+=yStep, xCopyTo+=xStep, yCopyTo+=yStep)
{ {
int type = pmap[yCurrent][xCurrent]&0xFF, p; if (isEnergy)
bool isPhot = false;
if (!type)
{
type = sim->photons[yCurrent][xCurrent]&0xFF; type = sim->photons[yCurrent][xCurrent]&0xFF;
isPhot = true; else
} type = pmap[yCurrent][xCurrent]&0xFF;
if (overwrite) if (overwrite)
sim->delete_part(xCopyTo, yCopyTo); {
if (isEnergy)
{
if (sim->photons[yCopyTo][xCopyTo])
sim->kill_part(sim->photons[yCopyTo][xCopyTo]>>8);
}
else
{
if (pmap[yCopyTo][xCopyTo])
sim->kill_part(pmap[yCopyTo][xCopyTo]>>8);
}
}
if (type == PT_SPRK) //hack if (type == PT_SPRK) //hack
p = sim->create_part(-1, xCopyTo, yCopyTo, PT_METL); p = sim->create_part(-1, xCopyTo, yCopyTo, PT_METL);
else if (type) else if (type)
p = sim->create_part(-1, xCopyTo, yCopyTo, type); p = sim->create_part(-1, xCopyTo, yCopyTo, type);
else else
continue; continue;
if (p >= 0) if (p >= 0)
{ {
if (type == PT_SPRK) if (type == PT_SPRK)
sim->part_change_type(p, xCopyTo, yCopyTo, PT_SPRK); sim->part_change_type(p, xCopyTo, yCopyTo, PT_SPRK);
if (isPhot) if (isEnergy)
parts[p] = parts[sim->photons[yCurrent][xCurrent]>>8]; parts[p] = parts[sim->photons[yCurrent][xCurrent]>>8];
else else
parts[p] = parts[pmap[yCurrent][xCurrent]>>8]; parts[p] = parts[pmap[yCurrent][xCurrent]>>8];