TPT: Powered pipe, based on jacob1's commits

1 files changed, 207 insertions, 88 deletions

diff --git a/src/simulation/elements/PIPE.cpp b/src/simulation/elements/PIPE.cpp
index 6bbc2cd..d645a29 100644
--- a/src/simulation/elements/PIPE.cpp
+++ b/src/simulation/elements/PIPE.cpp
@@ -2,51 +2,66 @@
 //#TPT-Directive ElementClass Element_PIPE PT_PIPE 99
 Element_PIPE::Element_PIPE()
 {
-    Identifier = "DEFAULT_PT_PIPE";
-    Name = "PIPE";
-    Colour = PIXPACK(0x444444);
-    MenuVisible = 1;
-    MenuSection = SC_SOLIDS;
-    Enabled = 1;
-    
-    Advection = 0.0f;
-    AirDrag = 0.00f * CFDS;
-    AirLoss = 0.95f;
-    Loss = 0.00f;
-    Collision = 0.0f;
-    Gravity = 0.0f;
-    Diffusion = 0.00f;
-    HotAir = 0.000f	* CFDS;
-    Falldown = 0;
-    
-    Flammable = 0;
-    Explosive = 0;
-    Meltable = 0;
-    Hardness = 0;
-    
-    Weight = 100;
-    
-    Temperature = 273.15f;
-    HeatConduct = 0;
-    Description = "Moves elements around, read FAQ on website for help.";
-    
-    State = ST_SOLID;
-    Properties = TYPE_SOLID|PROP_LIFE_DEC;
-    
-    LowPressure = IPL;
-    LowPressureTransition = NT;
-    HighPressure = 10.0f;
-    HighPressureTransition = PT_BRMT;
-    LowTemperature = ITL;
-    LowTemperatureTransition = NT;
-    HighTemperature = ITH;
-    HighTemperatureTransition = NT;
-    
-    Update = &Element_PIPE::update;
-    Graphics = &Element_PIPE::graphics;
+	Identifier = "DEFAULT_PT_PIPE";
+	Name = "PIPE";
+	Colour = PIXPACK(0x444444);
+	MenuVisible = 1;
+	MenuSection = SC_SOLIDS;
+	Enabled = 1;
+	
+	Advection = 0.0f;
+	AirDrag = 0.00f * CFDS;
+	AirLoss = 0.95f;
+	Loss = 0.00f;
+	Collision = 0.0f;
+	Gravity = 0.0f;
+	Diffusion = 0.00f;
+	HotAir = 0.000f	* CFDS;
+	Falldown = 0;
+	
+	Flammable = 0;
+	Explosive = 0;
+	Meltable = 0;
+	Hardness = 0;
+	
+	Weight = 100;
+	
+	Temperature = 273.15f;
+	HeatConduct = 0;
+	Description = "Moves elements around, read FAQ on website for help.";
+	
+	State = ST_SOLID;
+	Properties = TYPE_SOLID|PROP_LIFE_DEC;
+	
+	LowPressure = IPL;
+	LowPressureTransition = NT;
+	HighPressure = 10.0f;
+	HighPressureTransition = PT_BRMT;
+	LowTemperature = ITL;
+	LowTemperatureTransition = NT;
+	HighTemperature = ITH;
+	HighTemperatureTransition = NT;
+	
+	Update = &Element_PIPE::update;
+	Graphics = &Element_PIPE::graphics;
 }
 
 #define PFLAG_NORMALSPEED 0x00010000
+// parts[].tmp flags
+// trigger flags to be processed this frame (trigger flags for next frame are shifted 3 bits to the left):
+#define PPIP_TMPFLAG_TRIGGER_ON 0x10000000
+#define PPIP_TMPFLAG_TRIGGER_OFF 0x08000000
+#define PPIP_TMPFLAG_TRIGGER_REVERSE 0x04000000
+#define PPIP_TMPFLAG_TRIGGERS 0x1C000000
+// current status of the pipe
+#define PPIP_TMPFLAG_PAUSED 0x02000000
+#define PPIP_TMPFLAG_REVERSED 0x01000000
+// 0x000000FF element
+// 0x00000100 is single pixel pipe
+// 0x00000200 will transfer like a single pixel pipe when in forward mode
+// 0x00001C00 forward single pixel pipe direction
+// 0x00002000 will transfer like a single pixel pipe when in reverse mode
+// 0x0001C000 reverse single pixel pipe direction
 
 signed char pos_1_rx[] = {-1,-1,-1, 0, 0, 1, 1, 1};
 signed char pos_1_ry[] = {-1, 0, 1,-1, 1,-1, 0, 1};
