diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-13 14:36:05 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-13 14:36:05 (GMT) |
| commit | 9f067224b82751e94d0ad377d9653ce160daa03d (patch) | |
| tree | 751d5e17fd14fbf200c77c0eed173eee91f34c12 /src/powder.c | |
| parent | d601608623c0e8a26ceca0186743cf2ea89c08f4 (diff) | |
| parent | a1bd20db91d9e1e2a9523986927afcbb82171205 (diff) | |
| download | powder-9f067224b82751e94d0ad377d9653ce160daa03d.zip powder-9f067224b82751e94d0ad377d9653ce160daa03d.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/powder.c')
| -rw-r--r-- | src/powder.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/powder.c b/src/powder.c index 95b8333..e9cf2ce 100644 --- a/src/powder.c +++ b/src/powder.c @@ -1930,6 +1930,11 @@ void update_particles_i(pixel *vid, int start, int inc) || t==PT_WTRV) ctempl -= 2.0f*pv[y/CELL][x/CELL]; s = 1; + + //A fix for ice with ctype = 0 + if (t==PT_ICEI && parts[i].ctype==0) + parts[i].ctype = PT_WATR; + if (ctemph>ptransitions[t].thv&&ptransitions[t].tht>-1) { // particle type change due to high temperature #ifdef REALISTIC |