summaryrefslogtreecommitdiff
path: root/src/elements/pump.c
diff options
context:
space:
mode:
authorjacksonmj <jacksonmj@jacksonmj.none>2011-01-10 00:46:34 (GMT)
committer jacksonmj <jacksonmj@jacksonmj.none>2011-01-10 00:46:34 (GMT)
commit855281295fbc23366e8b84d7c8e55816d6f47a87 (patch)
tree761d7cbaf37e3f10b1ee97f72d34f1da70d6732d /src/elements/pump.c
parent88d107f18a9c6d37493a953142a503d963ec37b1 (diff)
downloadpowder-855281295fbc23366e8b84d7c8e55816d6f47a87.zip
powder-855281295fbc23366e8b84d7c8e55816d6f47a87.tar.gz
More update functions cleanup.
Diffstat (limited to 'src/elements/pump.c')
-rw-r--r--src/elements/pump.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/elements/pump.c b/src/elements/pump.c
index 1de7a10..c1c1201 100644
--- a/src/elements/pump.c
+++ b/src/elements/pump.c
@@ -1,7 +1,7 @@
#include <powder.h>
int update_PUMP(UPDATE_FUNC_ARGS) {
- int r;
+ int r, rx, ry;
if (parts[i].life==10)
{
if (parts[i].temp>=256.0+273.15)
@@ -19,12 +19,11 @@ int update_PUMP(UPDATE_FUNC_ARGS) {
if (y+CELL<YRES)
pv[y/CELL+1][x/CELL+1] += 0.1f*((parts[i].temp-273.15)-pv[y/CELL+1][x/CELL+1]);
}
- for (nx=-2; nx<3; nx++)
- for (ny=-2; ny<3; ny++)
- if (x+nx>=0 && y+ny>0 &&
- x+nx<XRES && y+ny<YRES && (nx || ny))
+ for (rx=-2; rx<3; rx++)
+ for (ry=-2; ry<3; ry++)
+ if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{
- r = pmap[y+ny][x+nx];
+ r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || !r)
continue;
if ((r&0xFF)==PT_PUMP)