summaryrefslogtreecommitdiff
path: root/src/elements/pipe.c
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-08-29 15:34:53 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-08-29 15:34:53 (GMT)
commit26269ff052359af703c211e4d5d4a2447b45405b (patch)
tree1ec5fbda113f3c285aeef1ab1b43cc63e733e699 /src/elements/pipe.c
parent9c458b885112c28af8a3b7c7964e563692620c32 (diff)
downloadpowder-26269ff052359af703c211e4d5d4a2447b45405b.zip
powder-26269ff052359af703c211e4d5d4a2447b45405b.tar.gz
Added STOR, a block that can store a single particle and release when charged
Diffstat (limited to 'src/elements/pipe.c')
-rw-r--r--src/elements/pipe.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/elements/pipe.c b/src/elements/pipe.c
index af008dc..9e060b5 100644
--- a/src/elements/pipe.c
+++ b/src/elements/pipe.c
@@ -152,6 +152,16 @@ int update_PIPE(UPDATE_FUNC_ARGS) {
parts[i].pavg[1] = parts[r>>8].ctype;
kill_part(r>>8);
}
+ else if ((parts[i].tmp&0xFF) == 0 && (r&0xFF)==PT_STOR && parts[r>>8].tmp && (ptypes[parts[r>>8].tmp].falldown!= 0 || ptypes[parts[r>>8].tmp].state == ST_GAS))
+ {
+ parts[i].tmp = parts[r>>8].tmp;
+ parts[i].temp = parts[r>>8].temp;
+ parts[i].flags = parts[r>>8].flags;
+ parts[i].pavg[0] = parts[r>>8].pavg[0];
+ parts[i].pavg[1] = parts[r>>8].pavg[1];
+ parts[r>>8].tmp = 0;
+ parts[r>>8].life = 0;
+ }
}
}
}