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

1 files changed, 43 insertions, 43 deletions

diff --git a/src/simulation/elements/SNOW.cpp b/src/simulation/elements/SNOW.cpp
index 2077ae8..d70c589 100644
--- a/src/simulation/elements/SNOW.cpp
+++ b/src/simulation/elements/SNOW.cpp
@@ -2,48 +2,48 @@
 //#TPT-Directive ElementClass Element_SNOW PT_SNOW 16
 Element_SNOW::Element_SNOW()
 {
-    Identifier = "DEFAULT_PT_SNOW";
-    Name = "SNOW";
-    Colour = PIXPACK(0xC0E0FF);
-    MenuVisible = 1;
-    MenuSection = SC_POWDERS;
-    Enabled = 1;
-    
-    Advection = 0.7f;
-    AirDrag = 0.01f * CFDS;
-    AirLoss = 0.96f;
-    Loss = 0.90f;
-    Collision = -0.1f;
-    Gravity = 0.05f;
-    Diffusion = 0.01f;
-    HotAir = -0.00005f* CFDS;
-    Falldown = 1;
-    
-    Flammable = 0;
-    Explosive = 0;
-    Meltable = 0;
-    Hardness = 20;
-    
-    Weight = 50;
-    
-    Temperature = R_TEMP-30.0f+273.15f;
-    HeatConduct = 46;
-    Description = "Light particles.";
-    
-    State = ST_SOLID;
-    Properties = TYPE_PART|PROP_LIFE_DEC|PROP_NEUTPASS;
-    
-    LowPressure = IPL;
-    LowPressureTransition = NT;
-    HighPressure = IPH;
-    HighPressureTransition = NT;
-    LowTemperature = ITL;
-    LowTemperatureTransition = NT;
-    HighTemperature = 273.0f;
-    HighTemperatureTransition = ST;
-    
-    Update = &Element_SNOW::update;
-    
+	Identifier = "DEFAULT_PT_SNOW";
+	Name = "SNOW";
+	Colour = PIXPACK(0xC0E0FF);
+	MenuVisible = 1;
+	MenuSection = SC_POWDERS;
+	Enabled = 1;
+	
+	Advection = 0.7f;
+	AirDrag = 0.01f * CFDS;
+	AirLoss = 0.96f;
+	Loss = 0.90f;
+	Collision = -0.1f;
+	Gravity = 0.05f;
+	Diffusion = 0.01f;
+	HotAir = -0.00005f* CFDS;
+	Falldown = 1;
+	
+	Flammable = 0;
+	Explosive = 0;
+	Meltable = 0;
+	Hardness = 20;
+	
+	Weight = 50;
+	
+	Temperature = R_TEMP-30.0f+273.15f;
+	HeatConduct = 46;
+	Description = "Light particles.";
+	
+	State = ST_SOLID;
+	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_NEUTPASS;
+	
+	LowPressure = IPL;
+	LowPressureTransition = NT;
+	HighPressure = IPH;
+	HighPressureTransition = NT;
+	LowTemperature = ITL;
+	LowTemperatureTransition = NT;
+	HighTemperature = 273.0f;
+	HighTemperatureTransition = ST;
+	
+	Update = &Element_SNOW::update;
+	
 }
 
 //#TPT-Directive ElementHeader Element_SNOW static int update(UPDATE_FUNC_ARGS)
@@ -56,7 +56,7 @@ int Element_SNOW::update(UPDATE_FUNC_ARGS)
 	}
 	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)