Begin cleanup of update functions

1 files changed, 24 insertions, 25 deletions

diff --git a/src/elements/sprk.c b/src/elements/sprk.c
index 7496897..27e309a 100644
--- a/src/elements/sprk.c
+++ b/src/elements/sprk.c
@@ -2,15 +2,14 @@
 
 int update_SPRK(UPDATE_FUNC_ARGS) {
 	update_PYRO(UPDATE_FUNC_SUBCALL_ARGS);
-	int r, rt, conduct_sprk, nearp, pavg, ct = parts[i].ctype;
+	int r, rx, ry, rt, conduct_sprk, nearp, pavg, ct = parts[i].ctype;
 	if (parts[i].life<=0)
 	{
-		parts[i].type = ct;
 		if (ct!=PT_METL&&ct!=PT_PTCT&&ct!=PT_NTCT&&ct!=PT_IRON&&ct!=PT_BMTL&&ct!=PT_BRMT&&ct!=PT_LRBD&&ct!=PT_RBDM&&ct!=PT_BTRY&&ct!=PT_NBLE&&ct!=PT_QRTZ)
 			parts[i].temp = R_TEMP + 273.15f;
 		if (!ct)
 			ct = PT_METL;
-		parts[i].type = ct;
+		part_change_type(i,x,y,ct);
 		parts[i].life = 4;
 		if (ct == PT_WATR)
 			parts[i].life = 64;
@@ -30,11 +29,11 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
 		nearp = nearest_part(i, PT_ETRD);
 		if (nearp!=-1&&parts_avg(i, nearp, PT_INSL)!=PT_INSL)
 		{
-			create_line((int)parts[i].x, (int)parts[i].y, (int)parts[nearp].x, (int)parts[nearp].y, 0, 0, PT_PLSM);
-			parts[i].type = PT_ETRD;
+			create_line(x, y, (int)(parts[nearp].x+0.5f), (int)(parts[nearp].y+0.5f), 0, 0, PT_PLSM);
+			part_change_type(i,x,y,ct);
 			ct = parts[i].ctype = PT_NONE;
 			parts[i].life = 20;
-			parts[nearp].type = PT_SPRK;
+			part_change_type(i,(int)(parts[nearp].x+0.5f),(int)(parts[nearp].y+0.5f),PT_SPRK);
 			parts[nearp].life = 9;
 			parts[nearp].ctype = PT_ETRD;
 		}
@@ -42,33 +41,33 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
 	else if (ct==PT_NBLE&&parts[i].life<=1)
 	{
 		parts[i].life = rand()%150+50;
-		parts[i].type = PT_PLSM;
+		part_change_type(i,x,y,PT_PLSM);
 		parts[i].ctype = PT_NBLE;
 		parts[i].temp = 3500;
 		pv[y/CELL][x/CELL] += 1;
 	}
 	else if (ct==PT_IRON) {
-		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))
+		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 (((r&0xFF) == PT_DSTW && 30>(rand()/(RAND_MAX/1000))) ||
 					        ((r&0xFF) == PT_SLTW && 30>(rand()/(RAND_MAX/1000))) ||
 					        ((r&0xFF) == PT_WATR && 30>(rand()/(RAND_MAX/1000))))
 					{
-						parts[r>>8].type=PT_O2;
+						part_change_type(r>>8,x+rx,y+ry,PT_O2);
 						//parts[r>>8].tmp=(rand()/(RAND_MAX/10))+20;
 					}
 				}
 	}
-	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;
 				rt = parts[r>>8].type;
@@ -82,12 +81,12 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
 						parts[r>>8].life = 10;
 					}
 					if (ct==PT_NSCN) {
-						parts[r>>8].type = PT_SWCH;
+						part_change_type(r>>8,x+rx,y+ry,PT_SWCH);
 						parts[r>>8].ctype = PT_NONE;
 						parts[r>>8].life = 9;
 					}
 				}
-				else if ((ct==PT_PSCN||ct==PT_NSCN) && (rt==PT_PUMP||rt==PT_HSWC||(rt==PT_LCRY&&abs(nx)<2&&abs(ny)<2)))
+				else if ((ct==PT_PSCN||ct==PT_NSCN) && (rt==PT_PUMP||rt==PT_HSWC||(rt==PT_LCRY&&abs(rx)<2&&abs(ry)<2)))
 				{
 					if (ct==PT_PSCN) parts[r>>8].life = 10;
 					else if (ct==PT_NSCN) parts[r>>8].life = 9;
@@ -98,7 +97,7 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
 
 				if (pavg == PT_INSL) conduct_sprk = 0;
 				if (!(ptypes[rt].properties&PROP_CONDUCTS||rt==PT_INST)) conduct_sprk = 0;
-				if (abs(nx)+abs(ny)>=4 &&ct!=PT_SWCH&&rt!=PT_SWCH)
+				if (abs(rx)+abs(ry)>=4 &&ct!=PT_SWCH&&rt!=PT_SWCH)
 					conduct_sprk = 0;
 
 
@@ -121,7 +120,7 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
 				if (ct==PT_INST&&rt!=PT_NSCN) conduct_sprk = 0;
 				if (ct==PT_SWCH && (rt==PT_PSCN||rt==PT_NSCN||rt==PT_WATR||rt==PT_SLTW||rt==PT_NTCT||rt==PT_PTCT||rt==PT_INWR))
 					conduct_sprk = 0;
-				if (rt==PT_QRTZ && !((ct==PT_NSCN||ct==PT_METL||ct==PT_PSCN||ct==PT_QRTZ) && (parts[r>>8].temp<173.15||pv[(y+ny)/CELL][(x+nx)/CELL]>8)))
+				if (rt==PT_QRTZ && !((ct==PT_NSCN||ct==PT_METL||ct==PT_PSCN||ct==PT_QRTZ) && (parts[r>>8].temp<173.15||pv[(y+ry)/CELL][(x+rx)/CELL]>8)))
 					conduct_sprk = 0;
 				if (rt==PT_NTCT && !(ct==PT_NSCN || ct==PT_NTCT || (ct==PT_PSCN&&parts[r>>8].temp>373.0f)))
 					conduct_sprk = 0;
@@ -134,17 +133,17 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
 
 				if (conduct_sprk) {
 					if (ct==PT_ETRD) {
-						parts[i].type = PT_ETRD;
+						part_change_type(i,x,y,PT_ETRD);
 						parts[i].ctype = PT_NONE;
 						parts[i].life = 20;
-						parts[r>>8].type = PT_SPRK;
+						part_change_type(r>>8,x+rx,y+ry,PT_SPRK);
 						parts[r>>8].life = 4;
 						parts[r>>8].ctype = rt;
 					}
 					else if (rt==PT_WATR||rt==PT_SLTW) {
 						if (parts[r>>8].life==0 && (parts[i].life<2 || ((r>>8)<i && parts[i].life<3)))
 						{
-							parts[r>>8].type = PT_SPRK;
+							part_change_type(r>>8,x+rx,y+ry,PT_SPRK);
 							if (rt==PT_WATR) parts[r>>8].life = 6;
 							else parts[r>>8].life = 5;
 							parts[r>>8].ctype = rt;
@@ -153,13 +152,13 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
 					else if (rt==PT_INST) {
 						if (parts[i].life>=3&&parts[r>>8].life==0)
 						{
-							flood_parts(x+nx,y+ny,PT_SPRK,PT_INST,-1);//spark the wire
+							flood_parts(x+rx,y+ry,PT_SPRK,PT_INST,-1);//spark the wire
 						}
 					}
 					else if (parts[r>>8].life==0 && (parts[i].life<3 || ((r>>8)<i && parts[i].life<4))) {
 						parts[r>>8].life = 4;
 						parts[r>>8].ctype = rt;
-						rt = parts[r>>8].type = PT_SPRK;
+						part_change_type(r>>8,x+rx,y+ry,PT_SPRK);
 						if (parts[r>>8].temp+10.0f<673.0f&&!legacy_enable&&(rt==PT_METL||rt==PT_BMTL||rt==PT_BRMT||rt==PT_PSCN||rt==PT_NSCN||rt==PT_ETRD||rt==PT_NBLE||rt==PT_IRON))
 							parts[r>>8].temp = parts[r>>8].temp+10.0f;
 					}