diff options
| author | cracker64 <cracker642@gmail.com> | 2013-03-01 05:41:53 (GMT) |
|---|---|---|
| committer | cracker64 <cracker642@gmail.com> | 2013-03-01 05:41:53 (GMT) |
| commit | 0d70547cf059b5bd0a7a4a0acd9251fb94c6115e (patch) | |
| tree | 99a0b212eeecee83662d963da052b439375acbf3 /src/simulation/elements/FRAY.cpp | |
| parent | 5873d6958641af21b92fcb039d26c336331f19e7 (diff) | |
| download | powder-0d70547cf059b5bd0a7a4a0acd9251fb94c6115e.zip powder-0d70547cf059b5bd0a7a4a0acd9251fb94c6115e.tar.gz | |
More fixes to fix fixes and new fixes to fix stuff.
Diffstat (limited to 'src/simulation/elements/FRAY.cpp')
| -rw-r--r-- | src/simulation/elements/FRAY.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/simulation/elements/FRAY.cpp b/src/simulation/elements/FRAY.cpp index 57e2b22..5ab7de8 100644 --- a/src/simulation/elements/FRAY.cpp +++ b/src/simulation/elements/FRAY.cpp @@ -49,7 +49,7 @@ Element_FRAY::Element_FRAY() //#TPT-Directive ElementHeader Element_FRAY static int update(UPDATE_FUNC_ARGS) int Element_FRAY::update(UPDATE_FUNC_ARGS) { - int r, nxx, nyy, docontinue, len, nxi, nyi, rx, ry, nr, ry1, rx1; + int r, nxx, nyy, len, nxi, nyi, rx, ry; 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)) @@ -58,14 +58,13 @@ int Element_FRAY::update(UPDATE_FUNC_ARGS) if (!r) continue; if ((r&0xFF)==PT_SPRK) { - for (docontinue = 1, nxx = 0, nyy = 0, nxi = rx*-1, nyi = ry*-1, len = 0; docontinue; nyy+=nyi, nxx+=nxi, len++) { + for (nxx = 0, nyy = 0, nxi = rx*-1, nyi = ry*-1, len = 0; ; nyy+=nyi, nxx+=nxi, len++) { if (!(x+nxi+nxx<XRES && y+nyi+nyy<YRES && x+nxi+nxx >= 0 && y+nyi+nyy >= 0) || len>10) { break; } r = pmap[y+nyi+nyy][x+nxi+nxx]; if (!r) r = sim->photons[y+nyi+nyy][x+nxi+nxx]; - if (r && !(sim->elements[r&0xFF].Properties & TYPE_SOLID)){ parts[r>>8].vx += nxi*((parts[i].temp-273.15)/10.0f); parts[r>>8].vy += nyi*((parts[i].temp-273.15)/10.0f); @@ -77,4 +76,4 @@ int Element_FRAY::update(UPDATE_FUNC_ARGS) } -Element_FRAY::~Element_FRAY() {}
\ No newline at end of file +Element_FRAY::~Element_FRAY() {} |