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/CO2.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/CO2.cpp')
| -rw-r--r-- | src/simulation/elements/CO2.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/simulation/elements/CO2.cpp b/src/simulation/elements/CO2.cpp index f30273c..eb4bcb6 100644 --- a/src/simulation/elements/CO2.cpp +++ b/src/simulation/elements/CO2.cpp @@ -50,14 +50,14 @@ Element_CO2::Element_CO2() int Element_CO2::update(UPDATE_FUNC_ARGS) { int r, rx, ry; - for (rx=-2; rx<3; rx++) - for (ry=-2; ry<3; ry++) + for (rx=-1; rx<2; rx++) + for (ry=-1; ry<2; ry++) if (BOUNDS_CHECK && (rx || ry)) { r = pmap[y+ry][x+rx]; if (!r) { - if (parts[i].ctype==5 && !(rand()%83)) + if (parts[i].ctype==5 && !(rand()%27)) { if (sim->create_part(-1, x+rx, y+ry, PT_WATR)>=0) parts[i].ctype = 0; @@ -66,12 +66,12 @@ int Element_CO2::update(UPDATE_FUNC_ARGS) } if ((r&0xFF)==PT_FIRE){ sim->kill_part(r>>8); - if(!(rand()%150)){ + if(!(rand()%50)){ sim->kill_part(i); return 1; } } - else if (((r&0xFF)==PT_WATR || (r&0xFF)==PT_DSTW) && !(rand()%250)) + else if (((r&0xFF)==PT_WATR || (r&0xFF)==PT_DSTW) && !(rand()%83)) { sim->part_change_type(r>>8, x+rx, y+ry, PT_CBNW); if (parts[i].ctype==5) //conserve number of water particles - ctype=5 means this CO2 hasn't released the water particle from BUBW yet |