Remove .State property from all element files

src/simulation/Elements.h

@@ -39,11 +39,6 @@
 #define FLAG_PHOTDECO  0x8 // compatibility with old saves (decorated photons), only applies to PHOT. Having the same value as FLAG_MOVABLE is fine because they apply to different elements, and this saves space for future flags,
 
 
-#define ST_NONE 0
-#define ST_SOLID 1
-#define ST_LIQUID 2
-#define ST_GAS 3
-
 #define UPDATE_FUNC_ARGS Simulation* sim, int i, int x, int y, int surround_space, int nt, Particle *parts, int pmap[YRES][XRES]
 #define UPDATE_FUNC_SUBCALL_ARGS sim, i, x, y, surround_space, nt, parts, pmap
 

src/simulation/elements/116.cpp

@@ -30,7 +30,7 @@ Element_116::Element_116()
 	HeatConduct = 70;
 	Description = "A failed shared velocity test.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 
 	LowPressure = IPL;

src/simulation/elements/146.cpp

@@ -30,7 +30,7 @@ Element_146::Element_146()
 	HeatConduct = 40;
 	Description = "Brian 6 S6/B246/3";
 
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID|PROP_LIFE;
 
 	LowPressure = IPL;

src/simulation/elements/ACEL.cpp

@@ -30,7 +30,7 @@ Element_ACEL::Element_ACEL()
 	HeatConduct = 251;
 	Description = "Accelerator, speeds up nearby elements.";
 
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID;
 
 	LowPressure = IPL;

src/simulation/elements/ACID.cpp

@@ -30,7 +30,7 @@ Element_ACID::Element_ACID()
 	HeatConduct = 34;
 	Description = "Dissolves almost everything.";
 
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_DEADLY;
 
 	LowPressure = IPL;

src/simulation/elements/AMTR.cpp

@@ -30,7 +30,7 @@ Element_AMTR::Element_AMTR()
 	HeatConduct = 70;
 	Description = "Anti-Matter, destroys a majority of particles.";
 
-	State = ST_NONE;
+
 	Properties = TYPE_GAS;
 
 	LowPressure = IPL;

src/simulation/elements/ANAR.cpp

@@ -30,7 +30,7 @@ Element_ANAR::Element_ANAR()
 	HeatConduct = 70;
 	Description = "Anti-air. Very light dust, which behaves opposite gravity.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 
 	LowPressure = IPL;

src/simulation/elements/ARAY.cpp

@@ -30,7 +30,7 @@ Element_ARAY::Element_ARAY()
 	HeatConduct = 0;
 	Description = "Ray Emitter. Rays create points when they collide.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 
 	LowPressure = IPL;

src/simulation/elements/BANG.cpp

@@ -30,7 +30,7 @@ Element_BANG::Element_BANG()
 	HeatConduct = 88;
 	Description = "TNT, explodes all at once.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID | PROP_NEUTPENETRATE;
 
 	LowPressure = IPL;

src/simulation/elements/BCLN.cpp

@@ -30,7 +30,7 @@ Element_BCLN::Element_BCLN()
 	HeatConduct = 251;
 	Description = "Breakable Clone.";
 
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC|PROP_DRAWONCTYPE|PROP_NOCTYPEDRAW;
 
 	LowPressure = IPL;

src/simulation/elements/BCOL.cpp

@@ -30,7 +30,7 @@ Element_BCOL::Element_BCOL()
 	HeatConduct = 150;
 	Description = "Broken Coal. Heavy particles, burns slowly.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 
 	LowPressure = IPL;

src/simulation/elements/BGLA.cpp

@@ -30,7 +30,7 @@ Element_BGLA::Element_BGLA()
 	HeatConduct = 150;
 	Description = "Broken Glass, heavy particles formed when glass breaks under pressure. Meltable. Bagels.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_PART | PROP_HOT_GLOW;
 
 	LowPressure = IPL;

src/simulation/elements/BHOL.cpp

@@ -30,7 +30,7 @@ Element_BHOL::Element_BHOL()
 	HeatConduct = 255;
 	Description = "Vacuum, sucks in other particles and heats up.";
 
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID;
 
 	LowPressure = IPL;

src/simulation/elements/BIZR.cpp

@@ -30,7 +30,7 @@ Element_BIZR::Element_BIZR()
 	HeatConduct = 29;
 	Description = "Bizarre... contradicts the normal state changes. Paints other elements with its deco color.";
 
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID;
 
 	LowPressure = IPL;

src/simulation/elements/BIZRG.cpp

@@ -30,7 +30,7 @@ Element_BIZRG::Element_BIZRG()
 	HeatConduct = 42;
 	Description = "Bizarre gas.";
 
