summaryrefslogtreecommitdiff
path: root/src/elements/pyro.c
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2011-04-10 10:38:29 (GMT)
committer Simon <simon@hardwired.org.uk>2011-04-10 10:38:29 (GMT)
commit422fcc68ec91e8d2239e5267c5a583256920fc67 (patch)
tree9ae37003f0b2736fb04d332a7f6f10ab18ad81d8 /src/elements/pyro.c
parent00d8af2404a6ec0747ce4c90c6cb949d7665bff4 (diff)
downloadpowder-422fcc68ec91e8d2239e5267c5a583256920fc67.zip
powder-422fcc68ec91e8d2239e5267c5a583256920fc67.tar.gz
Better Oxygen/Hydrogen burning
Diffstat (limited to 'src/elements/pyro.c')
-rw-r--r--src/elements/pyro.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/elements/pyro.c b/src/elements/pyro.c
index 0fe1def..19192d1 100644
--- a/src/elements/pyro.c
+++ b/src/elements/pyro.c
@@ -8,11 +8,19 @@ int update_PYRO(UPDATE_FUNC_ARGS) {
part_change_type(i,x,y,t);
parts[i].life = 0;
}
- if (t==PT_FIRE && parts[i].life <=1 && parts[i].temp<625)
+ if(t==PT_FIRE && parts[i].life <=1)
{
- t = PT_SMKE;
- part_change_type(i,x,y,t);
- parts[i].life = rand()%20+250;
+ if (parts[i].tmp==3){
+ t = PT_WATR;
+ part_change_type(i,x,y,t);
+ parts[i].life = 0;
+ }
+ else if (parts[i].temp<625)
+ {
+ t = PT_SMKE;
+ part_change_type(i,x,y,t);
+ parts[i].life = rand()%20+250;
+ }
}
for (rx=-2; rx<3; rx++)
for (ry=-2; ry<3; ry++)