5 files changed, 4 insertions, 9 deletions
diff --git a/src/elements/plnt.c b/src/elements/plnt.c
index 20b542a..79c9d8a 100644
--- a/src/elements/plnt.c
+++ b/src/elements/plnt.c
@@ -38,8 +38,6 @@ int update_PLNT(UPDATE_FUNC_ARGS) {
 						parts[np].temp = parts[i].temp;
 					}
 				}
-				//if(t==PT_SNOW && (r&0xFF)==PT_WATR && 15>(rand()%1000))
-				//t = parts[i].type = PT_WATR;
 			}
 	if (parts[i].life==2)
 	{
diff --git a/src/elements/sprk.c b/src/elements/sprk.c
index 27e309a..891be3a 100644
--- a/src/elements/sprk.c
+++ b/src/elements/sprk.c
@@ -5,7 +5,7 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt, conduct_sprk, nearp, pavg, ct = parts[i].ctype;
 	if (parts[i].life<=0)
 	{
-		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)
+		if (ct==PT_WATR||ct==PT_SLTW||ct==PT_PSCN||ct==PT_NSCN||ct==PT_ETRD)
 			parts[i].temp = R_TEMP + 273.15f;
 		if (!ct)
 			ct = PT_METL;
@@ -33,7 +33,7 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
 			part_change_type(i,x,y,ct);
 			ct = parts[i].ctype = PT_NONE;
 			parts[i].life = 20;
-			part_change_type(i,(int)(parts[nearp].x+0.5f),(int)(parts[nearp].y+0.5f),PT_SPRK);
+			part_change_type(nearp,(int)(parts[nearp].x+0.5f),(int)(parts[nearp].y+0.5f),PT_SPRK);
 			parts[nearp].life = 9;
 			parts[nearp].ctype = PT_ETRD;
 		}
@@ -89,7 +89,7 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
 				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;
+					else if (ct==PT_NSCN && parts[r>>8].life>=10) parts[r>>8].life = 9;
 				}
 
 
diff --git a/src/elements/swch.c b/src/elements/swch.c
index 5d623cd..8a8e989 100644
--- a/src/elements/swch.c
+++ b/src/elements/swch.c
@@ -13,7 +13,7 @@ int update_SWCH(UPDATE_FUNC_ARGS) {
 					rt = r&0xFF;
 					if (rt==PT_SWCH)
 					{
-						if (parts[i].life==10&&parts[r>>8].life<10&&parts[r>>8].life>0)
+						if (parts[i].life>=10&&parts[r>>8].life<10&&parts[r>>8].life>0)
 							parts[i].life = 9;
 						else if (parts[i].life==0&&parts[r>>8].life==10)
 							parts[i].life = 10;
diff --git a/src/elements/thrm.c b/src/elements/thrm.c
index 41ecf94..3529c2e 100644
--- a/src/elements/thrm.c
+++ b/src/elements/thrm.c
@@ -24,8 +24,6 @@ int update_THRM(UPDATE_FUNC_ARGS) {
 						parts[i].tmp = 20;
 					}
 				}
-				//if(t==PT_SNOW && (r&0xFF)==PT_WATR && 15>(rand()%1000))
-				//t = parts[i].type = PT_WATR;
 			}
 	return 0;
 }
diff --git a/src/elements/wifi.c b/src/elements/wifi.c
index 0180b75..a6b9ab0 100644
--- a/src/elements/wifi.c
+++ b/src/elements/wifi.c
@@ -23,7 +23,6 @@ int update_WIFI(UPDATE_FUNC_ARGS) {
 				{
 					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;