diff options
| author | Saveliy Skresanov <savask@yandex.ru> | 2013-03-16 16:03:02 (GMT) |
|---|---|---|
| committer | Saveliy Skresanov <savask@yandex.ru> | 2013-03-16 16:03:02 (GMT) |
| commit | 43974d8537195f5dabc239562b35874335b949f7 (patch) | |
| tree | 8a3e613de9f265c99fbf9ffde5f3f142eb575721 /src/simulation/elements/WATR.cpp | |
| parent | d383d6d7e5e1d3ca0856c02ebbcea5e9b8b2ff4e (diff) | |
| download | powder-43974d8537195f5dabc239562b35874335b949f7.zip powder-43974d8537195f5dabc239562b35874335b949f7.tar.gz | |
Narrowed loops for all elements in the first list.
Probabilities might be messed up a bit, I'm not sure.
Diffstat (limited to 'src/simulation/elements/WATR.cpp')
| -rw-r--r-- | src/simulation/elements/WATR.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/simulation/elements/WATR.cpp b/src/simulation/elements/WATR.cpp index 288c763..64b777f 100644 --- a/src/simulation/elements/WATR.cpp +++ b/src/simulation/elements/WATR.cpp @@ -50,21 +50,21 @@ Element_WATR::Element_WATR() int Element_WATR::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) continue; - if ((r&0xFF)==PT_SALT && !(rand()%250)) + if ((r&0xFF)==PT_SALT && !(rand()%83)) { sim->part_change_type(i,x,y,PT_SLTW); // on average, convert 3 WATR to SLTW before SALT turns into SLTW if (!(rand()%3)) sim->part_change_type(r>>8,x+rx,y+ry,PT_SLTW); } - else if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && (sim->legacy_enable||parts[i].temp>(273.15f+12.0f)) && !(rand()%500)) + else if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && (sim->legacy_enable||parts[i].temp>(273.15f+12.0f)) && !(rand()%166)) { sim->part_change_type(i,x,y,PT_FIRE); parts[i].life = 4; @@ -72,7 +72,7 @@ int Element_WATR::update(UPDATE_FUNC_ARGS) } else if ((r&0xFF)==PT_FIRE && parts[r>>8].ctype!=PT_WATR){ sim->kill_part(r>>8); - if(!(rand()%150)){ + if(!(rand()%50)){ sim->kill_part(i); return 1; } |