summaryrefslogtreecommitdiff
path: root/src/simulation/elements/SLTW.cpp
diff options
context:
space:
mode:
authorSimon 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)
commitb4564f212a17539604e9fa63d649e157f8888eb1 (patch)
tree9ed998180f825d79eaa753c28b34136822a8c928 /src/simulation/elements/SLTW.cpp
parentf05044ab68e51ce9c374f6af09284051efcda449 (diff)
parent3a738846a3e0c59ed02805f11f93678ae42a946e (diff)
downloadpowder-b4564f212a17539604e9fa63d649e157f8888eb1.zip
powder-b4564f212a17539604e9fa63d649e157f8888eb1.tar.gz
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/simulation/elements/SLTW.cpp')
-rw-r--r--src/simulation/elements/SLTW.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/simulation/elements/SLTW.cpp b/src/simulation/elements/SLTW.cpp
index 9cc3bbf..7c38286 100644
--- a/src/simulation/elements/SLTW.cpp
+++ b/src/simulation/elements/SLTW.cpp
@@ -50,24 +50,24 @@ Element_SLTW::Element_SLTW()
int Element_SLTW::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];
switch (r&0xFF)
{
case PT_SALT:
- if (!(rand()%10000))
+ if (!(rand()%3333))
sim->part_change_type(r>>8,x+rx,y+ry,PT_SLTW);
break;
case PT_PLNT:
- if (!(rand()%200))
+ if (!(rand()%66))
sim->kill_part(r>>8);
break;
case PT_RBDM:
case PT_LRBD:
- if ((sim->legacy_enable||parts[i].temp>(273.15f+12.0f)) && !(rand()%500))
+ if ((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;