-	State = ST_GAS;
+
 	Properties = TYPE_GAS;
 
 	LowPressure = IPL;

src/simulation/elements/BIZRS.cpp

@@ -30,7 +30,7 @@ Element_BIZRS::Element_BIZRS()
 	HeatConduct = 251;
 	Description = "Bizarre solid.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 
 	LowPressure = IPL;

src/simulation/elements/BMTL.cpp

@@ -30,7 +30,7 @@ Element_BMTL::Element_BMTL()
 	HeatConduct = 251;
 	Description = "Breakable metal. Common conductive building material, can melt and break under pressure.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
 
 	LowPressure = IPL;

src/simulation/elements/BOMB.cpp

@@ -30,7 +30,7 @@ Element_BOMB::Element_BOMB()
 	HeatConduct = 29;
 	Description = "Bomb. Explodes and destroys all surrounding particles when it touches something.";
 
-	State = ST_NONE;
+
 	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC|PROP_SPARKSETTLE;
 
 	LowPressure = IPL;

src/simulation/elements/BOYL.cpp

@@ -30,7 +30,7 @@ Element_BOYL::Element_BOYL()
 	HeatConduct = 42;
 	Description = "Boyle, variable pressure gas. Expands when heated.";
 
-	State = ST_GAS;
+
 	Properties = TYPE_GAS;
 
 	LowPressure = IPL;

src/simulation/elements/BRAY.cpp

@@ -30,7 +30,7 @@ Element_BRAY::Element_BRAY()
 	HeatConduct = 251;
 	Description = "Ray Point. Rays create points when they collide.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC|PROP_LIFE_KILL;
 
 	LowPressure = IPL;

src/simulation/elements/BRCK.cpp

@@ -30,7 +30,7 @@ Element_BRCK::Element_BRCK()
 	HeatConduct = 251;
 	Description = "Brick, breakable building material.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_HOT_GLOW;
 
 	LowPressure = IPL;

src/simulation/elements/BREC.cpp

@@ -30,7 +30,7 @@ Element_BREC::Element_BREC()
 	HeatConduct = 211;
 	Description = "Broken electronics. Formed from EMP blasts, and when constantly sparked while under pressure, turns to EXOT.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_PART|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
 
 	LowPressure = IPL;

src/simulation/elements/BRMT.cpp

@@ -30,7 +30,7 @@ Element_BRMT::Element_BRMT()
 	HeatConduct = 211;
 	Description = "Broken metal. Created when iron rusts or when when metals break from pressure.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_PART|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
 
 	LowPressure = IPL;

src/simulation/elements/BTRY.cpp

@@ -30,7 +30,7 @@ Element_BTRY::Element_BTRY()
 	HeatConduct = 251;
 	Description = "Generates infinite electricity.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 
 	LowPressure = IPL;

src/simulation/elements/BVBR.cpp

@@ -30,7 +30,7 @@ Element_BVBR::Element_BVBR()
 	HeatConduct = 164;
 	Description = "Broken vibranium.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_PART|PROP_LIFE_DEC;
 
 	LowPressure = IPL;

src/simulation/elements/C5.cpp

@@ -30,7 +30,7 @@ Element_C5::Element_C5()
 	HeatConduct = 88;
 	Description = "Cold explosive, set off by anything cold.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID | PROP_NEUTPENETRATE;
 
 	LowPressure = IPL;

src/simulation/elements/CAUS.cpp

@@ -30,7 +30,7 @@ Element_CAUS::Element_CAUS()
 	HeatConduct = 70;
 	Description = "Caustic Gas, acts like ACID.";
 
-	State = ST_GAS;
+
 	Properties = TYPE_GAS|PROP_DEADLY;
 
 	LowPressure = IPL;

src/simulation/elements/CBNW.cpp

@@ -30,7 +30,7 @@ Element_CBNW::Element_CBNW()
 	HeatConduct = 29;
 	Description = "Carbonated water. Slowly releases CO2.";
 
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_NEUTPENETRATE;
 
 	LowPressure = IPL;

src/simulation/elements/CFLM.cpp

@@ -35,7 +35,7 @@ Element_CFLM::Element_CFLM()
 	HeatConduct = 88;
 	Description = "Sub-zero flame.";
 
-	State = ST_GAS;
+
 	Properties = TYPE_GAS|PROP_LIFE_DEC|PROP_LIFE_KILL;
 
 	LowPressure = IPL;

src/simulation/elements/CLNE.cpp

