diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-05-14 12:38:52 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-05-14 12:38:52 (GMT) |
| commit | fa54c005b298befb065a8aa4134836b0460b75b7 (patch) | |
| tree | 56c4f3e002ad1be635f1cddbf121c983469102b0 /src/elements | |
| parent | 73f2f9f57fd6efa4ed386a86f5a8d118d879a629 (diff) | |
| download | powder-fa54c005b298befb065a8aa4134836b0460b75b7.zip powder-fa54c005b298befb065a8aa4134836b0460b75b7.tar.gz | |
Use properties for life decrement/kill
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/hswc.c | 2 | ||||
| -rw-r--r-- | src/elements/lcry.c | 2 | ||||
| -rw-r--r-- | src/elements/pcln.c | 2 | ||||
| -rw-r--r-- | src/elements/pump.c | 2 | ||||
| -rw-r--r-- | src/elements/swch.c | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/src/elements/hswc.c b/src/elements/hswc.c index 5470e2d..6e1b2df 100644 --- a/src/elements/hswc.c +++ b/src/elements/hswc.c @@ -2,6 +2,8 @@ int update_HSWC(UPDATE_FUNC_ARGS) { int r, rx, ry; + if (parts[i].life>0 && parts[i].life!=10) + parts[i].life--; if (parts[i].life==10) { for (rx=-2; rx<3; rx++) diff --git a/src/elements/lcry.c b/src/elements/lcry.c index a6d442f..7b1a64e 100644 --- a/src/elements/lcry.c +++ b/src/elements/lcry.c @@ -1,6 +1,8 @@ #include <element.h> int update_LCRY(UPDATE_FUNC_ARGS) { + if (parts[i].life>0 && parts[i].life!=10) + parts[i].life--; if (parts[i].life==10) { int r, rx, ry; diff --git a/src/elements/pcln.c b/src/elements/pcln.c index 5abe33f..8afa656 100644 --- a/src/elements/pcln.c +++ b/src/elements/pcln.c @@ -2,6 +2,8 @@ int update_PCLN(UPDATE_FUNC_ARGS) { int r, rx, ry; + if (parts[i].life>0 && parts[i].life!=10) + parts[i].life--; 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)) diff --git a/src/elements/pump.c b/src/elements/pump.c index 244ca8f..fa28b4c 100644 --- a/src/elements/pump.c +++ b/src/elements/pump.c @@ -2,6 +2,8 @@ int update_PUMP(UPDATE_FUNC_ARGS) { int r, rx, ry; + if (parts[i].life>0 && parts[i].life!=10) + parts[i].life--; if (parts[i].life==10) { if (parts[i].temp>=256.0+273.15) diff --git a/src/elements/swch.c b/src/elements/swch.c index 0bd5e6d..5642419 100644 --- a/src/elements/swch.c +++ b/src/elements/swch.c @@ -2,6 +2,8 @@ int update_SWCH(UPDATE_FUNC_ARGS) { int r, rt, rx, ry; + if (parts[i].life>0 && parts[i].life!=10) + parts[i].life--; 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)) |