Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy

1 files changed, 43 insertions, 43 deletions

diff --git a/src/simulation/elements/DLAY.cpp b/src/simulation/elements/DLAY.cpp
index d0dd4c1..548ce6c 100644
--- a/src/simulation/elements/DLAY.cpp
+++ b/src/simulation/elements/DLAY.cpp
@@ -2,48 +2,48 @@
 //#TPT-Directive ElementClass Element_DLAY PT_DLAY 79
 Element_DLAY::Element_DLAY()
 {
-    Identifier = "DEFAULT_PT_DLAY";
-    Name = "DLAY";
-    Colour = PIXPACK(0x753590);
-    MenuVisible = 1;
-    MenuSection = SC_POWERED;
-    Enabled = 1;
-    
-    Advection = 0.0f;
-    AirDrag = 0.00f * CFDS;
-    AirLoss = 0.90f;
-    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 = 1;
-    
-    Weight = 100;
-    
-    Temperature = 4.0f+273.15f;
-    HeatConduct = 0;
-    Description = "Conducts with temperature-dependent delay. (use HEAT/COOL).";
-    
-    State = ST_SOLID;
-    Properties = TYPE_SOLID;
-    
-    LowPressure = IPL;
-    LowPressureTransition = NT;
-    HighPressure = IPH;
-    HighPressureTransition = NT;
-    LowTemperature = ITL;
-    LowTemperatureTransition = NT;
-    HighTemperature = ITH;
-    HighTemperatureTransition = NT;
-    
-    Update = &Element_DLAY::update;
-    Graphics = &Element_DLAY::graphics;
+	Identifier = "DEFAULT_PT_DLAY";
+	Name = "DLAY";
+	Colour = PIXPACK(0x753590);
+	MenuVisible = 1;
+	MenuSection = SC_POWERED;
+	Enabled = 1;
+	
+	Advection = 0.0f;
+	AirDrag = 0.00f * CFDS;
+	AirLoss = 0.90f;
+	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 = 1;
+	
+	Weight = 100;
+	
+	Temperature = 4.0f+273.15f;
+	HeatConduct = 0;
+	Description = "Conducts with temperature-dependent delay. (use HEAT/COOL).";
+	
+	State = ST_SOLID;
+	Properties = TYPE_SOLID;
+	
+	LowPressure = IPL;
+	LowPressureTransition = NT;
+	HighPressure = IPH;
+	HighPressureTransition = NT;
+	LowTemperature = ITL;
+	LowTemperatureTransition = NT;
+	HighTemperature = ITH;
+	HighTemperatureTransition = NT;
+	
+	Update = &Element_DLAY::update;
+	Graphics = &Element_DLAY::graphics;
 }
 
 //#TPT-Directive ElementHeader Element_DLAY static int update(UPDATE_FUNC_ARGS)
@@ -57,7 +57,7 @@ int Element_DLAY::update(UPDATE_FUNC_ARGS)
 		parts[i].temp = 1.0f+273.15f;
 	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))
+			if (BOUNDS_CHECK && (rx || ry))
 			{
 				r = pmap[y+ry][x+rx];
 				if (!r || sim->parts_avg(r>>8, i,PT_INSL)==PT_INSL)