A bit of refactoring (elements)

1 files changed, 0 insertions, 104 deletions

diff --git a/src/elements/sing.cpp b/src/elements/sing.cpp
deleted file mode 100644
index de1e329..0000000
--- a/src/elements/sing.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-#include "simulation/Element.h"
-
-int update_SING(UPDATE_FUNC_ARGS) {
-	int r, rx, ry, cry, crx, rad, nxi, nxj, nb, j, spawncount;
-	int singularity = -parts[i].life;
-	float angle, v;
-
-	if (sim->pv[y/CELL][x/CELL]<singularity)
-		sim->pv[y/CELL][x/CELL] += 0.1f*(singularity-sim->pv[y/CELL][x/CELL]);
-	if (y+CELL<YRES && sim->pv[y/CELL+1][x/CELL]<singularity)
-		sim->pv[y/CELL+1][x/CELL] += 0.1f*(singularity-sim->pv[y/CELL+1][x/CELL]);
-	if (x+CELL<XRES)
-	{
-		sim->pv[y/CELL][x/CELL+1] += 0.1f*(singularity-sim->pv[y/CELL][x/CELL+1]);
-		if (y+CELL<YRES)
-			sim->pv[y/CELL+1][x/CELL+1] += 0.1f*(singularity-sim->pv[y/CELL+1][x/CELL+1]);
-	}
-	if (y+CELL>0 && sim->pv[y/CELL-1][x/CELL]<singularity)
-		sim->pv[y/CELL-1][x/CELL] += 0.1f*(singularity-sim->pv[y/CELL-1][x/CELL]);
-	if (x+CELL>0)
-	{
-		sim->pv[y/CELL][x/CELL-1] += 0.1f*(singularity-sim->pv[y/CELL][x/CELL-1]);
-		if (y+CELL>0)
-			sim->pv[y/CELL-1][x/CELL-1] += 0.1f*(singularity-sim->pv[y/CELL-1][x/CELL-1]);
-	}
-	if (parts[i].life<1) {
-		//Pop!
-		for (rx=-2; rx<3; rx++) {
-			crx = (x/CELL)+rx;
-			for (ry=-2; ry<3; ry++) {
-				cry = (y/CELL)+ry;
-				if (cry > 0 && crx > 0 && crx < (XRES/CELL) && cry < (YRES/CELL)) {
-					sim->pv[cry][crx] += (float)parts[i].tmp;
-				}
-			}
-		}
-		spawncount = (parts[i].tmp>255)?255:parts[i].tmp;
-		if (spawncount>=1)
-			spawncount = spawncount/8;
-		spawncount = spawncount*spawncount*M_PI;
-		for (j=0;j<spawncount;j++)
-		{
-			switch(rand()%3)
-			{
-				case 0:
-					nb = sim->create_part(-3, x, y, PT_PHOT);
-					break;
-				case 1:
-					nb = sim->create_part(-3, x, y, PT_NEUT);
-					break;
-				case 2:
-					nb = sim->create_part(-3, x, y, PT_ELEC);
-					break;
-			}
-			if (nb!=-1) {
-				parts[nb].life = (rand()%300);
-				parts[nb].temp = MAX_TEMP/2;
-				angle = rand()*2.0f*M_PI/RAND_MAX;
-				v = (float)(rand())*5.0f/RAND_MAX;
-				parts[nb].vx = v*cosf(angle);
-				parts[nb].vy = v*sinf(angle);
-			}
-			else if (sim->pfree==-1)
-				break;//if we've run out of particles, stop trying to create them - saves a lot of lag on "sing bomb" saves
-		}
-		sim->kill_part(i);
-		return 1;
-	}
-	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+ry][x+rx];
-				if (!r)
-					continue;
-				if ((r&0xFF)!=PT_DMND&&33>=rand()/(RAND_MAX/100)+1)
-				{
-					if ((r&0xFF)==PT_SING && parts[r>>8].life >10)
-					{
-						if (parts[i].life+parts[r>>8].life > 255)
-							continue;
-						parts[i].life += parts[r>>8].life;
-					}
-					else
-					{
-						if (parts[i].life+3 > 255)
-						{
-							if (parts[r>>8].type!=PT_SING && 1>rand()%100)
-							{
-								int np;
-								np = sim->create_part(r>>8,x+rx,y+ry,PT_SING);
-								parts[np].life = rand()%50+60;
-							}
-							continue;
-						}
-						parts[i].life += 3;
-						parts[i].tmp++;
-					}
-					parts[i].temp = restrict_flt(parts[r>>8].temp+parts[i].temp, MIN_TEMP, MAX_TEMP);
-					sim->kill_part(r>>8);
-				}
-			}
-	return 0;
-}