summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-04-18 19:46:34 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-04-18 19:46:34 (GMT)
commit94e7123791a99c6bccce41605d05cb360621eadc (patch)
tree58251d1a550f5b812ede6b094a5664d098e8fd31 /src
parent10e3f176d234782ecd097ab62dc328c6dafc5758 (diff)
downloadpowder-94e7123791a99c6bccce41605d05cb360621eadc.zip
powder-94e7123791a99c6bccce41605d05cb360621eadc.tar.gz
TPT: Allow DEST to be cloned with CLNE, PCLN, BCLN and PBCN 57d8335ca5
Diffstat (limited to 'src')
-rw-r--r--src/elements/dest.cpp2
-rw-r--r--src/simulation/Simulation.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/elements/dest.cpp b/src/elements/dest.cpp
index fa5faf8..5c18d55 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 730e5f1..8360479 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<PT_NUM;t++)