summaryrefslogtreecommitdiff
path: root/src/elements/thdr.c
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2012-06-09 10:08:11 (GMT)
committer jacksonmj <mj-pt@jacksonmj.co.uk>2012-06-09 10:08:11 (GMT)
commit8b20bfd764308fddc1280b8a9d030e77503d0b0c (patch)
treefe5c3a7799972b43188085fc9420ab98f4709e9c /src/elements/thdr.c
parent6603baa538673f073fd5ecfd383ab294e75409ba (diff)
downloadpowder-8b20bfd764308fddc1280b8a9d030e77503d0b0c.zip
powder-8b20bfd764308fddc1280b8a9d030e77503d0b0c.tar.gz
Make THDR TYPE_ENERGY again, so it goes in photon map
Will simplify checking for excessive stacking
Diffstat (limited to 'src/elements/thdr.c')
-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 f1aafa3..d400ecb 100644
--- a/src/elements/thdr.c
+++ b/src/elements/thdr.c
@@ -31,7 +31,7 @@ int update_THDR(UPDATE_FUNC_ARGS) {
part_change_type(r>>8,x+rx,y+ry,PT_SPRK);
parts[r>>8].life = 4;
}
- else if ((r&0xFF)!=PT_CLNE&&(r&0xFF)!=PT_THDR&&(r&0xFF)!=PT_SPRK&&(r&0xFF)!=PT_DMND&&(r&0xFF)!=PT_FIRE&&(r&0xFF)!=PT_NEUT&&(r&0xFF)!=PT_PHOT&&(r&0xFF))
+ else if ((r&0xFF)!=PT_CLNE&&(r&0xFF)!=PT_SPRK&&(r&0xFF)!=PT_DMND&&(r&0xFF)!=PT_FIRE&&!(ptypes[r&0xFF].properties&TYPE_ENERGY)&&(r&0xFF))
{
pv[y/CELL][x/CELL] += 100.0f;
if (legacy_enable&&1>(rand()%200))