diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-07-25 17:44:30 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-07-25 17:44:30 (GMT) |
| commit | fad2311c3603edde6b6712e9d32cc6a8ff56dca2 (patch) | |
| tree | 2eee4d6397907ca0abb7ebb3ac40b387a0e5f095 /src/simulation/elements | |
| parent | 67d449df3d16b2638014bf3501ba2dda3317cc15 (diff) | |
| download | powder-fad2311c3603edde6b6712e9d32cc6a8ff56dca2.zip powder-fad2311c3603edde6b6712e9d32cc6a8ff56dca2.tar.gz | |
TPT: C5 should not explode when touching cold INSL a925eea52c
Diffstat (limited to 'src/simulation/elements')
| -rw-r--r-- | src/simulation/elements/C5.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/C5.cpp b/src/simulation/elements/C5.cpp index e7d8f22..28e2055 100644 --- a/src/simulation/elements/C5.cpp +++ b/src/simulation/elements/C5.cpp @@ -57,7 +57,7 @@ int Element_C5::update(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 && sim->elements[r&0xFF].HeatConduct && ((r&0xFF)!=PT_HSWC||parts[r>>8].life==10)) || (r&0xFF)==PT_HFLM) { if (1>rand()%6) { |