A bit of refactoring (elements)

1 files changed, 0 insertions, 234 deletions

diff --git a/src/elements/soap.cpp b/src/elements/soap.cpp
deleted file mode 100644
index 0d1054f..0000000
--- a/src/elements/soap.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-#include "simulation/Element.h"
-
-int update_SOAP(UPDATE_FUNC_ARGS) 
-{
-	int r, rx, ry, nr, ng, nb, na;
-	float tr, tg, tb, ta;
-	float blend;
-	
-	//0x01 - bubble on/off
-	//0x02 - first mate yes/no
-	//0x04 - "back" mate yes/no
-
-	if ((parts[i].ctype&1) == 1)
-	{
-		if (parts[i].temp>0)
-		{
-			if (parts[i].life<=0)
-			{
-				if ((parts[i].ctype&6) != 6 && parts[i].ctype>1)
-				{
-					int target;
-
-					target = i;
-
-					while((parts[target].ctype&6) != 6 && parts[target].ctype>1)
-					{
-						if ((parts[target].ctype&2) == 2)
-						{
-							target = parts[target].tmp;
-							sim->detach(target);
-						}
-
-						if ((parts[target].ctype&4) == 4)
-						{
-							target = parts[target].tmp2;
-							sim->detach(target);
-						}
-					}
-				}
-
-				if ((parts[i].ctype&6) != 6)
-					parts[i].ctype = 0;
-
-				if ((parts[i].ctype&6) == 6 && (parts[parts[i].tmp].ctype&6) == 6 && parts[parts[i].tmp].tmp == i)
-					sim->detach(i);
-			}
-
-			parts[i].vy -= 0.1f;
-
-			parts[i].vy *= 0.5f;
-			parts[i].vx *= 0.5f;
-		}
-
-		if((parts[i].ctype&2) != 2)
-		{
-			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 ((parts[r>>8].type == PT_SOAP) && ((parts[r>>8].ctype&1) == 1) 
-								&& ((parts[r>>8].ctype&4) != 4))
-						{
-							if ((parts[r>>8].ctype&2) == 2)
-							{
-								parts[i].tmp = r>>8;
-								parts[r>>8].tmp2 = i;
-
-								parts[i].ctype |= 2;
-								parts[r>>8].ctype |= 4;
-							}
-							else
-							{
-								if ((parts[i].ctype&2) != 2)
-								{
-									parts[i].tmp = r>>8;
-									parts[r>>8].tmp2 = i;
-
-									parts[i].ctype |= 2;
-									parts[r>>8].ctype |= 4;
-								}
-							}
-						}
-					}
-		}
-		else
-		{
-			if (parts[i].life<=0)
-				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 && !sim->bmap[(y+ry)/CELL][(x+rx)/CELL])
-								continue;
-
-							if (parts[i].temp>0)
-							{
-								if (sim->bmap[(y+ry)/CELL][(x+rx)/CELL]
-										|| (r && sim->ptypes[r&0xFF].state != ST_GAS
-											&& (r&0xFF) != PT_SOAP && (r&0xFF) != PT_GLAS) 
-										|| (parts[r>>8].ctype == 0 && (r&0xFF) == PT_SOAP 
-											&& (abs(parts[r>>8].vx)<2 || abs(parts[r>>8].vy)<2)))
-								{
-									sim->detach(i);
-									continue;
-								}
-							}
-
-							if ((r&0xFF) == PT_SOAP && parts[r>>8].ctype == 1)
-							{
-								int buf;
-
-								buf = parts[i].tmp;
-
-								parts[i].tmp = r>>8;
-								parts[buf].tmp2 = r>>8;
-								parts[r>>8].tmp2 = i;
-								parts[r>>8].tmp = buf;
-								parts[r>>8].ctype = 7;
-							}
-
-							if ((r&0xFF) == PT_SOAP && parts[r>>8].ctype == 7 && parts[i].tmp != r>>8 && parts[i].tmp2 != r>>8)
-							{
-								int buf;
-
-								parts[parts[i].tmp].tmp2 = parts[r>>8].tmp2;
-								parts[parts[r>>8].tmp2].tmp = parts[i].tmp;
-								parts[r>>8].tmp2 = i;
-								parts[i].tmp = r>>8;
-							}
-						}
-		}
-
-		if((parts[i].ctype&2) == 2)
-		{
-			float d, dx, dy;
-
-			dx = parts[i].x - parts[parts[i].tmp].x;
-			dy = parts[i].y - parts[parts[i].tmp].y;
-
-			d = 9/(pow(dx, 2)+pow(dy, 2)+9)-0.5;
-
-			parts[parts[i].tmp].vx -= dx*d;
-			parts[parts[i].tmp].vy -= dy*d;
-
-			parts[i].vx += dx*d;
-			parts[i].vy += dy*d;
-
-			if (((parts[parts[i].tmp].ctype&2) == 2) && ((parts[parts[i].tmp].ctype&1) == 1) 
-					&& ((parts[parts[parts[i].tmp].tmp].ctype&2) == 2) && ((parts[parts[parts[i].tmp].tmp].ctype&1) == 1))
-			{
-				int ii;
-
-				ii = parts[parts[parts[i].tmp].tmp].tmp;
-
-				dx = parts[ii].x - parts[parts[i].tmp].x;
-				dy = parts[ii].y - parts[parts[i].tmp].y;
-
-				d = 81/(pow(dx, 2)+pow(dy, 2)+81)-0.5;
-
-				parts[parts[i].tmp].vx -= dx*d*0.5f;
-				parts[parts[i].tmp].vy -= dy*d*0.5f;
-
-				parts[ii].vx += dx*d*0.5f;
-				parts[ii].vy += dy*d*0.5f;
-			}
-		}
-	}
-	else
-	{
-		if (sim->pv[y/CELL][x/CELL]>0.5f || sim->pv[y/CELL][x/CELL]<(-0.5f))
-		{
-			parts[i].ctype = 1;
-			parts[i].life = 10;
-		}
-
-		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_OIL)
-					{
-						float ax, ay;
-
-						parts[i].vy -= 0.1f;
-
-						parts[i].vy *= 0.5f;
-						parts[i].vx *= 0.5f;
-
-						ax = (parts[i].vx + parts[r>>8].vx)/2;
-						ay = (parts[i].vy + parts[r>>8].vy)/2;
-
-						parts[i].vx = ax;
-						parts[i].vy = ay;
-						parts[r>>8].vx = ax;
-						parts[r>>8].vy = ay;
-					}
-				}
-	}
-	
-	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_SOAP)
-				{
-					blend = 0.85f;
-					tr = (parts[r>>8].dcolour>>16)&0xFF;
-					tg = (parts[r>>8].dcolour>>8)&0xFF;
-					tb = (parts[r>>8].dcolour)&0xFF;
-					ta = (parts[r>>8].dcolour>>24)&0xFF;
-					
-					nr = (tr*blend);
-					ng = (tg*blend);
-					nb = (tb*blend);
-					na = (ta*blend);
-					
-					parts[r>>8].dcolour = nr<<16 | ng<<8 | nb | na<<24;
-				}
-			}
-
-	return 0;
-}