Merge

10 files changed, 18 insertions, 17 deletions

diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index b6f4f84..f037252 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -146,10 +146,13 @@ int Simulation::Load(int fullX, int fullY, GameSave * save)
 	Element_PPIP::ppip_changed = 1;
 	for(int i = 0; i < save->signs.size() && signs.size() < MAXSIGNS; i++)
 	{
-		sign tempSign = save->signs[i];
-		tempSign.x += fullX;
-		tempSign.y += fullY;
-		signs.push_back(tempSign);
+		if (save->signs[i].text[0])
+		{
+			sign tempSign = save->signs[i];
+			tempSign.x += fullX;
+			tempSign.y += fullY;
+			signs.push_back(tempSign);
+		}
 	}
 	for(int saveBlockX = 0; saveBlockX < save->blockWidth; saveBlockX++)
 	{
@@ -2105,7 +2108,6 @@ void Simulation::init_can_move()
 	}
 	can_move[PT_ELEC][PT_LCRY] = 2;
 	can_move[PT_ELEC][PT_EXOT] = 2;
-	can_move[PT_NEUT][PT_EXOT] = 2;
 	can_move[PT_PHOT][PT_LCRY] = 3;//varies according to LCRY life
 
 	can_move[PT_PHOT][PT_BIZR] = 2;
@@ -2115,7 +2117,6 @@ void Simulation::init_can_move()
 	can_move[PT_PHOT][PT_BIZRS] = 2;
 	can_move[PT_ELEC][PT_BIZRS] = 2;
 
-	can_move[PT_NEUT][PT_INVIS] = 2;
 	//whol eats anar
 	can_move[PT_ANAR][PT_WHOL] = 1;
 	can_move[PT_ANAR][PT_NWHL] = 1;
diff --git a/src/simulation/elements/DEUT.cpp b/src/simulation/elements/DEUT.cpp
index 98f27a5..fb58700 100644
--- a/src/simulation/elements/DEUT.cpp
+++ b/src/simulation/elements/DEUT.cpp
@@ -31,7 +31,7 @@ Element_DEUT::Element_DEUT()
     Description = "Deuterium oxide. Volume changes with temp, radioactive with neutrons.";
     
     State = ST_LIQUID;
-    Properties = TYPE_LIQUID|PROP_NEUTPENETRATE;
+    Properties = TYPE_LIQUID|PROP_NEUTPASS;
     
     LowPressure = IPL;
     LowPressureTransition = NT;
diff --git a/src/simulation/elements/DSTW.cpp b/src/simulation/elements/DSTW.cpp
index cca1b68..c6f1aca 100644
--- a/src/simulation/elements/DSTW.cpp
+++ b/src/simulation/elements/DSTW.cpp
@@ -31,7 +31,7 @@ Element_DSTW::Element_DSTW()
     Description = "Distilled water, does not conduct electricity.";
     
     State = ST_LIQUID;
-    Properties = TYPE_LIQUID|PROP_NEUTPENETRATE;
+    Properties = TYPE_LIQUID|PROP_NEUTPASS;
     
     LowPressure = IPL;
     LowPressureTransition = NT;
diff --git a/src/simulation/elements/EXOT.cpp b/src/simulation/elements/EXOT.cpp
index 140383c..1b763ca 100644
--- a/src/simulation/elements/EXOT.cpp
+++ b/src/simulation/elements/EXOT.cpp
@@ -31,7 +31,7 @@ Element_EXOT::Element_EXOT()
     Description = "Exotic matter. Explodes with excess exposure to electrons.";
     
     State = ST_LIQUID;
-    Properties = TYPE_LIQUID;
+    Properties = TYPE_LIQUID|PROP_NEUTPASS;
     
     LowPressure = IPL;
     LowPressureTransition = NT;
diff --git a/src/simulation/elements/GAS.cpp b/src/simulation/elements/GAS.cpp
index 45aee8d..45bcf3e 100644
--- a/src/simulation/elements/GAS.cpp
+++ b/src/simulation/elements/GAS.cpp
@@ -31,7 +31,7 @@ Element_GAS::Element_GAS()
     Description = "Gas. Diffuses. Flammable. Liquefies under pressure.";
     
     State = ST_GAS;
