From 51a0fb2d45d31cb30950d8d200a5d0fd7463fe4d Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Mon, 20 Aug 2012 16:54:56 +0100 Subject: [PATCH] TPT: Prevent CONV from destroying diamond --- src/simulation/elements/CONV.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/simulation/elements/CONV.cpp b/src/simulation/elements/CONV.cpp index a3e50cf17..6ad13369a 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);