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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
jacob1 2013-03-03 15:39:10 -05:00
commit cca1898ee8
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/simulation/elements/SPRK.cpp
View File

@ -267,6 +267,10 @@ int Element_SPRK::update(UPDATE_FUNC_ARGS)
if (rt==PT_PSCN || (rt==PT_NSCN && parts[i].temp<373.0f)) if (rt==PT_PSCN || (rt==PT_NSCN && parts[i].temp<373.0f))
goto conduct; goto conduct;
continue; continue;
case PT_INWR:
if (rt==PT_NSCN || rt==PT_PSCN)
goto conduct;
continue;
} }
switch (rt) switch (rt)
{ {