diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-02-23 21:15:54 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-02-23 21:15:54 (GMT) |
| commit | 7ecaa1636267108d4975ee336522bf7beb4e117e (patch) | |
| tree | c4ea80a6e50422b2b1773adf6b5fe351fc3c2e80 /src | |
| parent | c9725c60047869fb0d645eb9e8cc259748cc9c0e (diff) | |
| download | powder-7ecaa1636267108d4975ee336522bf7beb4e117e.zip powder-7ecaa1636267108d4975ee336522bf7beb4e117e.tar.gz | |
Fix lava freezing point
Diffstat (limited to 'src')
| -rw-r--r-- | src/powder.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/powder.c b/src/powder.c index 914bb4e..2e5aef0 100644 --- a/src/powder.c +++ b/src/powder.c @@ -1566,10 +1566,12 @@ void update_particles_i(pixel *vid, int start, int inc) } else if (t==PT_LAVA) { if (parts[i].ctype && parts[i].ctype<PT_NUM && parts[i].ctype!=PT_LAVA) { - if (ptransitions[parts[i].ctype].tht==PT_LAVA&&pt>=ptransitions[parts[i].ctype].thv) s = 0; - else if (parts[i].ctype==PT_THRM&&pt>=ptransitions[PT_BMTL].thv) s = 0; + if (parts[i].ctype==PT_THRM&&pt>=ptransitions[PT_BMTL].thv) s = 0; + else if (ptransitions[parts[i].ctype].tht==PT_LAVA) { + if (pt>=ptransitions[parts[i].ctype].thv) s = 0; + } else if (pt>=973.0f) s = 0; // freezing point for lava with any other (not listed in ptransitions as turning into lava) ctype - else { + if (s) { t = parts[i].ctype; parts[i].ctype = PT_NONE; if (t==PT_THRM) { |