Finish update function cleanup

1 files changed, 11 insertions, 16 deletions

diff --git a/src/elements/frzw.c b/src/elements/frzw.c
index fcdbda1..ac7170d 100644
--- a/src/elements/frzw.c
+++ b/src/elements/frzw.c
@@ -1,35 +1,30 @@
 #include <powder.h>
 
 int update_FRZW(UPDATE_FUNC_ARGS) {
-	int r;
-	for (nx=-1; nx<2; nx++)
-		for (ny=-1; ny<2; ny++)
-			if (x+nx>=0 && y+ny>0 &&
-			        x+nx<XRES && y+ny<YRES && (nx || ny))
+	int r, rx, ry;
+	for (rx=-1; rx<2; rx++)
+		for (ry=-1; ry<2; 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 (parts[r>>8].type==PT_WATR&&5>rand()%70)
+				if ((r&0xFF)==PT_WATR&&5>rand()%70)
 				{
-					parts[r>>8].type=PT_FRZW;
+					part_change_type(r>>8,x+rx,y+ry,PT_FRZW);
 				}
 			}
 	if (parts[i].life==0&&13>rand()%2500)
 	{
-		parts[i].type=PT_ICEI;
+		part_change_type(i,x,y,PT_ICEI);
 		parts[i].ctype=PT_FRZW;
-		parts[i].temp -= 200.0f;
-		if (parts[i].temp<0)
-			parts[i].temp = 0;
+		parts[i].temp = restrict_flt(parts[i].temp-200.0f, MIN_TEMP, MAX_TEMP);
 	}
 	else if ((100-(parts[i].life))>rand()%50000)
 	{
-		parts[i].type=PT_ICEI;
+		part_change_type(i,x,y,PT_ICEI);
 		parts[i].ctype=PT_FRZW;
-		parts[i].temp -= 200.0f;
-		if (parts[i].temp<0)
-			parts[i].temp = 0;
+		parts[i].temp = restrict_flt(parts[i].temp-200.0f, MIN_TEMP, MAX_TEMP);
 	}
 	return 0;
 }