From ab5150b36cab888153b08811fa1b0113dcfc60b2 Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Sun, 12 Aug 2012 18:10:20 -0400
Subject: [PATCH] Prevent CONV from destroying diamond

---
 src/elements/conv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/elements/conv.c b/src/elements/conv.c
index bdba3693f..95edc0c8a 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);