diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-20 15:54:56 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-20 15:54:56 (GMT) |
| commit | 51a0fb2d45d31cb30950d8d200a5d0fd7463fe4d (patch) | |
| tree | 4b34f9e162775793609cfd3443c8193350ea2d26 /src/simulation/elements | |
| parent | b318c3721a43de9789efc6c286b41566649f5252 (diff) | |
| download | powder-51a0fb2d45d31cb30950d8d200a5d0fd7463fe4d.zip powder-51a0fb2d45d31cb30950d8d200a5d0fd7463fe4d.tar.gz | |
TPT: Prevent CONV from destroying diamond
Diffstat (limited to 'src/simulation/elements')
| -rw-r--r-- | src/simulation/elements/CONV.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/CONV.cpp b/src/simulation/elements/CONV.cpp index a3e50cf..6ad1336 100644 --- a/src/simulation/elements/CONV.cpp +++ b/src/simulation/elements/CONV.cpp @@ -82,7 +82,7 @@ int Element_CONV::update(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) sim->create_part(r>>8, x+rx, y+ry, parts[i].ctype|(parts[i].tmp<<8)); else sim->create_part(r>>8, x+rx, y+ry, parts[i].ctype); |