Finish update function cleanup

1 files changed, 73 insertions, 61 deletions

diff --git a/src/elements/pyro.c b/src/elements/pyro.c
index f548928..3c5d83d 100644
--- a/src/elements/pyro.c
+++ b/src/elements/pyro.c
@@ -1,97 +1,109 @@
 #include <powder.h>
 
 int update_PYRO(UPDATE_FUNC_ARGS) {
-	int r, rt, lpv, t = parts[i].type;
+	int r, rx, ry, rt, t = parts[i].type;
 	if (t==PT_PLSM&&parts[i].ctype == PT_NBLE&&parts[i].life <=1)
 	{
-		parts[i].type = PT_NBLE;
+		t = PT_NBLE;
+		part_change_type(i,x,y,t);
 		parts[i].life = 0;
 	}
 	if (t==PT_FIRE && parts[i].life <=1 && parts[i].temp<625)
 	{
-		t = parts[i].type = PT_SMKE;
+		t = PT_SMKE;
+		part_change_type(i,x,y,t);
 		parts[i].life = rand()%20+250;
 	}
-	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))
+	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 (bmap[(y+ny)/CELL][(x+nx)/CELL] && bmap[(y+ny)/CELL][(x+nx)/CELL]!=WL_STREAM)
+				if (bmap[(y+ry)/CELL][(x+rx)/CELL] && bmap[(y+ry)/CELL][(x+rx)/CELL]!=WL_STREAM)
 					continue;
 				rt = parts[r>>8].type;
 				if ((a || ptypes[rt].explosive) && (t!=PT_SPRK || (rt!=PT_RBDM && rt!=PT_LRBD && rt!=PT_INSL && rt!=PT_SWCH)) &&
 				        !(t==PT_PHOT && rt==PT_INSL) &&
 				        (t!=PT_LAVA || parts[i].life>0 || (rt!=PT_STNE && rt!=PT_PSCN && rt!=PT_NSCN && rt!=PT_NTCT && rt!=PT_PTCT && rt!=PT_METL  && rt!=PT_IRON && rt!=PT_ETRD && rt!=PT_BMTL && rt!=PT_BRMT && rt!=PT_SWCH && rt!=PT_INWR && rt!=PT_QRTZ))
 				        && !(rt==PT_SPNG && parts[r>>8].life>0) &&
-				        ptypes[rt].flammable && (ptypes[rt].flammable + (int)(pv[(y+ny)/CELL][(x+nx)/CELL]*10.0f))>(rand()%1000))
+				        ptypes[rt].flammable && (ptypes[rt].flammable + (int)(pv[(y+ry)/CELL][(x+rx)/CELL]*10.0f))>(rand()%1000))
 				{
-					parts[r>>8].type = PT_FIRE;
-					parts[r>>8].temp = ptypes[PT_FIRE].heat + (ptypes[rt].flammable/2);
+					part_change_type(r>>8,x+rx,y+ry,PT_FIRE);
+					parts[r>>8].temp = restrict_flt(ptypes[PT_FIRE].heat + (ptypes[rt].flammable/2), MIN_TEMP, MAX_TEMP);
 					parts[r>>8].life = rand()%80+180;
 					if (ptypes[rt].explosive)
 						pv[y/CELL][x/CELL] += 0.25f * CFDS;
 					continue;
 				}
-				lpv = (int)pv[(y+ny)/CELL][(x+nx)/CELL];
+			}
+	if (legacy_enable) update_legacy_PYRO(UPDATE_FUNC_SUBCALL_ARGS);
+	return 0;
+}
+
+int update_legacy_PYRO(UPDATE_FUNC_ARGS) {
+	int r, rx, ry, rt, lpv, t = parts[i].type;
+	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+ry][x+rx];
+				if ((r>>8)>=NPART || !r)
+					continue;
+				if (bmap[(y+ry)/CELL][(x+rx)/CELL] && bmap[(y+ry)/CELL][(x+rx)/CELL]!=WL_STREAM)
+					continue;
+				rt = r&0xFF;
+				lpv = (int)pv[(y+ry)/CELL][(x+rx)/CELL];
 				if (lpv < 1) lpv = 1;