-    Properties = TYPE_GAS | PROP_NEUTPENETRATE;
+    Properties = TYPE_GAS | PROP_NEUTPASS;
     
     LowPressure = IPL;
     LowPressureTransition = NT;
@@ -46,4 +46,4 @@ Element_GAS::Element_GAS()
     
 }
 
-Element_GAS::~Element_GAS() {}
\ No newline at end of file
+Element_GAS::~Element_GAS() {}
diff --git a/src/simulation/elements/ICEI.cpp b/src/simulation/elements/ICEI.cpp
index b3d64d1..95210bb 100644
--- a/src/simulation/elements/ICEI.cpp
+++ b/src/simulation/elements/ICEI.cpp
@@ -31,7 +31,7 @@ Element_ICEI::Element_ICEI()
     Description = "Solid. Freezes water. Crushes under pressure. Cools down air.";
     
     State = ST_SOLID;
-    Properties = TYPE_SOLID|PROP_LIFE_DEC|PROP_NEUTPENETRATE;
+    Properties = TYPE_SOLID|PROP_LIFE_DEC|PROP_NEUTPASS;
     
     LowPressure = IPL;
     LowPressureTransition = NT;
diff --git a/src/simulation/elements/OIL.cpp b/src/simulation/elements/OIL.cpp
index 42be14e..a397ab8 100644
--- a/src/simulation/elements/OIL.cpp
+++ b/src/simulation/elements/OIL.cpp
@@ -31,7 +31,7 @@ Element_OIL::Element_OIL()
     Description = "Liquid. Flammable.";
     
     State = ST_LIQUID;
-    Properties = TYPE_LIQUID | PROP_NEUTPENETRATE;
+    Properties = TYPE_LIQUID | PROP_NEUTPASS;
     
     LowPressure = IPL;
     LowPressureTransition = NT;
@@ -46,4 +46,4 @@ Element_OIL::Element_OIL()
     
 }
 
-Element_OIL::~Element_OIL() {}
\ No newline at end of file
+Element_OIL::~Element_OIL() {}
diff --git a/src/simulation/elements/PLUT.cpp b/src/simulation/elements/PLUT.cpp
index 9f5f806..282de46 100644
--- a/src/simulation/elements/PLUT.cpp
+++ b/src/simulation/elements/PLUT.cpp
@@ -31,7 +31,7 @@ Element_PLUT::Element_PLUT()
     Description = "Heavy particles. Fissile. Generates neutrons under pressure.";
     
     State = ST_SOLID;
-    Properties = TYPE_PART|PROP_NEUTPENETRATE|PROP_RADIOACTIVE;
+    Properties = TYPE_PART|PROP_NEUTPASS|PROP_RADIOACTIVE;
     
     LowPressure = IPL;
     LowPressureTransition = NT;
diff --git a/src/simulation/elements/SNOW.cpp b/src/simulation/elements/SNOW.cpp
index 9e12e0a..2077ae8 100644
--- a/src/simulation/elements/SNOW.cpp
+++ b/src/simulation/elements/SNOW.cpp
@@ -31,7 +31,7 @@ Element_SNOW::Element_SNOW()
     Description = "Light particles.";
     
     State = ST_SOLID;
-    Properties = TYPE_PART|PROP_LIFE_DEC|PROP_NEUTPENETRATE;
+    Properties = TYPE_PART|PROP_LIFE_DEC|PROP_NEUTPASS;
     
     LowPressure = IPL;
     LowPressureTransition = NT;
diff --git a/src/simulation/elements/WATR.cpp b/src/simulation/elements/WATR.cpp
index 513ab60..4faf8dc 100644
--- a/src/simulation/elements/WATR.cpp
+++ b/src/simulation/elements/WATR.cpp
@@ -31,7 +31,7 @@ Element_WATR::Element_WATR()
     Description = "Liquid. Conducts electricity. Freezes. Extinguishes fires.";
     
     State = ST_LIQUID;
-    Properties = TYPE_LIQUID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_NEUTPENETRATE;
+    Properties = TYPE_LIQUID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_NEUTPASS;
     
     LowPressure = IPL;
     LowPressureTransition = NT;