diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-03-16 17:45:45 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-03-16 17:45:45 (GMT) |
| commit | b4564f212a17539604e9fa63d649e157f8888eb1 (patch) | |
| tree | 9ed998180f825d79eaa753c28b34136822a8c928 /src/simulation/elements/C5.cpp | |
| parent | f05044ab68e51ce9c374f6af09284051efcda449 (diff) | |
| parent | 3a738846a3e0c59ed02805f11f93678ae42a946e (diff) | |
| download | powder-b4564f212a17539604e9fa63d649e157f8888eb1.zip powder-b4564f212a17539604e9fa63d649e157f8888eb1.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/simulation/elements/C5.cpp')
| -rw-r--r-- | src/simulation/elements/C5.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simulation/elements/C5.cpp b/src/simulation/elements/C5.cpp index 0141991..98d9bf0 100644 --- a/src/simulation/elements/C5.cpp +++ b/src/simulation/elements/C5.cpp @@ -57,11 +57,11 @@ int Element_C5::update(UPDATE_FUNC_ARGS) r = pmap[y+ry][x+rx]; if (!r) continue; - if (((r&0xFF)!=PT_C5 && parts[r>>8].temp<100 && sim->elements[r&0xFF].HeatConduct && ((r&0xFF)!=PT_HSWC||parts[r>>8].life==10)) || (r&0xFF)==PT_HFLM) + if (((r&0xFF)!=PT_C5 && parts[r>>8].temp<100 && sim->elements[r&0xFF].HeatConduct && ((r&0xFF)!=PT_HSWC||parts[r>>8].life==10)) || (r&0xFF)==PT_CFLM) { if (!(rand()%6)) { - sim->part_change_type(i,x,y,PT_HFLM); + sim->part_change_type(i,x,y,PT_CFLM); parts[r>>8].temp = parts[i].temp = 0; parts[i].life = rand()%150+50; sim->pv[y/CELL][x/CELL] += 1.5; |