summaryrefslogtreecommitdiff
path: root/src/elements
diff options
context:
space:
mode:
authorCatelite <liclockwork@yahoo.com>2012-06-06 17:27:58 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-06-07 13:03:44 (GMT)
commit4e3d87737edf8f862172c0f5e10585b0a567fc5a (patch)
tree8b0e0a1dd25d74ca9358246cd09a9a8236c275b6 /src/elements
parentdfb03573822761038358e78c22aba74130265ef2 (diff)
downloadpowder-4e3d87737edf8f862172c0f5e10585b0a567fc5a.zip
powder-4e3d87737edf8f862172c0f5e10585b0a567fc5a.tar.gz
Added condition so that EXOT does not automatically replicate WARP to avoid confusion, and changed spawn tmp value to avoid instant copying on spawn.
Diffstat (limited to 'src/elements')
-rw-r--r--src/elements/exot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/exot.c b/src/elements/exot.c
index c26129b..aeb77ce 100644
--- a/src/elements/exot.c
+++ b/src/elements/exot.c
@@ -33,7 +33,7 @@ int update_EXOT(UPDATE_FUNC_ARGS) {
}
}
if (parts[i].tmp>245)
- if ((r&0xFF)!=PT_EXOT && (r&0xFF)!=PT_BREL && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PRTI && (r&0xFF)!=PT_PRTO && (r&0xFF)!=PT_PCLN && (r&0xFF)!=PT_PHOT && (r&0xFF)!=PT_VOID && (r&0xFF)!=PT_NBHL)
+ if ((r&0xFF)!=PT_EXOT && (r&0xFF)!=PT_BREL && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PRTI && (r&0xFF)!=PT_PRTO && (r&0xFF)!=PT_PCLN && (r&0xFF)!=PT_PHOT && (r&0xFF)!=PT_VOID && (r&0xFF)!=PT_NBHL && (r&0xFF)!=PT_WARP)
create_part(i, x, y, parts[r>>8].type);
}
parts[i].tmp--;