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

fix BRMT always acting like it was created from TUGN

Browse Source
This commit is contained in:
jacob1 2013-06-20 00:10:13 -04:00
parent 53ae6ee517
commit 06fb97bc40
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -11,7 +11,7 @@
*.lua *.lua
stdout.txt stdout.txt
stderr.txt stderr.txt
build/* build*/*
stamps/* stamps/*
Saves/* Saves/*
generated/* generated/*

9
src/simulation/Simulation.cpp
View File

@ -3854,7 +3854,9 @@ void Simulation::update_particles_i(int start, int inc)
} }
else if (t == PT_BRMT) else if (t == PT_BRMT)
{ {
if (parts[i].ctype == PT_TUNG && ctemph <= 3695.0) if (parts[i].ctype == PT_TUNG)
{
if (ctemph <= 3695.0)
s = 0; s = 0;
else else
{ {
@ -3862,6 +3864,11 @@ void Simulation::update_particles_i(int start, int inc)
parts[i].type = PT_TUNG; parts[i].type = PT_TUNG;
} }
} }
else if (ctemph >= elements[t].HighTemperature)
t = PT_LAVA;
else
s = 0;
}
else else
s = 0; s = 0;
} }