From 94e7123791a99c6bccce41605d05cb360621eadc Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Wed, 18 Apr 2012 20:46:34 +0100 Subject: [PATCH] TPT: Allow DEST to be cloned with CLNE, PCLN, BCLN and PBCN 57d8335ca5 --- src/elements/dest.cpp | 2 +- src/simulation/Simulation.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/elements/dest.cpp b/src/elements/dest.cpp index fa5faf878..5c18d5584 100644 --- a/src/elements/dest.cpp +++ b/src/elements/dest.cpp @@ -6,7 +6,7 @@ int update_DEST(UPDATE_FUNC_ARGS) { ry=rand()%5-2; r = pmap[y+ry][x+rx]; - if (!r || (r&0xFF)==PT_DEST || (r&0xFF)==PT_DMND) + if (!r || (r&0xFF)==PT_DEST || (r&0xFF)==PT_DMND || (r&0xFF)==PT_BCLN || (r&0xFF)==PT_CLNE || (r&0xFF)==PT_PCLN || (r&0xFF)==PT_PBCN) return 0; if (parts[i].life<=0 || parts[i].life>37) diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 730e5f157..836047932 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -1189,6 +1189,10 @@ void Simulation::init_can_move() } } can_move[PT_DEST][PT_DMND] = 0; + can_move[PT_DEST][PT_CLNE] = 0; + can_move[PT_DEST][PT_PCLN] = 0; + can_move[PT_DEST][PT_BCLN] = 0; + can_move[PT_DEST][PT_PBCN] = 0; can_move[PT_BIZR][PT_FILT] = 2; can_move[PT_BIZRG][PT_FILT] = 2; for (t=0;t