diff options
| author | jacob1 <jfu614@gmail.com> | 2012-12-23 23:17:34 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2012-12-23 23:17:34 (GMT) |
| commit | 9ecfbe5a185f4d6c03699f90701d7cf2e7054ac3 (patch) | |
| tree | 3b269deaed54427bbf1ee4af31868c2e1b44698a /src/simulation/elements/TSNS.cpp | |
| parent | 312dd8c0ba3f08bd1ae1e4f396387be4942cb493 (diff) | |
| parent | b6e69e8126a17b29dfa65672b5d2bdffda28c7d1 (diff) | |
| download | powder-9ecfbe5a185f4d6c03699f90701d7cf2e7054ac3.zip powder-9ecfbe5a185f4d6c03699f90701d7cf2e7054ac3.tar.gz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/simulation/elements/TSNS.cpp')
| -rw-r--r-- | src/simulation/elements/TSNS.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/TSNS.cpp b/src/simulation/elements/TSNS.cpp index a4abbaf..ae39005 100644 --- a/src/simulation/elements/TSNS.cpp +++ b/src/simulation/elements/TSNS.cpp @@ -82,7 +82,7 @@ int Element_TSNS::update(UPDATE_FUNC_ARGS) r = sim->photons[y+ry][x+rx]; if(!r) continue; - if (parts[r>>8].temp > parts[i].temp && parts[r>>8].type != PT_TSNS && parts[i].type != PT_METL) + if (parts[r>>8].temp > parts[i].temp && parts[r>>8].type != PT_TSNS && parts[r>>8].type != PT_METL) parts[i].life = 1; } return 0; |