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/BCOL.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/BCOL.cpp')
| -rw-r--r-- | src/simulation/elements/BCOL.cpp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/simulation/elements/BCOL.cpp b/src/simulation/elements/BCOL.cpp index 3088dcf..d6e1612 100644 --- a/src/simulation/elements/BCOL.cpp +++ b/src/simulation/elements/BCOL.cpp @@ -57,29 +57,6 @@ int Element_BCOL::update(UPDATE_FUNC_ARGS) parts[i].life--; sim->create_part(-1, x+rand()%3-1, y+rand()%3-1, PT_FIRE); } - - for (rx=-2; rx<3; rx++) - for (ry=-2; ry<3; ry++) - if (BOUNDS_CHECK && (rx || ry)) - { - r = pmap[y+ry][x+rx]; - if (!r) - continue; - if (((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM)) - { - if (parts[i].life>100 && !(rand()%500)) { - parts[i].life = 99; - } - } - else if ((r&0xFF)==PT_LAVA) - { - if (parts[r>>8].ctype == PT_IRON && !(rand()%500)) { - parts[r>>8].ctype = PT_METL; - sim->kill_part(i); - return 1; - } - } - } /*if(100-parts[i].life > parts[i].tmp2) parts[i].tmp2 = 100-parts[i].life; if(parts[i].tmp2 < 0) parts[i].tmp2 = 0; |
