summaryrefslogtreecommitdiff
path: root/src/elements
diff options
context:
space:
mode:
authorjacksonmj <jacksonmj@jacksonmj.none>2011-01-07 16:56:15 (GMT)
committer jacksonmj <jacksonmj@jacksonmj.none>2011-01-07 16:56:15 (GMT)
commitaebcc0ebe4ba9a71ab6efedb679db6db599fff16 (patch)
tree06cdc3c6ab2bc2972c8f69c641dcdcd3f99ab436 /src/elements
parentf3ded5f08c0bbb3523a0ab2ee6e07538fabd79c2 (diff)
downloadpowder-aebcc0ebe4ba9a71ab6efedb679db6db599fff16.zip
powder-aebcc0ebe4ba9a71ab6efedb679db6db599fff16.tar.gz
Use PROP_CONDUCTS more.
Diffstat (limited to 'src/elements')
-rw-r--r--src/elements/thdr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/thdr.c b/src/elements/thdr.c
index 3592d9e..3e6f2f7 100644
--- a/src/elements/thdr.c
+++ b/src/elements/thdr.c
@@ -10,7 +10,7 @@ int update_THDR(UPDATE_FUNC_ARGS) {
r = pmap[y+ny][x+nx];
if ((r>>8)>=NPART || !r)
continue;
- if (((r&0xFF)==PT_METL || (r&0xFF)==PT_IRON || (r&0xFF)==PT_ETRD || (r&0xFF)==PT_PSCN || (r&0xFF)==PT_NSCN || (r&0xFF)==PT_NTCT || (r&0xFF)==PT_PTCT || (r&0xFF)==PT_BMTL || (r&0xFF)==PT_RBDM || (r&0xFF)==PT_LRBD || (r&0xFF)==PT_BRMT || (r&0xFF)==PT_NBLE || (r&0xFF)==PT_INWR) && parts[r>>8].ctype!=PT_SPRK)
+ if ((ptypes[r&0xFF].properties&PROP_CONDUCTS) && !((r&0xFF)==PT_WATR||(r&0xFF)==PT_SLTW) && parts[r>>8].ctype!=PT_SPRK)
{
parts[i].type = PT_NONE;
parts[r>>8].ctype = parts[r>>8].type;