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

1 files changed, 51 insertions, 51 deletions

diff --git a/src/simulation/elements/NONE.cpp b/src/simulation/elements/NONE.cpp
index 95d9d3e..5dd02af 100644
--- a/src/simulation/elements/NONE.cpp
+++ b/src/simulation/elements/NONE.cpp
@@ -2,64 +2,64 @@
 //#TPT-Directive ElementClass Element_NONE PT_NONE 0
 Element_NONE::Element_NONE()
 {
-    Identifier = "DEFAULT_PT_NONE";
-    Name = "";
-    Colour = PIXPACK(0x000000);
-    MenuVisible = 1;
-    MenuSection = SC_SPECIAL;
-    Enabled = 1;
-    
-    Advection = 0.0f;
-    AirDrag = 0.00f * CFDS;
-    AirLoss = 1.00f;
-    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 = R_TEMP+0.0f	+273.15f;
-    HeatConduct = 251;
-    Description = "Erases particles.";
-    
-    State = ST_NONE;
-    Properties = 0;
-    
-    LowPressure = IPL;
-    LowPressureTransition = NT;
-    HighPressure = IPH;
-    HighPressureTransition = NT;
-    LowTemperature = ITL;
-    LowTemperatureTransition = NT;
-    HighTemperature = ITH;
-    HighTemperatureTransition = NT;
-    
-    Update = NULL;
-    IconGenerator = &Element_NONE::iconGen;
+	Identifier = "DEFAULT_PT_NONE";
+	Name = "";
+	Colour = PIXPACK(0x000000);
+	MenuVisible = 1;
+	MenuSection = SC_SPECIAL;
+	Enabled = 1;
+	
+	Advection = 0.0f;
+	AirDrag = 0.00f * CFDS;
+	AirLoss = 1.00f;
+	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 = R_TEMP+0.0f	+273.15f;
+	HeatConduct = 251;
+	Description = "Erases particles.";
+	
+	State = ST_NONE;
+	Properties = 0;
+	
+	LowPressure = IPL;
+	LowPressureTransition = NT;
+	HighPressure = IPH;
+	HighPressureTransition = NT;
+	LowTemperature = ITL;
+	LowTemperatureTransition = NT;
+	HighTemperature = ITH;
+	HighTemperatureTransition = NT;
+	
+	Update = NULL;
+	IconGenerator = &Element_NONE::iconGen;
 }
 
 //#TPT-Directive ElementHeader Element_NONE static VideoBuffer * iconGen(int, int, int)
 VideoBuffer * Element_NONE::iconGen(int wallID, int width, int height)
 {
-    VideoBuffer * newTexture = new VideoBuffer(width, height);
+	VideoBuffer * newTexture = new VideoBuffer(width, height);
 
-    for (int j=3; j<(width-4)/2; j++)
-    {
-        newTexture->SetPixel(j+6, j, 0xFF, 0, 0, 255);
-        newTexture->SetPixel(j+7, j, 0xFF, 0, 0, 255);
-        newTexture->SetPixel(-j+19, j, 0xFF, 0, 0, 255);
-        newTexture->SetPixel(-j+20, j, 0xFF, 0, 0, 255);
-    }
+	for (int j=3; j<(width-4)/2; j++)
+	{
+		newTexture->SetPixel(j+6, j, 0xFF, 0, 0, 255);
+		newTexture->SetPixel(j+7, j, 0xFF, 0, 0, 255);
+		newTexture->SetPixel(-j+19, j, 0xFF, 0, 0, 255);
+		newTexture->SetPixel(-j+20, j, 0xFF, 0, 0, 255);
+	}
 
-    return newTexture;
+	return newTexture;
 }