diff options
| author | jacob1 <jfu614@gmail.com> | 2012-08-12 22:10:20 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-08-13 23:27:28 (GMT) |
| commit | ab5150b36cab888153b08811fa1b0113dcfc60b2 (patch) | |
| tree | 46b5de4a9a098d5a76a6a92d80e5febddf527dd8 /src/elements | |
| parent | b3b9b0961ce85feafd0051c1eb88fa1b95ba9289 (diff) | |
| download | powder-ab5150b36cab888153b08811fa1b0113dcfc60b2.zip powder-ab5150b36cab888153b08811fa1b0113dcfc60b2.tar.gz | |
Prevent CONV from destroying diamond
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/conv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/conv.c b/src/elements/conv.c index bdba369..95edc0c 100644 --- a/src/elements/conv.c +++ b/src/elements/conv.c @@ -49,7 +49,7 @@ int update_CONV(UPDATE_FUNC_ARGS) { r = pmap[y+ry][x+rx]; if (!r) continue; - if((r&0xFF)!=PT_CONV && (r&0xFF)!=parts[i].ctype) + if((r&0xFF)!=PT_CONV && (r&0xFF)!=PT_DMND && (r&0xFF)!=parts[i].ctype) { if (parts[i].ctype==PT_LIFE) create_part(r>>8, x+rx, y+ry, parts[i].ctype|(parts[i].tmp<<8)); else create_part(r>>8, x+rx, y+ry, parts[i].ctype); |