diff options
| author | jacob1 <jfu614@gmail.com> | 2013-03-03 20:39:10 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-03-03 20:39:10 (GMT) |
| commit | cca1898ee8c2091833661f97748defb298cc77b9 (patch) | |
| tree | 32cc59ccb5c40c1374622bb5fc3e4f231df5cba9 /src/simulation/elements/SPRK.cpp | |
| parent | 17d79e8d8e585a39ca8b16efa1d18a11409f8079 (diff) | |
| parent | bb87299eb425802416ebe9b4a4e040153bec08fa (diff) | |
| download | powder-cca1898ee8c2091833661f97748defb298cc77b9.zip powder-cca1898ee8c2091833661f97748defb298cc77b9.tar.gz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/simulation/elements/SPRK.cpp')
| -rw-r--r-- | src/simulation/elements/SPRK.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/simulation/elements/SPRK.cpp b/src/simulation/elements/SPRK.cpp index 9e42025..3520b96 100644 --- 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) { |