summaryrefslogtreecommitdiff
path: root/src/elements/O2.c
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-08-14 17:32:10 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-08-14 17:32:10 (GMT)
commitdcd3af94404b1d1bb296566a84177cc37e0b83d5 (patch)
tree77385a265e760cd8bd86ac9077e2c0f58c6204e8 /src/elements/O2.c
parentd3153aae85f2e3cd1ba8ff0520e5ebe51e08d7d5 (diff)
parentca66525bea67de164603163752aee0212d59df34 (diff)
downloadpowder-dcd3af94404b1d1bb296566a84177cc37e0b83d5.zip
powder-dcd3af94404b1d1bb296566a84177cc37e0b83d5.tar.gz
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/elements/O2.c')
-rw-r--r--src/elements/O2.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/elements/O2.c b/src/elements/O2.c
index 2584d3a..a008766 100644
--- a/src/elements/O2.c
+++ b/src/elements/O2.c
@@ -14,6 +14,8 @@ int update_O2(UPDATE_FUNC_ARGS)
if ((r&0xFF)==PT_FIRE)
{
parts[r>>8].temp+=(rand()/(RAND_MAX/100));
+ if(parts[r>>8].tmp&0x01)
+ parts[r>>8].temp=3473;
parts[r>>8].tmp |= 2;
}
if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM)