Begin cleanup of update functions

15 files changed, 250 insertions, 186 deletions

diff --git a/src/elements/acid.c b/src/elements/acid.c
index b42379a..18f3891 100644
--- a/src/elements/acid.c
+++ b/src/elements/acid.c
@@ -1,36 +1,34 @@
 #include <powder.h>
 
 int update_ACID(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_ACID)
 				{
 					if ((r&0xFF)==PT_PLEX || (r&0xFF)==PT_NITR || (r&0xFF)==PT_GUNP || (r&0xFF)==PT_RBDM || (r&0xFF)==PT_LRBD)
 					{
-						parts[i].type = PT_FIRE;
+						part_change_type(i,x,y,PT_FIRE);
+						part_change_type(r>>8,x+rx,y+ry,PT_FIRE);
 						parts[i].life = 4;
-						parts[r>>8].type = PT_FIRE;
 						parts[r>>8].life = 4;
 					}
-					else if (((r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PCLN && ptypes[parts[r>>8].type].hardness>(rand()%1000))&&parts[i].life>=50)
+					else if (((r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PCLN && ptypes[r&0xFF].hardness>(rand()%1000))&&parts[i].life>=50)
 					{
 						if (parts_avg(i, r>>8,PT_GLAS)!= PT_GLAS)
 						{
 							parts[i].life--;
-							parts[r>>8].type = PT_NONE;
-							return 1;
+							kill_part(r>>8);
 						}
 					}
 					else if (parts[i].life<=50)
 					{
-						parts[i].life = 0;
-						parts[i].type = PT_NONE;
+						kill_part(i);
 						return 1;
 					}
 				}
diff --git a/src/elements/dstw.c b/src/elements/dstw.c
index 1e98851..ae6db18 100644
--- a/src/elements/dstw.c
+++ b/src/elements/dstw.c
@@ -1,36 +1,31 @@
 #include <powder.h>
 
 int update_DSTW(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)
+				if ((r&0xFF)==PT_SALT && 1>(rand()%250))
 				{
-					parts[i].type = PT_WTRV;
-				}
-				else if ((r&0xFF)==PT_SALT && 1>(rand()%250))
-				{
-					parts[i].type = PT_SLTW;
-					parts[r>>8].type = PT_SLTW;
+					part_change_type(i,x,y,PT_SLTW);
+					part_change_type(r>>8,x+rx,y+ry,PT_SLTW);
 				}
 				if (((r&0xFF)==PT_WATR||(r&0xFF)==PT_SLTW) && 1>(rand()%500))
 				{
-					parts[i].type = PT_WATR;
+					part_change_type(i,x,y,PT_WATR);
 				}
 				if ((r&0xFF)==PT_SLTW && 1>(rand()%500))
 				{
-					parts[i].type = PT_SLTW;
+					part_change_type(i,x,y,PT_SLTW);
 				}
 				if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && (legacy_enable||parts[i].temp>12.0f) && 1>(rand()%500))
 				{
+					part_change_type(i,x,y,PT_FIRE);
 					parts[i].life = 4;
-					parts[i].type = PT_FIRE;
 				}
 			}
 	return 0;
diff --git a/src/elements/legacy.c b/src/elements/legacy.c
new file mode 100644
index 0000000..70d4e99
--- /dev/null
+++ b/src/elements/legacy.c
@@ -0,0 +1,77 @@
+#include <powder.h>
+
+// Interactions which only occur when legacy_enable is on
+int update_legacy_all(UPDATE_FUNC_ARGS) {
+	if (!legacy_enable) return 0;
+	int r, rx, ry, rt;
+	int t = parts[i].type;
+	if (t==PT_WTRV) {
+		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 (((r&0xFF)==PT_WATR||(r&0xFF)==PT_DSTW||(r&0xFF)==PT_SLTW) && 1>(rand()%1000))
+					{
+						part_change_type(i,x,y,PT_WATR);
+						part_change_type(r>>8,x+rx,y+ry,PT_WATR);
+					}
+					if (((r&0xFF)==PT_ICEI || (r&0xFF)==PT_SNOW) && 1>(rand()%1000))
+					{
+						part_change_type(i,x,y,PT_WATR);
+						if (1>(rand()%1000))
+							part_change_type(r>>8,x+nx,y+ny,PT_WATR);
+					}
+				}
+	}
+	else if (t==PT_WATR) {
+		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 (((r&0xFF)==PT_FIRE || (r&0xFF)==PT_LAVA) && 1>(rand()%10))
+					{
+						part_change_type(i,x,y,PT_WTRV);
+					}
+				}
+	}
+	else if (t==PT_SLTW) {
+		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 (((r&0xFF)==PT_FIRE || (r&0xFF)==PT_LAVA) && 1>(rand()%10))
+					{
+						part_change_type(i,x,y,PT_SALT);
+						part_change_type(r>>8,x+rx,y+ry,PT_WTRV);
+					}
+				}
+	}
+	else if (t==PT_DSTW) {
+		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 (((r&0xFF)==PT_FIRE || (r&0xFF)==PT_LAVA) && 1>(rand()%10))
+					{
+						part_change_type(i,x,y,PT_WTRV);
+					}
+				}
+	}
+	return 0;
+}
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;
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;
 					}
