mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-28 10:20:04 +02:00
Code Issues Projects Releases Wiki Activity

fix STOR to PIPE

Browse Source
This commit is contained in:
jacob1
2018-01-07 20:27:54 -05:00
parent 1405c10046
commit 25ef5b19fd
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/simulation/elements/PIPE.cpp
View File

@@ -220,7 +220,7 @@ int Element_PIPE::update(UPDATE_FUNC_ARGS)
else if (!TYP(parts[i].ctype) && TYP(r)==PT_STOR && parts[ID(r)].tmp>0 && sim->IsValidElement(parts[ID(r)].tmp) && (sim->elements[parts[ID(r)].tmp].Properties & (TYPE_PART | TYPE_LIQUID | TYPE_GAS | TYPE_ENERGY))) else if (!TYP(parts[i].ctype) && TYP(r)==PT_STOR && parts[ID(r)].tmp>0 && sim->IsValidElement(parts[ID(r)].tmp) && (sim->elements[parts[ID(r)].tmp].Properties & (TYPE_PART | TYPE_LIQUID | TYPE_GAS | TYPE_ENERGY)))
{ {
// STOR stores properties in the same places as PIPE does // STOR stores properties in the same places as PIPE does
transfer_pipe_to_pipe(parts+(ID(r)), parts+i); transfer_pipe_to_pipe(parts+(ID(r)), parts+i, true);
} }
} }
} }
@@ -401,15 +401,24 @@ void Element_PIPE::transfer_part_to_pipe(Particle *part, Particle *pipe)
pipe->pavg[1] = part->ctype; pipe->pavg[1] = part->ctype;
} }
//#TPT-Directive ElementHeader Element_PIPE static void transfer_pipe_to_pipe(Particle *src, Particle *dest) //#TPT-Directive ElementHeader Element_PIPE static void transfer_pipe_to_pipe(Particle *src, Particle *dest, bool STOR=false)
void Element_PIPE::transfer_pipe_to_pipe(Particle *src, Particle *dest) void Element_PIPE::transfer_pipe_to_pipe(Particle *src, Particle *dest, bool STOR)
{ {
dest->ctype = src->ctype; // STOR to PIPE
if (STOR)
{
dest->ctype = src->tmp;
src->tmp = 0;
}
else
{
dest->ctype = src->ctype;
src->ctype = 0;
}
dest->temp = src->temp; dest->temp = src->temp;
dest->tmp2 = src->tmp2; dest->tmp2 = src->tmp2;
dest->pavg[0] = src->pavg[0]; dest->pavg[0] = src->pavg[0];
dest->pavg[1] = src->pavg[1]; dest->pavg[1] = src->pavg[1];
src->ctype = 0;
} }
//#TPT-Directive ElementHeader Element_PIPE static void pushParticle(Simulation * sim, int i, int count, int original) //#TPT-Directive ElementHeader Element_PIPE static void pushParticle(Simulation * sim, int i, int count, int original)