@@ -56,7 +71,61 @@ int Element_PIPE::update(UPDATE_FUNC_ARGS)
  {
 	int r, rx, ry, np;
 	int rnd, rndstore;
-	if (parts[i].ctype>=2 && parts[i].ctype<=4)
+	if (parts[i].tmp & PPIP_TMPFLAG_TRIGGERS)
+	{
+		int pause_changed = 0;
+		if (parts[i].tmp & PPIP_TMPFLAG_TRIGGER_ON) // TRIGGER_ON overrides TRIGGER_OFF
+		{
+			if (parts[i].tmp & PPIP_TMPFLAG_PAUSED)
+				pause_changed = 1;
+			parts[i].tmp &= ~PPIP_TMPFLAG_PAUSED;
+		}
+		else if (parts[i].tmp & PPIP_TMPFLAG_TRIGGER_OFF)
+		{
+			if (!(parts[i].tmp & PPIP_TMPFLAG_PAUSED))
+				pause_changed = 1;
+			parts[i].tmp |= PPIP_TMPFLAG_PAUSED;
+		}
+		if (pause_changed)
+		{
+			int rx, ry, r;
+			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&0xFF) == PT_BRCK)
+						{
+							if (parts[i].tmp & PPIP_TMPFLAG_PAUSED)
+								parts[r>>8].tmp = 0;
+							else
+								parts[r>>8].tmp = 1; //make surrounding BRCK glow
+						}
+					}
+				}
+		}
+		
+		if (parts[i].tmp & PPIP_TMPFLAG_TRIGGER_REVERSE)
+		{
+			parts[i].tmp ^= PPIP_TMPFLAG_REVERSED;
+			if (parts[i].ctype == 2) //Switch colors so it goes in reverse
+				parts[i].ctype = 4;
+			else if (parts[i].ctype == 4)
+				parts[i].ctype = 2;
+			if (parts[i].tmp & 0x100) //Switch one pixel pipe direction
+			{
+				int coords = (parts[i].tmp>>13)&0xF;
+				int coords2 = (parts[i].tmp>>9)&0xF;
+				parts[i].tmp &= ~0x1FE00;
+				parts[i].tmp |= coords<<9;
+				parts[i].tmp |= coords2<<13;
+			}
+		}
+		
+		parts[i].tmp &= ~PPIP_TMPFLAG_TRIGGERS;
+	}
+	if (parts[i].ctype>=2 && parts[i].ctype<=4 && !(parts[i].tmp & PPIP_TMPFLAG_PAUSED))
 	{
 		if (parts[i].life==3)
 		{
@@ -71,7 +140,7 @@ int Element_PIPE::update(UPDATE_FUNC_ARGS)
 						r = pmap[y+ry][x+rx];
 						if (!r)
 							continue;
-						if ((r&0xFF)==PT_PIPE&&parts[r>>8].ctype==1)
+						if (((r&0xFF)==PT_PIPE || (r&0xFF) == PT_PPIP)&&parts[r>>8].ctype==1)
 						{
 							parts[r>>8].ctype = (((parts[i].ctype)%3)+2);//reverse
 							parts[r>>8].life = 6;
@@ -79,11 +148,13 @@ int Element_PIPE::update(UPDATE_FUNC_ARGS)
 							{
 								parts[r>>8].tmp |= 0x200;//will transfer to a single pixel pipe
 								parts[r>>8].tmp |= count<<10;//coords of where it came from
+								parts[i].tmp |= ((7-count)<<14);
+								parts[i].tmp |= 0x2000;
 							}
 							neighborcount ++;
 							lastneighbor = r>>8;
 						}
-						else if ((r&0xFF)==PT_PIPE&&parts[r>>8].ctype!=(((parts[i].ctype-1)%3)+2))
+						else if (((r&0xFF)==PT_PIPE || (r&0xFF) == PT_PPIP)&&parts[r>>8].ctype!=(((parts[i].ctype-1)%3)+2))
 						{
 							neighborcount ++;
 							lastneighbor = r>>8;
@@ -95,7 +166,7 @@ int Element_PIPE::update(UPDATE_FUNC_ARGS)
 		}
 		else
 		{
-			if (parts[i].flags&PFLAG_NORMALSPEED)//skip particle push to prevent particle number being higher causeing speed up
+			if (parts[i].flags&PFLAG_NORMALSPEED)//skip particle push to prevent particle number being higher causing speed up
 			{
 				parts[i].flags &= ~PFLAG_NORMALSPEED;
 			}
@@ -121,11 +192,7 @@ int Element_PIPE::update(UPDATE_FUNC_ARGS)
 						np = sim->create_part(-1,x+rx,y+ry,parts[i].tmp&0xFF);
 						if (np!=-1)
 						{
-							parts[np].temp = parts[i].temp;//pipe saves temp and life now
-							parts[np].life = parts[i].tmp2;
-							parts[np].tmp = parts[i].pavg[0];
-							parts[np].ctype = parts[i].pavg[1];
-							parts[i].tmp &= ~0xFF;
+							transfer_pipe_to_part(parts+i, parts+np);
 						}
 					}
 					//try eating particle at entrance
@@ -133,22 +200,13 @@ int Element_PIPE::update(UPDATE_FUNC_ARGS)
 					{
 						if ((r&0xFF)==PT_SOAP)
 							sim->detach(r>>8);
-						parts[i].tmp =  (parts[i].tmp&~0xFF) | parts[r>>8].type;
-						parts[i].temp = parts[r>>8].temp;
-						parts[i].tmp2 = parts[r>>8].life;
-						parts[i].pavg[0] = parts[r>>8].tmp;
-						parts[i].pavg[1] = parts[r>>8].ctype;
+						transfer_part_to_pipe(parts+(r>>8), parts+i);
 						sim->kill_part(r>>8);
 					}
 					else if ((parts[i].tmp&0xFF) == 0 && (r&0xFF)==PT_STOR && parts[r>>8].tmp && (sim->elements[parts[r>>8].tmp].Properties & (TYPE_PART | TYPE_LIQUID | TYPE_GAS | TYPE_ENERGY)))
 					{
-						parts[i].tmp =  parts[r>>8].tmp;
-						parts[i].temp = parts[r>>8].temp;
-						parts[i].tmp2 = parts[r>>8].tmp2;
-						parts[i].pavg[0] = parts[r>>8].pavg[0];
-						parts[i].pavg[1] = parts[r>>8].pavg[1];
-						parts[r>>8].tmp = 0;
-						parts[r>>8].life = 0;
+						// STOR stores properties in the same places as PIPE does
+						transfer_pipe_to_pipe(parts+(r>>8), parts+i);
 					}
 				}
 			}