diff --git a/src/elements/swch.c b/src/elements/swch.c
index a57f70c..2c538cc 100644
--- a/src/elements/swch.c
+++ b/src/elements/swch.c
@@ -1,17 +1,16 @@
 #include <powder.h>
 
 int update_SWCH(UPDATE_FUNC_ARGS) {
-	int r, rt;
-	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, rt, 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 (parts_avg(i,r>>8,PT_INSL)!=PT_INSL) {
-					rt = parts[r>>8].type; // not r&0xFF because pmap is not yet always updated (TODO)
+					rt = r&0xFF;
 					if (rt==PT_SWCH)
 					{
 						if (parts[i].life==10&&parts[r>>8].life<10&&parts[r>>8].life>0)
@@ -20,7 +19,7 @@ int update_SWCH(UPDATE_FUNC_ARGS) {
 							parts[i].life = 10;
 					}
 					else if (rt==PT_SPRK&&parts[i].life==10&&parts[r>>8].ctype!=PT_PSCN&&parts[r>>8].ctype!=PT_NSCN) {
-						parts[i].type = PT_SPRK;
+						part_change_type(i,x,y,PT_SPRK);
 						parts[i].ctype = PT_SWCH;
 						parts[i].life = 4;
 					}
diff --git a/src/elements/thdr.c b/src/elements/thdr.c
index 3d46f9d..0f25ccd 100644
--- a/src/elements/thdr.c
+++ b/src/elements/thdr.c
@@ -1,20 +1,19 @@
 #include <powder.h>
 
 int update_THDR(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 ((ptypes[r&0xFF].properties&PROP_CONDUCTS) && parts[r>>8].life==0 && !((r&0xFF)==PT_WATR||(r&0xFF)==PT_SLTW) && parts[r>>8].ctype!=PT_SPRK)
 				{
 					parts[i].type = PT_NONE;
 					parts[r>>8].ctype = parts[r>>8].type;
-					parts[r>>8].type = PT_SPRK;
+					part_change_type(r>>8,x+rx,y+ry,PT_SPRK);
 					parts[r>>8].life = 4;
 				}
 				else if ((r&0xFF)!=PT_CLNE&&(r&0xFF)!=PT_THDR&&(r&0xFF)!=PT_SPRK&&(r&0xFF)!=PT_DMND&&(r&0xFF)!=PT_FIRE&&(r&0xFF)!=PT_NEUT&&(r&0xFF)!=PT_PHOT&&(r&0xFF))
@@ -23,7 +22,7 @@ int update_THDR(UPDATE_FUNC_ARGS) {
 					if (legacy_enable&&1>(rand()%200))
 					{
 						parts[i].life = rand()%50+120;
-						parts[i].type = PT_FIRE;
+						part_change_type(i,x,y,PT_FIRE);
 					}
 					else
 					{
@@ -31,5 +30,9 @@ int update_THDR(UPDATE_FUNC_ARGS) {
 					}
 				}
 			}
+	if (parts[i].type==PT_NONE) {
+		kill_part(i);
+		return 1;
+	}
 	return 0;
 }
diff --git a/src/elements/thrm.c b/src/elements/thrm.c
index 3d82d46..41ecf94 100644
--- a/src/elements/thrm.c
+++ b/src/elements/thrm.c
@@ -1,23 +1,23 @@
 #include <powder.h>
 
 int update_THRM(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_PLSM || (r&0xFF)==PT_LAVA))
+				if (((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM || (r&0xFF)==PT_LAVA)) // TODO: could this go in update_PYRO?
 				{
 					if (1>(rand()%500)) {
-						parts[i].type = PT_LAVA;
+						part_change_type(i,x,y,PT_LAVA);
 						parts[i].ctype = PT_BMTL;
 						parts[i].temp = 3500.0f;
 						pv[y/CELL][x/CELL] += 50.0f;
 					} else {
-						parts[i].type = PT_LAVA;
+						part_change_type(i,x,y,PT_LAVA);
 						parts[i].life = 400;
 						parts[i].ctype = PT_THRM;
 						parts[i].temp = 3500.0f;
diff --git a/src/elements/vine.c b/src/elements/vine.c
index 3932263..a5d932a 100644
--- a/src/elements/vine.c
+++ b/src/elements/vine.c
@@ -1,22 +1,20 @@
 #include <powder.h>
 
 int update_VINE(UPDATE_FUNC_ARGS) {
-	int r;
-	nx=(rand()%3)-1;
-	ny=(rand()%3)-1;
-	if (x+nx>=0 && y+ny>0 &&
-	        x+nx<XRES && y+ny<YRES && (nx || ny))
+	int r, np, rx =(rand()%3)-1, ry=(rand()%3)-1;
+	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)
-			return 1;
+			return 0;
 		if (1>rand()%15)
-			parts[i].type=PT_PLNT;
+			part_change_type(i,x,y,PT_PLNT);
 		else if (!r)
 		{
-			create_part(-1,x+nx,y+ny,PT_VINE);
-			parts[pmap[y+ny][x+nx]>>8].temp = parts[i].temp;
-			parts[i].type=PT_PLNT;
+			np = create_part(-1,x+rx,y+ry,PT_VINE);
+			if (np<0) return 0;
+			parts[np].temp = parts[i].temp;
+			part_change_type(i,x,y,PT_PLNT);
 		}
 	}
 	return 0;
diff --git a/src/elements/warp.c b/src/elements/warp.c
index 92881ed..d0fe62c 100644
--- a/src/elements/warp.c
+++ b/src/elements/warp.c
@@ -1,23 +1,25 @@
 #include <powder.h>
 
 int update_WARP(UPDATE_FUNC_ARGS) {
-	int trade, r;
+	int trade, r, rx, ry;
 	for ( trade = 0; trade<5; trade ++)
 	{
-		nx = rand()%3-1;
-		ny = rand()%3-1;
-		if (x+nx>=0 && y+ny>0 && x+nx<XRES && y+ny<YRES && (nx || ny))
+		rx = rand()%3-1;
+		ry = rand()%3-1;
+		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_WARP&&parts[r>>8].type!=PT_STKM&&parts[r>>8].type!=PT_DMND&&parts[r>>8].type!=PT_CLNE&&parts[r>>8].type!=PT_BCLN&&parts[r>>8].type!=PT_PCLN&&(10>=rand()%200))
+			if ((r&0xFF)!=PT_WARP&&(r&0xFF)!=PT_STKM&&(r&0xFF)!=PT_STKM2&&(r&0xFF)!=PT_DMND&&(r&0xFF)!=PT_CLNE&&(r&0xFF)!=PT_BCLN&&(r&0xFF)!=PT_PCLN&&(10>=rand()%200))
 			{
 				parts[i].x = parts[r>>8].x;
 				parts[i].y = parts[r>>8].y;
 				parts[r>>8].x = x;
 				parts[r>>8].y = y;
 				parts[i].life += 4;
+				pmap[y][x] = r;
+				pmap[y+ry][x+rx] = (i<<8)|parts[i].type;
 				trade = 5;
 			}
 		}
diff --git a/src/elements/watr.c b/src/elements/watr.c
index 6583422..8f1df18 100644
--- a/src/elements/watr.c
+++ b/src/elements/watr.c
@@ -1,33 +1,28 @@
 #include <powder.h>
 
 int update_WATR(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)
+				if ((r&0xFF)==PT_SALT && 1>(rand()%250))
 				{
-					parts[i].type = PT_WTRV;
+					part_change_type(i,x,y,PT_SLTW);
+					part_change_type(r>>8,x+rx,y+ry,PT_SLTW);
 				}
-				else if ((r&0xFF)==PT_SALT && 1>(rand()%250))
-				{
-					parts[i].type = PT_SLTW;
-					parts[r>>8].type = PT_SLTW;
-				}
-				if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && (legacy_enable||parts[i].temp>12.0f) && 1>(rand()%500))
+				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;
 				}
 				if ((r&0xFF)==PT_CNCT && 1>(rand()%500))
 				{
-					parts[i].type = PT_PSTE;
-					parts[r>>8].type = PT_NONE;
+					part_change_type(i,x,y,PT_PSTE);
+					kill_part(r>>8);
 				}
 			}
 	return 0;
diff --git a/src/elements/wifi.c b/src/elements/wifi.c
index 85ede6c..fb1a522e 100644
--- a/src/elements/wifi.c
+++ b/src/elements/wifi.c
@@ -1,42 +1,47 @@
 #include <powder.h>
 
 int update_WIFI(UPDATE_FUNC_ARGS) {
-	int r, temp, temprange = 100;
+	int r, rx, ry, temp, temprange = 100;
 	for ( temp = 0; temp < MAX_TEMP; temp += temprange)
 		if (parts[i].temp-73.15>temp&&parts[i].temp-73.15 <temp+temprange)
 			parts[i].tmp = temp/100;
-	for (ny=-1; ny<2; ny++)
-		for (nx=-1; nx<2; nx++)
-			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 (parts[r>>8].type==PT_NSCN&&parts[r>>8].life==0 && wireless[parts[i].tmp][0])
+				if (wireless[parts[i].tmp][0])
 				{
-					parts[r>>8].type = PT_SPRK;
-					parts[r>>8].ctype = PT_NSCN;
-					parts[r>>8].life = 4;
+					if ((r&0xFF)==PT_NSCN&&parts[r>>8].life==0 && wireless[parts[i].tmp][0])
+					{
+						part_change_type(r>>8,x+rx,y+ry,PT_SPRK);
+						parts[r>>8].ctype = PT_NSCN;
+						parts[r>>8].life = 4;
+					}
+					else if ((r&0xFF)==PT_PSCN&&parts[r>>8].life==0 && wireless[parts[i].tmp][0])
+					{
+						part_change_type(r>>8,x+rx,y+ry,PT_SPRK);
+						parts[r>>8].ctype = PT_PSCN;
+						parts[r>>8].life = 4;
+					}
+					else if ((r&0xFF)==PT_INWR&&parts[r>>8].life==0 && wireless[parts[i].tmp][0])
+					{
+						part_change_type(r>>8,x+rx,y+ry,PT_SPRK);
+						parts[r>>8].ctype = PT_INWR;
+						parts[r>>8].life = 4;
+					}
 				}
-				else if (parts[r>>8].type==PT_PSCN&&parts[r>>8].life==0 && wireless[parts[i].tmp][0])
+				else
 				{
-					parts[r>>8].type = PT_SPRK;
-					parts[r>>8].ctype = PT_PSCN;
-					parts[r>>8].life = 4;
-				}
-				else if (parts[r>>8].type==PT_INWR&&parts[r>>8].life==0 && wireless[parts[i].tmp][0])
-				{
-					parts[r>>8].type = PT_SPRK;
-					parts[r>>8].ctype = PT_INWR;
-					parts[r>>8].life = 4;
-				}
-				else if (parts[r>>8].type==PT_SPRK && parts[r>>8].ctype!=PT_NSCN && parts[r>>8].life>=3 && !wireless[parts[i].tmp][0])
-				{
-					//parts[r>>8].type = parts[r>>8].ctype;
-					wireless[parts[i].tmp][0] = 1;
-					wireless[parts[i].tmp][1] = 1;
-					ISWIRE = 1;
+					if ((r&0xFF)==PT_SPRK && parts[r>>8].ctype!=PT_NSCN && parts[r>>8].life>=3)
+					{
+						//parts[r>>8].type = parts[r>>8].ctype;
+						wireless[parts[i].tmp][0] = 1;
+						wireless[parts[i].tmp][1] = 1;
+						ISWIRE = 1;
+					}
 				}
 			}
 	return 0;
diff --git a/src/elements/wtrv.c b/src/elements/wtrv.c
index ff7b869..45ffb30 100644
--- a/src/elements/wtrv.c
+++ b/src/elements/wtrv.c
@@ -1,32 +1,18 @@
 #include <powder.h>
 
 int update_WTRV(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_WATR||(r&0xFF)==PT_DSTW||(r&0xFF)==PT_SLTW) && 1>(rand()%1000) && legacy_enable)
