From 7ecaa1636267108d4975ee336522bf7beb4e117e Mon Sep 17 00:00:00 2001 From: jacksonmj Date: Wed, 23 Feb 2011 21:15:54 +0000 Subject: [PATCH] Fix lava freezing point --- src/powder.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/powder.c b/src/powder.c index 914bb4e41..2e5aef0bb 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=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) {