1 files changed, 53 insertions, 50 deletions
diff --git a/src/simulation/elements/GBMB.cpp b/src/simulation/elements/GBMB.cpp
index 1b0ede0..1e12818 100644
--- a/src/simulation/elements/GBMB.cpp
+++ b/src/simulation/elements/GBMB.cpp
@@ -2,48 +2,48 @@
 //#TPT-Directive ElementClass Element_GBMB PT_GBMB 157
 Element_GBMB::Element_GBMB()
 {
-    Identifier = "DEFAULT_PT_GBMB";
-    Name = "GBMB";
-    Colour = PIXPACK(0x1144BB);
-    MenuVisible = 1;
-    MenuSection = SC_EXPLOSIVE;
-    Enabled = 1;
-    
-    Advection = 0.6f;
-    AirDrag = 0.01f * CFDS;
-    AirLoss = 0.98f;
-    Loss = 0.95f;
-    Collision = 0.0f;
-    Gravity = 0.1f;
-    Diffusion = 0.00f;
-    HotAir = 0.000f	* CFDS;
-    Falldown = 1;
-    
-    Flammable = 0;
-    Explosive = 0;
-    Meltable = 0;
-    Hardness = 20;
-    
-    Weight = 30;
-    
-    Temperature = R_TEMP-2.0f	+273.15f;
-    HeatConduct = 29;
-    Description = "Sticks to first object it touches then produces strong gravity push.";
-    
-    State = ST_NONE;
-    Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
-    
-    LowPressure = IPL;
-    LowPressureTransition = NT;
-    HighPressure = IPH;
-    HighPressureTransition = NT;
-    LowTemperature = ITL;
-    LowTemperatureTransition = NT;
-    HighTemperature = ITH;
-    HighTemperatureTransition = NT;
-    
-    Update = &Element_GBMB::update;
-    Graphics = &Element_GBMB::graphics;
+	Identifier = "DEFAULT_PT_GBMB";
+	Name = "GBMB";
+	Colour = PIXPACK(0x1144BB);
+	MenuVisible = 1;
+	MenuSection = SC_EXPLOSIVE;
+	Enabled = 1;
+	
+	Advection = 0.6f;
+	AirDrag = 0.01f * CFDS;
+	AirLoss = 0.98f;
+	Loss = 0.95f;
+	Collision = 0.0f;
+	Gravity = 0.1f;
+	Diffusion = 0.00f;
+	HotAir = 0.000f	* CFDS;
+	Falldown = 1;
+	
+	Flammable = 0;
+	Explosive = 0;
+	Meltable = 0;
+	Hardness = 20;
+	
+	Weight = 30;
+	
+	Temperature = R_TEMP-2.0f	+273.15f;
+	HeatConduct = 29;
+	Description = "Sticks to first object it touches then produces strong gravity push.";
+	
+	State = ST_NONE;
+	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
+	
+	LowPressure = IPL;
+	LowPressureTransition = NT;
+	HighPressure = IPH;
+	HighPressureTransition = NT;
+	LowTemperature = ITL;
+	LowTemperatureTransition = NT;
+	HighTemperature = ITH;
+	HighTemperatureTransition = NT;
+	
+	Update = &Element_GBMB::update;
+	Graphics = &Element_GBMB::graphics;
 }
 
 //#TPT-Directive ElementHeader Element_GBMB static int update(UPDATE_FUNC_ARGS)
@@ -55,15 +55,18 @@ int Element_GBMB::update(UPDATE_FUNC_ARGS)
 		for (rx=-2; rx<3; rx++)
 			for (ry=-2; ry<3; ry++)
 			{
-				r = pmap[y+ry][x+rx];
-				if(!r)
-					continue;
-				if((r&0xFF)!=PT_BOMB && (r&0xFF)!=PT_GBMB &&
-				   (r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PCLN &&
-				   (r&0xFF)!=PT_DMND)
+				if (BOUNDS_CHECK)
 				{
-					parts[i].life=60;
-					break;
+					r = pmap[y+ry][x+rx];
+					if(!r)
+						continue;
+					if((r&0xFF)!=PT_BOMB && (r&0xFF)!=PT_GBMB &&
+					   (r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PCLN &&
+					   (r&0xFF)!=PT_DMND)
+					{
+						parts[i].life=60;
+						break;
+					}
 				}
 			}
 	}