@@ -30,7 +30,7 @@ Element_CLNE::Element_CLNE()
 	HeatConduct = 251;
 	Description = "Solid. Duplicates any particles it touches.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_DRAWONCTYPE|PROP_NOCTYPEDRAW;
 
 	LowPressure = IPL;

src/simulation/elements/CLST.cpp

@@ -30,7 +30,7 @@ Element_CLST::Element_CLST()
 	HeatConduct = 70;
 	Description = "Clay dust. Produces paste when mixed with water.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_PART;
 
 	LowPressure = IPL;

src/simulation/elements/CNCT.cpp

@@ -30,7 +30,7 @@ Element_CNCT::Element_CNCT()
 	HeatConduct = 100;
 	Description = "Concrete, stronger than stone.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_PART|PROP_HOT_GLOW;
 
 	LowPressure = IPL;

src/simulation/elements/CO2.cpp

@@ -30,7 +30,7 @@ Element_CO2::Element_CO2()
 	HeatConduct = 88;
 	Description = "Carbon Dioxide. Heavy gas, drifts downwards. Carbonates water and turns to dry ice when cold.";
 
-	State = ST_GAS;
+
 	Properties = TYPE_GAS;
 
 	LowPressure = IPL;

src/simulation/elements/COAL.cpp

@@ -30,7 +30,7 @@ Element_COAL::Element_COAL()
 	HeatConduct = 200;
 	Description = "Coal, Burns very slowly. Gets red when hot.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 
 	LowPressure = IPL;

src/simulation/elements/CONV.cpp

@@ -30,7 +30,7 @@ Element_CONV::Element_CONV()
 	HeatConduct = 251;
 	Description = "Solid. Converts everything into whatever it first touches.";
 
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID|PROP_DRAWONCTYPE|PROP_NOCTYPEDRAW;
 
 	LowPressure = IPL;

src/simulation/elements/CRAY.cpp

@@ -30,7 +30,7 @@ Element_CRAY::Element_CRAY()
 	HeatConduct = 0;
 	Description = "Particle Ray Emitter. Creates a beam of particles set by its ctype, with a range set by tmp.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;
 
 	LowPressure = IPL;

src/simulation/elements/CRMC.cpp

@@ -30,7 +30,7 @@ Element_CRMC::Element_CRMC()
 	HeatConduct = 35;
 	Description = "Ceramic. Gets stronger under pressure.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID | PROP_NEUTPASS;
 
 	LowPressure = IPL;

src/simulation/elements/DCEL.cpp

@@ -30,7 +30,7 @@ Element_DCEL::Element_DCEL()
 	HeatConduct = 251;
 	Description = "Decelerator, slows down nearby elements.";
 
-	State = ST_NONE;
+
 	Properties = TYPE_SOLID;
 
 	LowPressure = IPL;

src/simulation/elements/DESL.cpp

@@ -30,7 +30,7 @@ Element_DESL::Element_DESL()
 	HeatConduct = 42;
 	Description = "Liquid diesel. Explodes under high pressure and temperatures.";
 
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID;
 
 	LowPressure = IPL;

src/simulation/elements/DEST.cpp

@@ -30,7 +30,7 @@ Element_DEST::Element_DEST()
 	HeatConduct = 150;
 	Description = "More destructive Bomb, can break through virtually anything.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC;
 
 	LowPressure = IPL;

src/simulation/elements/DEUT.cpp

@@ -30,7 +30,7 @@ Element_DEUT::Element_DEUT()
 	HeatConduct = 251;
 	Description = "Deuterium oxide. Volume changes with temp, radioactive with neutrons.";
 
-	State = ST_LIQUID;
+
 	Properties = TYPE_LIQUID|PROP_NEUTPASS;
 
 	LowPressure = IPL;

src/simulation/elements/DLAY.cpp

@@ -30,7 +30,7 @@ Element_DLAY::Element_DLAY()
 	HeatConduct = 0;
 	Description = "Conducts with temperature-dependent delay. (use HEAT/COOL).";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 
 	LowPressure = IPL;

src/simulation/elements/DMG.cpp

@@ -30,7 +30,7 @@ Element_DMG::Element_DMG()
 	HeatConduct = 29;
 	Description = "Generates damaging pressure and breaks any elements it hits.";
 
-	State = ST_NONE;
+
 	Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC|PROP_SPARKSETTLE;
 
 	LowPressure = IPL;

src/simulation/elements/DMND.cpp

@@ -30,7 +30,7 @@ Element_DMND::Element_DMND()
 	HeatConduct = 186;
 	Description = "Diamond. Indestructible.";
 
-	State = ST_SOLID;
+
 	Properties = TYPE_SOLID;
 
 	LowPressure = IPL;