Begin cleanup of update functions

1 files changed, 10 insertions, 19 deletions

diff --git a/src/elements/sltw.c b/src/elements/sltw.c
index e45a03d..7f23f1c 100644
--- a/src/elements/sltw.c
+++ b/src/elements/sltw.c
@@ -1,31 +1,22 @@
 #include <powder.h>
 
 int update_SLTW(UPDATE_FUNC_ARGS) {
-	int r;
-	for (nx=-2; nx<3; nx++)
-		for (ny=-2; ny<3; ny++)
-			if (x+nx>=0 && y+ny>0 &&
-			        x+nx<XRES && y+ny<YRES && (nx || ny))
+	int r, rx, ry;
+	for (rx=-2; rx<3; rx++)
+		for (ry=-2; ry<3; ry++)
+			if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
 			{
-				r = pmap[y+ny][x+nx];
+				r = pmap[y+ry][x+rx];
 				if ((r>>8)>=NPART || !r)
 					continue;
-				if (((r&0xFF)==PT_FIRE || (r&0xFF)==PT_LAVA) && 1>(rand()%10) && legacy_enable)
-				{
-					parts[i].type = PT_SALT;
-					parts[r>>8].type = PT_WTRV;
-				}
-				else if ((r&0xFF)==PT_SALT && 1>(rand()%10000))
-				{
-					parts[r>>8].type = PT_NONE;
-				}
+				if ((r&0xFF)==PT_SALT && 1>(rand()%10000))
+					kill_part(r>>8);
 				if ((r&0xFF)==PT_PLNT&&5>(rand()%1000))
-					parts[r>>8].type = PT_NONE;
-				if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && parts[i].temp>12.0f && 1>(rand()%500))
+					kill_part(r>>8);
+				if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && !legacy_enable && parts[i].temp>(273.15f+12.0f) && 1>(rand()%500))
 				{
+					part_change_type(i,x,y,PT_FIRE);
 					parts[i].life = 4;
-					parts[i].type = PT_FIRE;
-
 				}
 			}
 	return 0;