# HG changeset patch
# User Ritor1
# Date 1353755555 -21600
# Node ID b4de64c44c7676aa8e23cac160199967ffeb2055
# Parent  5eb242640b6fe5d364f6da5af61b0b668a8cbf17# Parent  9433939584e2300243722713fc03da8ead3d01c4
Слияние

diff -r 5eb242640b6f -r b4de64c44c76 Party.cpp
--- a/Party.cpp	Sat Nov 24 17:12:27 2012 +0600
+++ b/Party.cpp	Sat Nov 24 17:12:35 2012 +0600
@@ -287,9 +287,9 @@
   signed int uSpellBookPageCount; // edx@5
   int v7; // eax@5
   int uSkillIdx; // eax@11
-  unsigned __int8 v9; // zf@37
-  char v10; // sf@37
-  unsigned __int8 v11; // of@37
+  //unsigned __int8 v9; // zf@37
+  //char v10; // sf@37
+  //unsigned __int8 v11; // of@37
   char *pAttributes; // eax@38
   signed int v13; // ecx@38
   int uMaxSP; // eax@42
@@ -478,11 +478,11 @@
           }
         }
         uSkillIdx = v18 + 1;
-        v11 = uSkillIdx > 36;
-        v9 = v18 == 35;
-        v10 = uSkillIdx - 35 < 0;
+        //v11 = uSkillIdx > 36;
+        //v9 = v18 == 35;
+        //v10 = uSkillIdx - 35 < 0;
       }
-      while ( (unsigned __int8)(v10 ^ v11) | v9 );
+      while (uSkillIdx < 36);
       pAttributes = (char *)&pCharacter->pInventoryItems[0].uAttributes;
       //v13 = 138;
       for (v13 = 138; v13 > 0; --v13)
@@ -497,8 +497,8 @@
     pCharacter->sHealth = pCharacter->GetMaxHealth();
     pCharacter->sMana = pCharacter->GetMaxMana();
     pCharacter++;
-    v9 = uNumPlayers-- == 1;
-    if ( v9 )
+    uNumPlayers--;
+    if (!uNumPlayers)
       break;
     pResMagicBase = (int)pCharacter;
     v3 = 10;