-				if (legacy_enable)
+				if (t!=PT_SPRK && ptypes[rt].meltable  && ((rt!=PT_RBDM && rt!=PT_LRBD) || t!=PT_SPRK) && ((t!=PT_FIRE&&t!=PT_PLSM) || (rt!=PT_METL && rt!=PT_IRON && rt!=PT_ETRD && rt!=PT_PSCN && rt!=PT_NSCN && rt!=PT_NTCT && rt!=PT_PTCT && rt!=PT_BMTL && rt!=PT_BRMT && rt!=PT_SALT && rt!=PT_INWR)) &&
+				        ptypes[rt].meltable*lpv>(rand()%1000))
+				{
+					if (t!=PT_LAVA || parts[i].life>0)
+					{
+						parts[r>>8].ctype = (rt==PT_BRMT)?PT_BMTL:parts[r>>8].type;
+						parts[r>>8].ctype = (parts[r>>8].ctype==PT_SAND)?PT_GLAS:parts[r>>8].ctype;
+						part_change_type(r>>8,x+rx,y+ry,PT_LAVA);
+						parts[r>>8].life = rand()%120+240;
+					}
+					else
+					{
+						parts[i].life = 0;
+						t = parts[i].type = (parts[i].ctype)?parts[i].ctype:PT_STNE;
+						parts[i].ctype = PT_NONE;//rt;
+						part_change_type(i,x,y,t);
+						return 1;
+					}
+				}
+				if (t!=PT_SPRK && (rt==PT_ICEI || rt==PT_SNOW))
 				{
-					if (t!=PT_SPRK && ptypes[rt].meltable  && ((rt!=PT_RBDM && rt!=PT_LRBD) || t!=PT_SPRK) && ((t!=PT_FIRE&&t!=PT_PLSM) || (rt!=PT_METL && rt!=PT_IRON && rt!=PT_ETRD && rt!=PT_PSCN && rt!=PT_NSCN && rt!=PT_NTCT && rt!=PT_PTCT && rt!=PT_BMTL && rt!=PT_BRMT && rt!=PT_SALT && rt!=PT_INWR)) &&
-					        ptypes[rt].meltable*lpv>(rand()%1000))
+					parts[r>>8].type = PT_WATR;
+					if (t==PT_FIRE)
 					{
-						if (t!=PT_LAVA || parts[i].life>0)
-						{
-							parts[r>>8].ctype = (parts[r>>8].type==PT_BRMT)?PT_BMTL:parts[r>>8].type;
-							parts[r>>8].ctype = (parts[r>>8].ctype==PT_SAND)?PT_GLAS:parts[r>>8].ctype;
-							parts[r>>8].type = PT_LAVA;
-							parts[r>>8].life = rand()%120+240;
-						}
-						else
-						{
-							parts[i].life = 0;
-							t = parts[i].type = (parts[i].ctype)?parts[i].ctype:PT_STNE;
-							parts[i].ctype = PT_NONE;//rt;
-							return 1;
-						}
+						kill_part(i);
+						return 1;
 					}
-					if (t!=PT_SPRK && (rt==PT_ICEI || rt==PT_SNOW))
+					if (t==PT_LAVA)
+					{
+						parts[i].life = 0;
+						t = parts[i].type = PT_STNE;
+						part_change_type(i,x,y,t);
+					}
+				}
+				if (t!=PT_SPRK && (rt==PT_WATR || rt==PT_DSTW || rt==PT_SLTW))
+				{
+					kill_part(r>>8);
+					if (t==PT_FIRE)
 					{
-						parts[r>>8].type = PT_WATR;
-						if (t==PT_FIRE)
-						{
-							parts[i].x = lx;
-							parts[i].y = ly;
-							kill_part(i);
-							return 1;
-						}
-						if (t==PT_LAVA)
-						{
-							parts[i].life = 0;
-							t = parts[i].type = PT_STNE;
-							return 1;
-						}
+						kill_part(i);
+						return 1;
 					}
-					if (t!=PT_SPRK && (rt==PT_WATR || rt==PT_DSTW || rt==PT_SLTW))
+					if (t==PT_LAVA)
 					{
-						kill_part(r>>8);
-						if (t==PT_FIRE)
-						{
-							parts[i].x = lx;
-							parts[i].y = ly;
-							kill_part(i);
-							return 1;
-						}
-						if (t==PT_LAVA)
-						{
-							parts[i].life = 0;
-							t = parts[i].type = (parts[i].ctype)?parts[i].ctype:PT_STNE;
-							parts[i].ctype = PT_NONE;
-							return 1;
-						}
+						parts[i].life = 0;
+						t = parts[i].type = (parts[i].ctype)?parts[i].ctype:PT_STNE;
+						parts[i].ctype = PT_NONE;
+						part_change_type(i,x,y,t);
 					}
 				}
 			}