A bit of refactoring (elements)

1 files changed, 0 insertions, 44 deletions

diff --git a/src/elements/swch.cpp b/src/elements/swch.cpp
deleted file mode 100644
index 4adc270..0000000
--- a/src/elements/swch.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "simulation/Element.h"
-
-int update_SWCH(UPDATE_FUNC_ARGS) {
-	int r, rt, rx, ry;
-	if (parts[i].life>0 && parts[i].life!=10)
-		parts[i].life--;
-	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)
-					continue;
-				if (sim->parts_avg(i,r>>8,PT_INSL)!=PT_INSL) {
-					rt = r&0xFF;
-					if (rt==PT_SWCH)
-					{
-						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)
-						{
-							//Set to other particle's life instead of 10, otherwise spark loops form when SWCH is sparked while turning on
-							parts[i].life = parts[r>>8].life;
-						}
-					}
-					else if (rt==PT_SPRK&&parts[i].life==10&&parts[r>>8].ctype!=PT_PSCN&&parts[r>>8].ctype!=PT_NSCN) {
-						sim->part_change_type(i,x,y,PT_SPRK);
-						parts[i].ctype = PT_SWCH;
-						parts[i].life = 4;
-					}
-				}
-			}
-	//turn off SWCH from two red BRAYS
-	if (parts[i].life==10 && (!(pmap[y-1][x-1]&0xFF) && ((pmap[y-1][x]&0xFF)==PT_BRAY&&parts[pmap[y-1][x]>>8].tmp==2) && !(pmap[y-1][x+1]&0xFF) && ((pmap[y][x+1]&0xFF)==PT_BRAY&&parts[pmap[y][x+1]>>8].tmp==2)))
-	{
-		parts[i].life = 9;
-	}
-	//turn on SWCH from two red BRAYS
-	else if (parts[i].life<=5 && (!(pmap[y-1][x-1]&0xFF) && (((pmap[y-1][x]&0xFF)==PT_BRAY&&parts[pmap[y-1][x]>>8].tmp==2) || ((pmap[y+1][x]&0xFF)==PT_BRAY&&parts[pmap[y+1][x]>>8].tmp==2)) && !(pmap[y-1][x+1]&0xFF) && (((pmap[y][x+1]&0xFF)==PT_BRAY&&parts[pmap[y][x+1]>>8].tmp==2) || ((pmap[y][x-1]&0xFF)==PT_BRAY&&parts[pmap[y][x-1]>>8].tmp==2))))
-	{
-		parts[i].life = 14;
-	}
-	return 0;
-}