summaryrefslogtreecommitdiff
path: root/src/elements
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2012-05-20 22:19:45 (GMT)
committer jacksonmj <mj-pt@jacksonmj.co.uk>2012-05-20 22:22:47 (GMT)
commiteb0b2f9ca39398b72d528e6ff6c6ac6db3a0a3c5 (patch)
tree6ee7e4fa6d9007d8ef8f3901a5ab94056f6f3d4a /src/elements
parent089ea8b7a0d1e2252e4336a1b7e0512b0b449fd0 (diff)
downloadpowder-eb0b2f9ca39398b72d528e6ff6c6ac6db3a0a3c5.zip
powder-eb0b2f9ca39398b72d528e6ff6c6ac6db3a0a3c5.tar.gz
Fix infinite loop when trying to detach soap with extra ctype bits set
Diffstat (limited to 'src/elements')
-rw-r--r--src/elements/soap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/elements/soap.c b/src/elements/soap.c
index 097aca4..c8b5078 100644
--- a/src/elements/soap.c
+++ b/src/elements/soap.c
@@ -31,13 +31,13 @@ int update_SOAP(UPDATE_FUNC_ARGS)
{
if (parts[i].life<=0)
{
- if ((parts[i].ctype&6) != 6 && parts[i].ctype>1)
+ if ((parts[i].ctype&6) != 6 && (parts[i].ctype&6))
{
int target;
target = i;
- while((parts[target].ctype&6) != 6 && parts[target].ctype>1)
+ while((parts[target].ctype&6) != 6 && (parts[target].ctype&6))
{
if ((parts[target].ctype&2) == 2)
{