A bit of refactoring (elements)

1 files changed, 0 insertions, 76 deletions

diff --git a/src/elements/acid.cpp b/src/elements/acid.cpp
deleted file mode 100644
index 8d881fd..0000000
--- a/src/elements/acid.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-#include "simulation/Element.h"
-
-int update_ACID(UPDATE_FUNC_ARGS) {
-	int r, rx, ry, trade, np;
-	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 ((r&0xFF)!=PT_ACID && (r&0xFF)!=PT_CAUS)
-				{
-					if ((r&0xFF)==PT_PLEX || (r&0xFF)==PT_NITR || (r&0xFF)==PT_GUNP || (r&0xFF)==PT_RBDM || (r&0xFF)==PT_LRBD)
-					{
-						sim->part_change_type(i,x,y,PT_FIRE);
-						sim->part_change_type(r>>8,x+rx,y+ry,PT_FIRE);
-						parts[i].life = 4;
-						parts[r>>8].life = 4;
-					}
-					else if ((r&0xFF)==PT_WTRV)
-					{
-						if(!(rand()%250))
-						{
-							sim->part_change_type(i, x, y, PT_CAUS);
-							parts[i].life = (rand()%50)+25;
-							sim->kill_part(r>>8);
-						}
-					}
-					else if (((r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PCLN && sim->ptypes[r&0xFF].hardness>(rand()%1000))&&parts[i].life>=50)
-					{
-						if (sim->parts_avg(i, r>>8,PT_GLAS)!= PT_GLAS)//GLAS protects stuff from acid
-						{
-							float newtemp = ((60.0f-(float)sim->ptypes[r&0xFF].hardness))*7.0f;
-							if(newtemp < 0){
-								newtemp = 0;
-							}
-							parts[i].temp += newtemp;
-							parts[i].life--;
-							sim->kill_part(r>>8);
-						}
-					}
-					else if (parts[i].life<=50)
-					{
-						sim->kill_part(i);
-						return 1;
-					}
-				}
-			}
-	for ( trade = 0; trade<2; trade ++)
-	{
-		rx = rand()%5-2;
-		ry = rand()%5-2;
-		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_ACID&&(parts[i].life>parts[r>>8].life)&&parts[i].life>0)//diffusion
-			{
-				int temp = parts[i].life - parts[r>>8].life;
-				if (temp ==1)
-				{
-					parts[r>>8].life ++;
-					parts[i].life --;
-				}
-				else if (temp>0)
-				{
-					parts[r>>8].life += temp/2;
-					parts[i].life -= temp/2;
-				}
-			}
-		}
-	}
-	return 0;
-}