-				{
-					parts[i].type = PT_WATR;
-					parts[r>>8].type = PT_WATR;
-				}
-
-				if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && parts[i].temp>12.0f && 1>(rand()%500))
+				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;
-
-				}
-				if (((r&0xFF)==PT_ICEI || (r&0xFF)==PT_SNOW) && 1>(rand()%1000) && legacy_enable)
-				{
-					parts[i].type = PT_WATR;
-					if (1>(rand()%1000))
-						parts[r>>8].type = PT_WATR;
 				}
 			}
 	return 0;
diff --git a/src/elements/yest.c b/src/elements/yest.c
index 26bbbe9..d3ee0fe 100644
--- a/src/elements/yest.c
+++ b/src/elements/yest.c
@@ -1,18 +1,17 @@
 #include <powder.h>
 
 int update_YEST(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_DYST && 1>(rand()%30) && !legacy_enable)
 				{
-					parts[i].type = PT_DYST;
+					part_change_type(i,x,y,PT_DYST);
 				}
 			}
 	if (parts[i].temp>303&&parts[i].temp<317) {
diff --git a/src/powder.c b/src/powder.c
index 1124296..052415b 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -416,7 +416,7 @@ void kill_part(int i)
 		{
 			ISSPAWN2 = 0;
 		}
-		if (x>=0 && y>=0 && x<XRES && y<YRES)
+		if (x>=0 && y>=0 && x<XRES && y<YRES && (pmap[y][x]>>8)==i)
 			pmap[y][x] = 0;
 	}
 
