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

1 files changed, 42 insertions, 42 deletions

diff --git a/src/simulation/elements/GOO.cpp b/src/simulation/elements/GOO.cpp
index 3dcef31..0d55ba5 100644
--- a/src/simulation/elements/GOO.cpp
+++ b/src/simulation/elements/GOO.cpp
@@ -2,48 +2,48 @@
 //#TPT-Directive ElementClass Element_GOO PT_GOO 12
 Element_GOO::Element_GOO()
 {
-    Identifier = "DEFAULT_PT_GOO";
-    Name = "GOO";
-    Colour = PIXPACK(0x804000);
-    MenuVisible = 1;
-    MenuSection = SC_SOLIDS;
-    Enabled = 1;
-    
-    Advection = 0.0f;
-    AirDrag = 0.00f * CFDS;
-    AirLoss = 0.97f;
-    Loss = 0.50f;
-    Collision = 0.0f;
-    Gravity = 0.0f;
-    Diffusion = 0.00f;
-    HotAir = 0.000f	* CFDS;
-    Falldown = 0;
-    
-    Flammable = 0;
-    Explosive = 0;
-    Meltable = 0;
-    Hardness = 12;
-    
-    Weight = 100;
-    
-    Temperature = R_TEMP+0.0f	+273.15f;
-    HeatConduct = 75;
-    Description = "Solid. Deforms and disappears under pressure.";
-    
-    State = ST_SOLID;
-    Properties = TYPE_SOLID | PROP_NEUTPENETRATE|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_GOO::update;
-    
+	Identifier = "DEFAULT_PT_GOO";
+	Name = "GOO";
+	Colour = PIXPACK(0x804000);
+	MenuVisible = 1;
+	MenuSection = SC_SOLIDS;
+	Enabled = 1;
+	
+	Advection = 0.0f;
+	AirDrag = 0.00f * CFDS;
+	AirLoss = 0.97f;
+	Loss = 0.50f;
+	Collision = 0.0f;
+	Gravity = 0.0f;
+	Diffusion = 0.00f;
+	HotAir = 0.000f	* CFDS;
+	Falldown = 0;
+	
+	Flammable = 0;
+	Explosive = 0;
+	Meltable = 0;
+	Hardness = 12;
+	
+	Weight = 100;
+	
+	Temperature = R_TEMP+0.0f	+273.15f;
+	HeatConduct = 75;
+	Description = "Solid. Deforms and disappears under pressure.";
+	
+	State = ST_SOLID;
+	Properties = TYPE_SOLID | PROP_NEUTPENETRATE|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_GOO::update;
+	
 }
 
 //#TPT-Directive ElementHeader Element_GOO static int update(UPDATE_FUNC_ARGS)