diff options
| author | jacob1 <jfu614@gmail.com> | 2013-02-22 16:54:32 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-02-22 16:54:32 (GMT) |
| commit | 11f45e3e992adc83447375f3b4e3d340970c91e5 (patch) | |
| tree | b82a3afb54f945f2b22d153d58c5713561c163a8 /src/simulation/elements/ARAY.cpp | |
| parent | 40c4289ce87f31cbc9f5194d37f068d89416d4c8 (diff) | |
| download | powder-11f45e3e992adc83447375f3b4e3d340970c91e5.zip powder-11f45e3e992adc83447375f3b4e3d340970c91e5.tar.gz | |
CRAY spawns elements at its temp, fix color glitch with ARAY too, move FRME to force
Diffstat (limited to 'src/simulation/elements/ARAY.cpp')
| -rw-r--r-- | src/simulation/elements/ARAY.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/ARAY.cpp b/src/simulation/elements/ARAY.cpp index 2794bef..e38b7ee 100644 --- a/src/simulation/elements/ARAY.cpp +++ b/src/simulation/elements/ARAY.cpp @@ -51,7 +51,6 @@ int Element_ARAY::update(UPDATE_FUNC_ARGS) { int r, nxx, nyy, docontinue, nxi, nyi, rx, ry, nr, ry1, rx1; if (parts[i].life==0) { - int colored =0; for (rx=-1; rx<2; rx++) for (ry=-1; ry<2; ry++) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) @@ -62,6 +61,7 @@ int Element_ARAY::update(UPDATE_FUNC_ARGS) if ((r&0xFF)==PT_SPRK && parts[r>>8].life==3) { int destroy = (parts[r>>8].ctype==PT_PSCN)?1:0; int nostop = (parts[r>>8].ctype==PT_INST)?1:0; + int colored = 0; for (docontinue = 1, nxx = 0, nyy = 0, nxi = rx*-1, nyi = ry*-1; docontinue; nyy+=nyi, nxx+=nxi) { if (!(x+nxi+nxx<XRES && y+nyi+nyy<YRES && x+nxi+nxx >= 0 && y+nyi+nyy >= 0)) { break; |