--- a/mm7_5.cpp	Thu Apr 04 09:35:58 2013 +0600
+++ b/mm7_5.cpp	Mon Apr 15 16:36:56 2013 +0600
@@ -3859,16 +3859,14 @@
           if ( pUIMessageType == UIMSG_PlayerCreationClickPlus )
           {
             GUIWindow::Create(613, 393, 0, 0, (enum WindowType)90, (int)pPlayerCreationUI_BtnPlus, 1);
-            (&pPlayer[uPlayerCreationUI_SelectedCharacter])->IncreaseAttribute(
-              (pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem) % 7);
+            pPlayer[uPlayerCreationUI_SelectedCharacter].IncreaseAttribute((pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem) % 7);
             pAudioPlayer->PlaySound((SoundID)20, 0, 0, -1, 0, 0, 0, 0);
             continue;
           }
           if ( pUIMessageType == UIMSG_PlayerCreationClickMinus )
           {
             GUIWindow::Create(523, 393, 0, 0, (enum WindowType)90, (int)pPlayerCreationUI_BtnMinus, 1);
-            (&pPlayer[uPlayerCreationUI_SelectedCharacter])->DecreaseAttribute(
-              (pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem) % 7);
+            pPlayer[uPlayerCreationUI_SelectedCharacter].DecreaseAttribute((pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem) % 7);
             pAudioPlayer->PlaySound((SoundID)23, 0, 0, -1, 0, 0, 0, 0);
             continue;
           }
@@ -5006,7 +5004,7 @@
       {
         if ( player->HasItemEquipped((ITEM_EQUIP_TYPE)v59) )
         {
-          auto _s = (ItemGen *)&player->pInventoryItems[v57->uOffHand-1];
+          auto _s = (ItemGen *)&player->pInventoryItems[v57->uShield - 1];
           a4 = _s->_439DF3_get_additional_damage(&a2, &v62);
           if ( v62 && pMonster->sCurrentHP > 0 )
           {
@@ -5248,7 +5246,7 @@
                                      v75 = v6->sHealth,
                                      !stru_50C198.ActorHitOrMiss(v7, v6)) )
       return;
-    v8 = v6->pEquipment.uBody;
+    v8 = v6->pEquipment.uArmor;
     if ( !v8
       || (v9 = (char *)v6 + 36 * v8, v9[516] & 2)
       || (v10 = pItemsTable->pItems[*((int *)v9 + 124)].uSkillType, v10 < 10)
@@ -5486,7 +5484,7 @@
     if ( v45->HasEnchantedItemEquipped(69) )
       v77 >>= 1;
     if ( v45->HasItemEquipped(EQUIP_ARMOUR)
-		&& *(_DWORD *)&v45->pInventoryItems[v45->pEquipment.uBody-1] == 504 )
+		&& *(_DWORD *)&v45->pInventoryItems[v45->pEquipment.uArmor-1] == 504 )
       v77 >>= 1;
     v75 = 0;
 	v47 = (int)&v45->pEquipment;
@@ -6352,7 +6350,7 @@
         result = sub_43EE15_player_has_item(v5, *pPlayers, 0);
         if ( !result )
           break;
-        result = v6->pEquipment.uBody;
+        result = v6->pEquipment.uArmor;
         if ( !result )
           break;
         result *= 9;
@@ -6367,7 +6365,7 @@
   }
   result = sub_43EE15_player_has_item(604u, ::pPlayers[a1], 0);
   if ( !result
-    || (result = v2->pEquipment.uBody) == 0
+    || (result = v2->pEquipment.uArmor) == 0
     || (result *= 9, *(int *)&v2->spellbook.pDarkSpellbook.bIsSpellAvailable[4 * result + 5] != v3) )
   {
 LABEL_6:
@@ -10782,7 +10780,7 @@
 			sub_4606FE();
 			break;
 			}
-		case WINDOW_1F:
+		case WINDOW_CastSpell_InInventory:
 			{
             pRenderer->ClearZBuffer(0, 479);
             draw_leather();