Merge branch 'develop' of https://github.com/simtr/The-Powder-Toy into develop

3 files changed, 4 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 5520484..41cd578 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ Makefile.me
 *.tlog
 *.lib
 *.ipch
+*.ilk
 *.log
 *.lastbuildstate
 *.unsuccessfulbuild
diff --git a/SConscript b/SConscript
index 38a6b25..e7833cc 100755
--- a/SConscript
+++ b/SConscript
@@ -135,9 +135,9 @@ if((not GetOption('lin')) and (not GetOption('win')) and (not GetOption('rpi'))
 # if the platform is windows switch to a mingw toolset, use the default otherwise
 
 if(GetOption('win')):
-	env = Environment(tools = ['mingw'])
+	env = Environment(tools = ['mingw'], ENV = os.environ)
 else:
-	env = Environment(tools = ['default'])
+	env = Environment(tools = ['default'], ENV = os.environ)
 
 if(GetOption("copy_env")):
     lstvar=["CC","CXX","LD","CFLAGS"]
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index 76c0830..60ca1f7 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -2216,7 +2216,7 @@ int Simulation::try_move(int i, int x, int y, int nx, int ny)
 				part_change_type(i, x, y, PT_ELEC);
 				parts[i].ctype = 0;
 			}
-			else if ((r&0xFF) == PT_H2 && pv[y/CELL][x/CELL] < 45.0f)
+			else if ((r&0xFF) == PT_H2 && pv[y/CELL][x/CELL] < 45.0f && parts[i].temp < 3000)
 			{
 				part_change_type(i, x, y, PT_PROT);
 				parts[i].ctype = 0;