diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-05-07 13:09:14 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-05-07 13:09:14 (GMT) |
| commit | 11bd67eb6102a137ebd6496e54914a7031d4fc3e (patch) | |
| tree | a426d6ea5ce898367fe230683b42a5f495e55461 /src/elements/prti.c | |
| parent | f69920b96cda8c46807a1782e40e546c0d434cb3 (diff) | |
| download | powder-11bd67eb6102a137ebd6496e54914a7031d4fc3e.zip powder-11bd67eb6102a137ebd6496e54914a7031d4fc3e.tar.gz | |
Change pipe and portal to check element type using properties instead of falldown and state
Diffstat (limited to 'src/elements/prti.c')
| -rw-r--r-- | src/elements/prti.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/elements/prti.c b/src/elements/prti.c index 691a7a9..fc6f37b 100644 --- a/src/elements/prti.c +++ b/src/elements/prti.c @@ -39,10 +39,10 @@ int update_PRTI(UPDATE_FUNC_ARGS) { r = pmap[y+ry][x+rx]; if (!r) fe = 1; - if (!r || (r&0xFF)==PT_PRTI || (r&0xFF)==PT_PRTO || (ptypes[r&0xFF].falldown== 0 && ptypes[r&0xFF].state != ST_GAS && (r&0xFF)!=PT_SPRK)) + if (!r || (r&0xFF)==PT_PRTI || (r&0xFF)==PT_PRTO || (!(ptypes[r&0xFF].properties & (TYPE_PART | TYPE_LIQUID | TYPE_GAS | TYPE_ENERGY)) && (r&0xFF)!=PT_SPRK)) { r = photons[y+ry][x+rx]; - if (!r || (r&0xFF)==PT_PRTI || (r&0xFF)==PT_PRTO || (ptypes[r&0xFF].falldown== 0 && ptypes[r&0xFF].state != ST_GAS && (r&0xFF)!=PT_SPRK)) + if (!r || (r&0xFF)==PT_PRTI || (r&0xFF)==PT_PRTO || (!(ptypes[r&0xFF].properties & (TYPE_PART | TYPE_LIQUID | TYPE_GAS | TYPE_ENERGY)) && (r&0xFF)!=PT_SPRK)) continue; } |