@@ -426,6 +426,21 @@ void kill_part(int i)
 }
 
 #if defined(WIN32) && !defined(__GNUC__)
+_inline void part_change_type(int n, int x, int y, int t)
+#else
+inline void part_change_type(int i, int x, int y, int t)
+#endif
+{
+	if (x<0 || y<0 || x>=XRES || y>=YRES || i>=NPART)
+		return -1;
+	parts[i].type = t;
+	if (t!=PT_STKM&&t!=PT_STKM2 && t!=PT_PHOT)// && t!=PT_NEUT)
+		pmap[y][x] = t|(i<<8);
+	else if ((pmap[y][x]>>8)==i)
+		pmap[y][x] = 0;
+}
+
+#if defined(WIN32) && !defined(__GNUC__)
 _inline int create_n_parts(int n, int x, int y, int t)
 #else
 inline int create_n_parts(int n, int x, int y, float vx, float vy, int t)
@@ -1676,6 +1691,8 @@ void update_particles_i(pixel *vid, int start, int inc)
 				if ((*(ptypes[t].update_func))(i,x,y,nx,ny,lx,ly,a))
 					continue;
 			}
+			if (legacy_enable)
+				update_legacy_all(i,x,y,nx,ny,lx,ly,a);
 			if (ptypes[t].properties&PROP_LIFE)
 			{
 				if (parts[i].temp>0)