diff options
| author | cracker64 <cracker642@gmail.com> | 2013-03-02 05:42:07 (GMT) |
|---|---|---|
| committer | cracker64 <cracker642@gmail.com> | 2013-03-02 05:42:07 (GMT) |
| commit | d58100dc070be97073d1f02cdbb7a382a67c376b (patch) | |
| tree | cc0fc022e7f8524b7f9bcf5ed93eb83980596f91 /src/simulation/elements/PIPE.cpp | |
| parent | a9f4b5fe343fb0ada8934030abe6363695ea43dc (diff) | |
| download | powder-d58100dc070be97073d1f02cdbb7a382a67c376b.zip powder-d58100dc070be97073d1f02cdbb7a382a67c376b.tar.gz | |
More fixes, redid a bunch of SPRK, so far everything I've tested works fine.
Diffstat (limited to 'src/simulation/elements/PIPE.cpp')
| -rw-r--r-- | src/simulation/elements/PIPE.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/simulation/elements/PIPE.cpp b/src/simulation/elements/PIPE.cpp index 80f6ba2..b82e402 100644 --- a/src/simulation/elements/PIPE.cpp +++ b/src/simulation/elements/PIPE.cpp @@ -453,7 +453,7 @@ void Element_PIPE::pushParticle(Simulation * sim, int i, int count, int original pushParticle(sim, r>>8,count,original); } else if ((r&0xFF) == PT_PRTI) //Pass particles into PRTI for a pipe speed increase - { + { int nnx; for (nnx=0; nnx<80; nnx++) if (!sim->portalp[sim->parts[r>>8].tmp][count][nnx].type) @@ -462,7 +462,7 @@ void Element_PIPE::pushParticle(Simulation * sim, int i, int count, int original count++; break; } - } + } } } } @@ -479,7 +479,7 @@ void Element_PIPE::pushParticle(Simulation * sim, int i, int count, int original pushParticle(sim, r>>8,count,original); } else if ((r&0xFF) == PT_PRTI) //Pass particles into PRTI for a pipe speed increase - { + { int nnx; for (nnx=0; nnx<80; nnx++) if (!sim->portalp[sim->parts[r>>8].tmp][count][nnx].type) @@ -488,9 +488,9 @@ void Element_PIPE::pushParticle(Simulation * sim, int i, int count, int original count++; break; } - } - else if ((r&0xFF) == PT_NONE) //Move particles out of pipe automatically, much faster at ends - { + } + else if ((r&0xFF) == PT_NONE) //Move particles out of pipe automatically, much faster at ends + { rx = pos_1_rx[coords]; ry = pos_1_ry[coords]; np = sim->create_part(-1,x+rx,y+ry,sim->parts[i].tmp&0xFF); @@ -498,7 +498,7 @@ void Element_PIPE::pushParticle(Simulation * sim, int i, int count, int original { transfer_pipe_to_part(sim->parts+i, sim->parts+np); } - } + } } return; |