diff options
| author | savask <savask@yandex.ru> | 2011-08-12 16:01:01 (GMT) |
|---|---|---|
| committer | savask <savask@yandex.ru> | 2011-08-12 16:01:01 (GMT) |
| commit | f1908bab0c5e63e051382a54a2868124d267721c (patch) | |
| tree | afae17415cc0f433fdfa89703b576a7dfb955e03 /src/elements | |
| parent | 86e9a6eeff5c35dc42844502200e1614d1515b71 (diff) | |
| parent | 6cdffe9cc2e68adaf0528ff727218ea7ac7e19b9 (diff) | |
| download | powder-f1908bab0c5e63e051382a54a2868124d267721c.zip powder-f1908bab0c5e63e051382a54a2868124d267721c.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/O2.c | 2 | ||||
| -rw-r--r-- | src/elements/h2.c | 2 |
2 files changed, 4 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) diff --git a/src/elements/h2.c b/src/elements/h2.c index 336f496..36c110e 100644 --- a/src/elements/h2.c +++ b/src/elements/h2.c @@ -19,6 +19,8 @@ int update_H2(UPDATE_FUNC_ARGS) if ((r&0xFF)==PT_FIRE) { parts[r>>8].temp+=(rand()/(RAND_MAX/100)); + if(parts[r>>8].tmp&0x02) + parts[r>>8].temp=3473; parts[r>>8].tmp |= 1; } if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM || (r&0xFF)==PT_LAVA) |