matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Simon Robertshaw 2013-10-20 15:38:40 +01:00
commit d9f1762da0
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -38,6 +38,7 @@ Makefile.me
*.tlog *.tlog
*.lib *.lib
*.ipch *.ipch
*.ilk
*.log *.log
*.lastbuildstate *.lastbuildstate
*.unsuccessfulbuild *.unsuccessfulbuild

4
SConscript
View File

@ -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 the platform is windows switch to a mingw toolset, use the default otherwise
if(GetOption('win')): if(GetOption('win')):
env = Environment(tools = ['mingw']) env = Environment(tools = ['mingw'], ENV = os.environ)
else: else:
env = Environment(tools = ['default']) env = Environment(tools = ['default'], ENV = os.environ)
if(GetOption("copy_env")): if(GetOption("copy_env")):
lstvar=["CC","CXX","LD","CFLAGS"] lstvar=["CC","CXX","LD","CFLAGS"]

2
src/simulation/Simulation.cpp
View File

@ -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); part_change_type(i, x, y, PT_ELEC);
parts[i].ctype = 0; 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); part_change_type(i, x, y, PT_PROT);
parts[i].ctype = 0; parts[i].ctype = 0;