summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2012-06-29 23:12:10 (GMT)
committer jacksonmj <mj-pt@jacksonmj.co.uk>2012-06-29 23:13:34 (GMT)
commita925eea52c4327fc09d198ed43ffb316a1a050c1 (patch)
tree15aae0b4513c8a5a6e69fcf132881d48a7bef58b /src
parentb83c2bebbed28372c3191cd1ea8f845c708c7883 (diff)
downloadpowder-a925eea52c4327fc09d198ed43ffb316a1a050c1.zip
powder-a925eea52c4327fc09d198ed43ffb316a1a050c1.tar.gz
C5 should not explode when touching cold INSL
Diffstat (limited to 'src')
-rw-r--r--src/elements/c5.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/c5.c b/src/elements/c5.c
index 016211b..827df6d 100644
--- a/src/elements/c5.c
+++ b/src/elements/c5.c
@@ -24,7 +24,7 @@ int update_C5(UPDATE_FUNC_ARGS) {
r = pmap[y+ry][x+rx];
if (!r)
continue;
- if (((r&0xFF)!=PT_C5 && parts[r>>8].temp<100)||(r&0xFF)==PT_HFLM)
+ if (((r&0xFF)!=PT_C5 && parts[r>>8].temp<100 && ptypes[r&0xFF].hconduct && ((r&0xFF)!=PT_HSWC||parts[r>>8].life==10)) || (r&0xFF)==PT_HFLM)
{
if (1>rand()%6)
{