summaryrefslogtreecommitdiff
path: root/src/simulation
diff options
context:
space:
mode:
authorcracker64 <cracker642@gmail.com>2013-01-12 04:06:42 (GMT)
committer cracker64 <cracker642@gmail.com>2013-01-12 04:06:42 (GMT)
commitb3037857f034c308f8e61172b5bdbbee8689aa1d (patch)
tree5084b9b2a676fac5ef209f14114dcf86544b7134 /src/simulation
parentf814d264b24bdddee2e2eeeae9bec42978615c94 (diff)
downloadpowder-b3037857f034c308f8e61172b5bdbbee8689aa1d.zip
powder-b3037857f034c308f8e61172b5bdbbee8689aa1d.tar.gz
Detach soap before going into STOR, fixes 1065982 (mostly)
Diffstat (limited to 'src/simulation')
-rw-r--r--src/simulation/elements/STOR.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/simulation/elements/STOR.cpp b/src/simulation/elements/STOR.cpp
index c6064cd..fd82b7a 100644
--- a/src/simulation/elements/STOR.cpp
+++ b/src/simulation/elements/STOR.cpp
@@ -61,6 +61,7 @@ int Element_STOR::update(UPDATE_FUNC_ARGS)
continue;
if (!parts[i].tmp && !parts[i].life && (r&0xFF)!=PT_STOR && !(sim->elements[(r&0xFF)].Properties&TYPE_SOLID) && (!parts[i].ctype || (r&0xFF)==parts[i].ctype))
{
+ if ((r&0xFF) == PT_SOAP) sim->detach(r>>8);
parts[i].tmp = parts[r>>8].type;
parts[i].temp = parts[r>>8].temp;
parts[i].tmp2 = parts[r>>8].life;