@@ -184,7 +242,11 @@ int Element_PIPE::update(UPDATE_FUNC_ARGS)
 					{
 						r = pmap[y+ry][x+rx];
 						if (!r)
-							sim->create_part(-1,x+rx,y+ry,PT_BRCK);//BRCK border, people didn't like DMND
+						{
+							int index = sim->create_part(-1,x+rx,y+ry,PT_BRCK);//BRCK border, people didn't like DMND
+							if (parts[i].type == PT_PPIP && index != -1)
+								parts[index].tmp = 1;
+						}
 					}
 				}
 			if (parts[i].life<=1)
@@ -211,11 +273,11 @@ int Element_PIPE::update(UPDATE_FUNC_ARGS)
 					if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
 					{
 						r = pmap[y+ry][x+rx];
-						if ((r&0xFF)==PT_PIPE && parts[i].ctype==1 && parts[i].life )
+						if (((r&0xFF)==PT_PIPE || (r&0xFF) == PT_PPIP) && parts[i].ctype==1 && parts[i].life )
 							issingle = 0;
 					}
-					if (issingle)
-						parts[i].tmp |= 0x100;
+			if (issingle)
+				parts[i].tmp |= 0x100;
 		}
 		else if (parts[i].life==2)
 		{
@@ -248,6 +310,7 @@ int Element_PIPE::graphics(GRAPHICS_FUNC_ARGS)
 		if (ren->graphicscache[t].isready)
 		{
 			*pixel_mode = ren->graphicscache[t].pixel_mode;
+			*cola = ren->graphicscache[t].cola;
 			*colr = ren->graphicscache[t].colr;
 			*colg = ren->graphicscache[t].colg;
 			*colb = ren->graphicscache[t].colb;
@@ -259,8 +322,8 @@ int Element_PIPE::graphics(GRAPHICS_FUNC_ARGS)
 		else
 		{
 			*colr = PIXR(ren->sim->elements[t].Colour);
-			*colg = PIXR(ren->sim->elements[t].Colour);
-			*colb = PIXR(ren->sim->elements[t].Colour);
+			*colg = PIXG(ren->sim->elements[t].Colour);
+			*colb = PIXB(ren->sim->elements[t].Colour);
 			if (ren->sim->elements[t].Graphics)
 			{
 				(*(ren->sim->elements[t].Graphics))(ren, &tpart, nx, ny, pixel_mode, cola, colr, colg, colb, firea, firer, fireg, fireb);
@@ -319,6 +382,44 @@ int Element_PIPE::graphics(GRAPHICS_FUNC_ARGS)
 	return 0;
 }
 
+//#TPT-Directive ElementHeader Element_PIPE static void transfer_pipe_to_part(Particle *pipe, Particle *part)
+void Element_PIPE::transfer_pipe_to_part(Particle *pipe, Particle *part)
+{
+	part->type = (pipe->tmp & 0xFF);
+	part->temp = pipe->temp;
+	part->life = pipe->tmp2;
+	part->tmp = pipe->pavg[0];
+	part->ctype = pipe->pavg[1];
+	pipe->tmp &= ~0xFF;
+
+	part->vx = 0.0f;
+	part->vy = 0.0f;
+	part->tmp2 = 0;
+	part->flags = 0;
+	part->dcolour = 0;
+}
+
+//#TPT-Directive ElementHeader Element_PIPE static void transfer_part_to_pipe(Particle *part, Particle *pipe)
+void Element_PIPE::transfer_part_to_pipe(Particle *part, Particle *pipe)
+{
+	pipe->tmp = (pipe->tmp&~0xFF) | part->type;
+	pipe->temp = part->temp;
+	pipe->tmp2 = part->life;
+	pipe->pavg[0] = part->tmp;
+	pipe->pavg[1] = part->ctype;
+}
+
+//#TPT-Directive ElementHeader Element_PIPE static void transfer_pipe_to_pipe(Particle *src, Particle *dest)
+void Element_PIPE::transfer_pipe_to_pipe(Particle *src, Particle *dest)
+{
+	dest->tmp = (dest->tmp&~0xFF) | (src->tmp&0xFF);
+	dest->temp = src->temp;
+	dest->tmp2 = src->tmp2;
+	dest->pavg[0] = src->pavg[0];
+	dest->pavg[1] = src->pavg[1];
+	src->tmp &= ~0xFF;
+}
+
 //#TPT-Directive ElementHeader Element_PIPE static void pushParticle(Simulation * sim, int i, int count, int original)
 void Element_PIPE::pushParticle(Simulation * sim, int i, int count, int original)
 {
@@ -333,7 +434,7 @@ void Element_PIPE::pushParticle(Simulation * sim, int i, int count, int original
 		rndstore = rand();
 		// RAND_MAX is at least 32767 on all platforms i.e. pow(8,5)-1
 		// so can go 5 cycles without regenerating rndstore
-		for (q=0; q<3; q++)//try to push twice
+		for (q=0; q<3; q++)//try to push 3 times
 		{
 			rnd = rndstore&7;
 			rndstore = rndstore>>3;
@@ -344,19 +445,25 @@ void Element_PIPE::pushParticle(Simulation * sim, int i, int count, int original
 				r = sim->pmap[y+ry][x+rx];
 				if (!r)
 					continue;
-				else if ((r&0xFF)==PT_PIPE && sim->parts[r>>8].ctype!=notctype && (sim->parts[r>>8].tmp&0xFF)==0)
+				else if (((r&0xFF)==PT_PIPE || (r&0xFF) == PT_PPIP) && sim->parts[r>>8].ctype!=notctype && (sim->parts[r>>8].tmp&0xFF)==0)
 				{
-					sim->parts[r>>8].tmp = (sim->parts[r>>8].tmp&~0xFF) | (sim->parts[i].tmp&0xFF);
-					sim->parts[r>>8].temp = sim->parts[i].temp;
-					sim->parts[r>>8].tmp2 = sim->parts[i].tmp2;
-					sim->parts[r>>8].pavg[0] = sim->parts[i].pavg[0];
-					sim->parts[r>>8].pavg[1] = sim->parts[i].pavg[1];
+					transfer_pipe_to_pipe(sim->parts+i, sim->parts+(r>>8));
 					if (r>>8 > original)
 						sim->parts[r>>8].flags |= PFLAG_NORMALSPEED;//skip particle push, normalizes speed
-					sim->parts[i].tmp &= ~0xFF;
 					count++;
 					pushParticle(sim, r>>8,count,original);
 				}
+				else if ((r&0xFF) == PT_PRTI) //Pass particles into PRTI for a pipe speed increase
+		        {
+					int nnx;
+					for (nnx=0; nnx<80; nnx++)
+						if (!sim->portalp[sim->parts[r>>8].tmp][count][nnx].type)
+						{
+							transfer_pipe_to_part(sim->parts+i, &(sim->portalp[sim->parts[r>>8].tmp][count][nnx]));
+							count++;
+							break;
+						}
+		        }
 			}
 		}
 	}
@@ -364,23 +471,35 @@ void Element_PIPE::pushParticle(Simulation * sim, int i, int count, int original
 	{
 		int coords = 7 - ((sim->parts[i].tmp>>10)&7);
 		r = sim->pmap[y+ pos_1_ry[coords]][x+ pos_1_rx[coords]];
-		if (!r)
-		{
-		}
-		else if ((r&0xFF)==PT_PIPE && sim->parts[r>>8].ctype!=notctype && (sim->parts[r>>8].tmp&0xFF)==0)
+		if (((r&0xFF)==PT_PIPE || (r&0xFF) == PT_PPIP) && sim->parts[r>>8].ctype!=notctype && (sim->parts[r>>8].tmp&0xFF)==0)
 		{
-			sim->parts[r>>8].tmp = (sim->parts[r>>8].tmp&~0xFF) | (sim->parts[i].tmp&0xFF);
-			sim->parts[r>>8].temp = sim->parts[i].temp;
-			sim->parts[r>>8].tmp2 = sim->parts[i].tmp2;
-			sim->parts[r>>8].pavg[0] = sim->parts[i].pavg[0];
-			sim->parts[r>>8].pavg[1] = sim->parts[i].pavg[1];
+			transfer_pipe_to_pipe(sim->parts+i, sim->parts+(r>>8));
 			if (r>>8 > original)
 				sim->parts[r>>8].flags |= PFLAG_NORMALSPEED;//skip particle push, normalizes speed
-			sim->parts[i].tmp &= ~0xFF;
 			count++;
 			pushParticle(sim, r>>8,count,original);
 		}
-		
+		else if ((r&0xFF) == PT_PRTI) //Pass particles into PRTI for a pipe speed increase
+	    {
+			int nnx;
+			for (nnx=0; nnx<80; nnx++)
+				if (!sim->portalp[sim->parts[r>>8].tmp][count][nnx].type)
+				{
+					transfer_pipe_to_part(sim->parts+i, &(sim->portalp[sim->parts[r>>8].tmp][count][nnx]));
+					count++;
+					break;
+				}
+	    }
+	    else if ((r&0xFF) == PT_NONE) //Move particles out of pipe automatically, much faster at ends
+	    {
+			rx = pos_1_rx[coords];
+			ry = pos_1_ry[coords];
+			np = sim->create_part(-1,x+rx,y+ry,sim->parts[i].tmp&0xFF);
+			if (np!=-1)
+			{
+				transfer_pipe_to_part(sim->parts+i, sim->parts+np);
+			}
+	    }
 		
 	}
 	return;