summaryrefslogtreecommitdiff
path: root/src/elements
diff options
context:
space:
mode:
authorsavask <savask@yandex.ru>2011-06-03 14:34:35 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-06-04 18:14:26 (GMT)
commit54aa1483251f71d1c4638085c2f6141ccb6bf003 (patch)
treef851af72097869df1c5fa791f8d5bf2d5f61d754 /src/elements
parentf5af89fb437e3c3fe9899643666dc01d46076b39 (diff)
downloadpowder-54aa1483251f71d1c4638085c2f6141ccb6bf003.zip
powder-54aa1483251f71d1c4638085c2f6141ccb6bf003.tar.gz
Bubbles now don't pop because of gases.
Diffstat (limited to 'src/elements')
-rw-r--r--src/elements/soap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/elements/soap.c b/src/elements/soap.c
index a709027..4ed10ac 100644
--- a/src/elements/soap.c
+++ b/src/elements/soap.c
@@ -98,7 +98,8 @@ int update_SOAP(UPDATE_FUNC_ARGS)
if (parts[i].temp>0)
{
if (bmap[(y+ry)/CELL][(x+rx)/CELL]
- || ((r&0xFF) != PT_SOAP && (r&0xFF) != PT_GLAS)
+ || (r && ptypes[r&0xFF].state != ST_GAS
+ && (r&0xFF) != PT_SOAP && (r&0xFF) != PT_GLAS)
|| (parts[r>>8].ctype == 0 && (r&0xFF) == PT_SOAP
&& (abs(parts[r>>8].vx)<2 || abs(parts[r>>8].vy)<2)))
{