Mercurial > mm7

changeset 597:c03428cb4119

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stru319::_427102 clean
author zipi
date Wed, 06 Mar 2013 17:04:54 +0000
parents b5240254cbbd
children deb559e4fe47
files mm7_6.cpp
diffstat 1 files changed, 130 insertions(+), 126 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_6.cpp	Wed Mar 06 16:51:39 2013 +0200
+++ b/mm7_6.cpp	Wed Mar 06 17:04:54 2013 +0000
@@ -1735,148 +1735,152 @@
   signed int v8; // edx@50
   SpellBuff *v9; // ecx@50
 
-  if ( a2 > 73 )
+  switch(a2)
   {
-    if ( a2 == 77 )
-    {
-      if ( pActor->sCurrentHP >= (signed int)pActor->pMonsterInfo.uHP )
-        return 0;
-      return 1;
-    }
-    if ( a2 == 80 )
-    {
-      v6 = pParty->pPartyBuffs;
-      while ( (signed __int64)v6->uExpireTime <= 0 )
-      {
-        ++v6;
-        if ( v6 > &pParty->pPartyBuffs[19] )
-        {
-          v7 = pParty->pPlayers;//[0].pPlayerBuffs;
-          v8 = 0;
-		  v9 = v7->pPlayerBuffs;
-		  while ( v9->uExpireTime <= 0i64 )
-          {
-            ++v8;
-            ++v9;
-            if ( v8 >= 24 )
-            {
-              ++v7;
-              if ( v7 <= &pParty->pPlayers[3] )
-			  {
-			      v8 = 0;
-				  v9 = v7->pPlayerBuffs;
-			  }
-			  else
-	              return 0;
-            }
-          }
-          return 1;
-        }
-      }
-      return 1;
-    }
-    if ( a2 == 85 )
-    {
-      if ( SHIDWORD(pActor->pActorBuffs[13].uExpireTime) < 0 )
-        return 1;
-      if ( SHIDWORD(pActor->pActorBuffs[13].uExpireTime) > 0 )
-        return 0;
-      v3 = 0;
-      v4 = LODWORD(pActor->pActorBuffs[13].uExpireTime) == 0;
-    }
-    else
-    {
-      if ( a2 == 86 )
-      {
+	case 77:
+		{
+		if ( pActor->sCurrentHP >= (signed int)pActor->pMonsterInfo.uHP )
+			return 0;
+		return 1;
+		}
+	case 80:
+		{
+		v6 = pParty->pPartyBuffs;
+		while ( (signed __int64)v6->uExpireTime <= 0 )
+		{
+			++v6;
+			if ( v6 > &pParty->pPartyBuffs[19] )
+			{
+				v7 = pParty->pPlayers;//[0].pPlayerBuffs;
+				v8 = 0;
+				v9 = v7->pPlayerBuffs;
+				while ( v9->uExpireTime <= 0i64 )
+				{
+					++v8;
+					++v9;
+					if ( v8 >= 24 )
+					{
+						++v7;
+						if ( v7 <= &pParty->pPlayers[3] )
+						{
+							v8 = 0;
+							v9 = v7->pPlayerBuffs;
+						}
+						else
+							return 0;
+					}
+				}
+				return 1;
+			}
+		}
+		return 1;
+		}
+	case 85:
+		{
+		if ( SHIDWORD(pActor->pActorBuffs[13].uExpireTime) < 0 )
+			return 1;
+		if ( SHIDWORD(pActor->pActorBuffs[13].uExpireTime) > 0 )
+			return 0;
+		v3 = 0;
+		v4 = LODWORD(pActor->pActorBuffs[13].uExpireTime) == 0;
+		break;
+		}
+	case 86:
+		{
         if ( SHIDWORD(pActor->pActorBuffs[14].uExpireTime) < 0 )
-          return 1;
+			return 1;
         if ( SHIDWORD(pActor->pActorBuffs[14].uExpireTime) > 0 )
-          return 0;
+			return 0;
         v3 = 0;
         v4 = LODWORD(pActor->pActorBuffs[14].uExpireTime) == 0;
-      }
-      else
-      {
-        if ( a2 != 95 || SHIDWORD(pActor->pActorBuffs[20].uExpireTime) < 0 )
-          return 1;
+		break;
+		}
+	case 95:
+		{
+        if ( SHIDWORD(pActor->pActorBuffs[20].uExpireTime) < 0 )
+			return 1;
         if ( SHIDWORD(pActor->pActorBuffs[20].uExpireTime) > 0 )
-          return 0;
+			return 0;
         v3 = 0;
         v4 = LODWORD(pActor->pActorBuffs[20].uExpireTime) == 0;
-      }
-    }
-  }
-  else
-  {
-    if ( a2 == 73 )
-    {
-      if ( SHIDWORD(pActor->pActorBuffs[21].uExpireTime) < 0 )
-        return 1;
-      if ( SHIDWORD(pActor->pActorBuffs[21].uExpireTime) > 0 )
-        return 0;
-      v3 = 0;
-      v4 = LODWORD(pActor->pActorBuffs[21].uExpireTime) == 0;
-    }
-    else if ( a2 == 5 )
-    {
-      if ( SHIDWORD(pActor->pActorBuffs[19].uExpireTime) < 0 )
-        return 1;
-      if ( SHIDWORD(pActor->pActorBuffs[19].uExpireTime) > 0 )
-        return 0;
-      v3 = 0;
-      v4 = LODWORD(pActor->pActorBuffs[19].uExpireTime) == 0;
-    }
-    else if ( a2 == 17 )
-    {
-      if ( SHIDWORD(pActor->pActorBuffs[15].uExpireTime) < 0 )
-        return 1;
-      if ( SHIDWORD(pActor->pActorBuffs[15].uExpireTime) > 0 )
-        return 0;
-      v3 = 0;
-      v4 = LODWORD(pActor->pActorBuffs[15].uExpireTime) == 0;
-    }
-    else if ( a2 == 38 )
-    {
-      if ( SHIDWORD(pActor->pActorBuffs[16].uExpireTime) < 0 )
-        return 1;
-      if ( SHIDWORD(pActor->pActorBuffs[16].uExpireTime) > 0 )
-        return 0;
-      v3 = 0;
-      v4 = LODWORD(pActor->pActorBuffs[16].uExpireTime) == 0;
-    }
-    else if ( a2 == 46 )
-    {
-      if ( SHIDWORD(pActor->pActorBuffs[17].uExpireTime) < 0 )
-        return 1;
-      if ( SHIDWORD(pActor->pActorBuffs[17].uExpireTime) > 0 )
-        return 0;
-      v3 = 0;
-      v4 = LODWORD(pActor->pActorBuffs[17].uExpireTime) == 0;
-    }
-    else
-	{
-		if ( a2 != 47 )
+		break;
+		}
+	case 73:
+		{
+		if ( SHIDWORD(pActor->pActorBuffs[21].uExpireTime) < 0 )
+			return 1;
+		if ( SHIDWORD(pActor->pActorBuffs[21].uExpireTime) > 0 )
+			return 0;
+		v3 = 0;
+		v4 = LODWORD(pActor->pActorBuffs[21].uExpireTime) == 0;
+		break;
+		}
+	case 5:
+		{
+		if ( SHIDWORD(pActor->pActorBuffs[19].uExpireTime) < 0 )
+			return 1;
+		if ( SHIDWORD(pActor->pActorBuffs[19].uExpireTime) > 0 )
+			return 0;
+		v3 = 0;
+		v4 = LODWORD(pActor->pActorBuffs[19].uExpireTime) == 0;
+		break;
+		}
+	case 17:
+		{
+		if ( SHIDWORD(pActor->pActorBuffs[15].uExpireTime) < 0 )
+			return 1;
+		if ( SHIDWORD(pActor->pActorBuffs[15].uExpireTime) > 0 )
+			return 0;
+		v3 = 0;
+		v4 = LODWORD(pActor->pActorBuffs[15].uExpireTime) == 0;
+		break;
+		}
+	case 38:
 		{
-		  if ( a2 != 51 || SHIDWORD(pActor->pActorBuffs[18].uExpireTime) < 0 )
+		if ( SHIDWORD(pActor->pActorBuffs[16].uExpireTime) < 0 )
+			return 1;
+		if ( SHIDWORD(pActor->pActorBuffs[16].uExpireTime) > 0 )
+			return 0;
+		v3 = 0;
+		v4 = LODWORD(pActor->pActorBuffs[16].uExpireTime) == 0;
+		}
+	case 46:
+		{
+		if ( SHIDWORD(pActor->pActorBuffs[17].uExpireTime) < 0 )
 			return 1;
-		  if ( SHIDWORD(pActor->pActorBuffs[18].uExpireTime) <= 0 )
-		  {
+		if ( SHIDWORD(pActor->pActorBuffs[17].uExpireTime) > 0 )
+			return 0;
+		v3 = 0;
+		v4 = LODWORD(pActor->pActorBuffs[17].uExpireTime) == 0;
+		break;
+		}
+	case 47:
+		{
+		if ( SHIDWORD(pActor->pActorBuffs[11].uExpireTime) < 0 )
+			return 1;
+		if ( SHIDWORD(pActor->pActorBuffs[11].uExpireTime) > 0 )
+			return 0;
+		v3 = 0;
+		v4 = LODWORD(pActor->pActorBuffs[11].uExpireTime) == 0;
+		break;
+		}
+	case 51:
+		{
+		if ( SHIDWORD(pActor->pActorBuffs[18].uExpireTime) < 0 )
+			return 1;
+		if ( SHIDWORD(pActor->pActorBuffs[18].uExpireTime) <= 0 )
+		{
 			v3 = 0;
 			v4 = LODWORD(pActor->pActorBuffs[18].uExpireTime) == 0;
-		  }
-		  else
-			return 0;
 		}
 		else
+			return 0;
+		break;
+		}
+	default:
 		{
-			if ( SHIDWORD(pActor->pActorBuffs[11].uExpireTime) < 0 )
-			  return 1;
-			if ( SHIDWORD(pActor->pActorBuffs[11].uExpireTime) > 0 )
-			  return 0;
-			v3 = 0;
-			v4 = LODWORD(pActor->pActorBuffs[11].uExpireTime) == 0;
+		return 1;
 		}
-	}
   }
   if ( !(v3 | v4) )
     return 0;