Merge remote-tracking branch 'origin/master'

2013-03-03 15:39:10 -05:00 · 2013-03-03 15:39:10 -05:00 · cca1898ee8
commit cca1898ee8
parent 17d79e8d8e bb87299eb4
1 changed files with 4 additions and 0 deletions
--- a/src/simulation/elements/SPRK.cpp
+++ b/src/simulation/elements/SPRK.cpp
@ -267,6 +267,10 @@ int Element_SPRK::update(UPDATE_FUNC_ARGS)
 					if (rt==PT_PSCN || (rt==PT_NSCN && parts[i].temp<373.0f))
 						goto conduct;
 					continue;
+				case PT_INWR:
+					if (rt==PT_NSCN || rt==PT_PSCN)
+						goto conduct;
+					continue;
 				}
 				switch (rt)
 				{