TPT: C5 should not explode when touching cold INSL a925eea52c

This commit is contained in:
Simon Robertshaw 2012-07-25 18:44:30 +01:00
parent 67d449df3d
commit fad2311c36

View File

@ -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)
{