summaryrefslogtreecommitdiff
path: root/src/elements/O2.c
diff options
context:
space:
mode:
authorsavask <savask@yandex.ru>2011-08-12 16:01:01 (GMT)
committer savask <savask@yandex.ru>2011-08-12 16:01:01 (GMT)
commitf1908bab0c5e63e051382a54a2868124d267721c (patch)
treeafae17415cc0f433fdfa89703b576a7dfb955e03 /src/elements/O2.c
parent86e9a6eeff5c35dc42844502200e1614d1515b71 (diff)
parent6cdffe9cc2e68adaf0528ff727218ea7ac7e19b9 (diff)
downloadpowder-f1908bab0c5e63e051382a54a2868124d267721c.zip
powder-f1908bab0c5e63e051382a54a2868124d267721c.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)