# HG changeset patch
# User Gloval
# Date 1369369070 -14400
# Node ID 938af16d5b887e4c0e2c9dffcefaefb0fb194034
# Parent  e86b4951da707f992b50c17d6c39067e9c0acff6# Parent  bcebd491e8fa6377cdeebc97ed84252e1a45c275
Merge

diff -r e86b4951da70 -r 938af16d5b88 Game.cpp
--- a/Game.cpp	Fri May 24 08:17:05 2013 +0400
+++ b/Game.cpp	Fri May 24 08:17:50 2013 +0400
@@ -265,7 +265,7 @@
   //Render *v2; // edi@7
   //signed int v3; // esi@7
   signed int pNewNPCsCount; // ecx@58
-  char *pFlags; // eax@59
+  NPCData *pNPC; // eax@59
   Player *pPlayer; // esi@65
   //OtherOverlay *pOtherOverlay; // esi@67
   //signed int v8; // edi@67
@@ -442,13 +442,13 @@
       pNewNPCsCount = 0;
       if ( (signed int)pNPCStats->uNumNewNPCs > 0 )
       {
-        pFlags = (char *)&pNPCStats->pNewNPCData[0].uFlags;
+        pNPC = pNPCStats->pNewNPCData;
         do
         {
-          if ( *((int *)pFlags + 6) )
-            *pFlags &= 0x7Fu;
+		  if ( pNPC->field_24 )
+			  pNPC->uFlags &= 0xFFFFFF7Fu;
           ++pNewNPCsCount;
-          pFlags += 76;
+          ++pNPC;
         }
         while ( pNewNPCsCount < (signed int)pNPCStats->uNumNewNPCs );
       }
diff -r e86b4951da70 -r 938af16d5b88 Indoor.cpp
--- a/Indoor.cpp	Fri May 24 08:17:05 2013 +0400
+++ b/Indoor.cpp	Fri May 24 08:17:50 2013 +0400
@@ -1734,15 +1734,12 @@
 //----- (004488F7) --------------------------------------------------------
 void IndoorLocation::ToggleLight(signed int sLightID, unsigned int bToggle)
 {
-  char *v2; // eax@4
-
   if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && (sLightID <= pIndoor->uNumLights - 1) && (sLightID >= 0) )
   {
-    v2 = (char *)&pIndoor->pLights[sLightID].uAtributes;
     if ( bToggle )
-      *v2 &= 0xF7u;
+      pIndoor->pLights[sLightID].uAtributes &= 0xFFFFFFF7u;
     else
-      *v2 |= 8u;
+      pIndoor->pLights[sLightID].uAtributes |= 8u;
     pParty->uFlags |= 2u;
   }
 }
diff -r e86b4951da70 -r 938af16d5b88 Outdoor.cpp
--- a/Outdoor.cpp	Fri May 24 08:17:05 2013 +0400
+++ b/Outdoor.cpp	Fri May 24 08:17:50 2013 +0400
@@ -2249,7 +2249,7 @@
         if (face.HasEventHint())
           face.uAttributes |= 0x1000u;
         else
-          face.uAttributes &= 0xEFFFu;
+          face.uAttributes &= 0xFFFFEFFFu;
       }
           //++thisa;
           //v89 = pBModels;
diff -r e86b4951da70 -r 938af16d5b88 Player.cpp
--- a/Player.cpp	Fri May 24 08:17:05 2013 +0400
+++ b/Player.cpp	Fri May 24 08:17:50 2013 +0400
@@ -5221,8 +5221,8 @@
           if ((v28 < 0) || v28 > 2 )
               return v5 + v62 + v61;
         }
-      v15 = pItemsTable->pItems[v29].uDamageMod;
-      v14 = pItemsTable->pItems[v29].uDamageDice * pItemsTable->pItems[v29].uDamageRoll;
+      v15 = pItemsTable->pItems[v23].uDamageMod;
+      v14 = pItemsTable->pItems[v23].uDamageDice * pItemsTable->pItems[v23].uDamageRoll;
       v5 += v15 + v14;
       return v5 + v62 + v61;
     }
diff -r e86b4951da70 -r 938af16d5b88 SpriteObject.cpp
--- a/SpriteObject.cpp	Fri May 24 08:17:05 2013 +0400
+++ b/SpriteObject.cpp	Fri May 24 08:17:50 2013 +0400
@@ -1095,7 +1095,7 @@
   {
     if (pSpriteObjects[uLayingItemID].uAttributes & 4 )
     {
-      pSpriteObjects[uLayingItemID].uAttributes &= 0xFB;
+      pSpriteObjects[uLayingItemID].uAttributes &= 0xFFFB;
       --pTurnEngine->field_1C;
     }
   }
diff -r e86b4951da70 -r 938af16d5b88 UICharacter.cpp
--- a/UICharacter.cpp	Fri May 24 08:17:05 2013 +0400
+++ b/UICharacter.cpp	Fri May 24 08:17:50 2013 +0400
@@ -772,7 +772,7 @@
         if ( _50C9A8_item_enchantment_timer <= 0 )
         {
           _50C9A8_item_enchantment_timer = 0;
-          item_MainHand4->uAttributes &= 0xFu;
+          item_MainHand4->uAttributes &= 0xFFFFFF0Fu;
           ptr_50C9A4 = 0;
         }
         v17 = (double)GetTickCount() * 0.1;
@@ -819,7 +819,7 @@
         if ( _50C9A8_item_enchantment_timer <= 0 )
         {
           _50C9A8_item_enchantment_timer = 0;
-          itemBow->uAttributes &= 0xFu;
+          itemBow->uAttributes &= 0xFFFFFF0Fu;
           ptr_50C9A4 = 0;
         }
         v28 = (double)GetTickCount() * 0.1;
@@ -881,7 +881,7 @@
           if ( _50C9A8_item_enchantment_timer <= 0 )
           {
             _50C9A8_item_enchantment_timer = 0;
-            item_Cloak->uAttributes &= 0xFu;
+            item_Cloak->uAttributes &= 0xFFFFFF0Fu;
             ptr_50C9A4 = 0;
           }
           v40 = (double)GetTickCount() * 0.1;
@@ -949,7 +949,7 @@
           if ( _50C9A8_item_enchantment_timer <= 0 )
           {
             _50C9A8_item_enchantment_timer = 0;
-            item_Armor->uAttributes &= 0xFu;
+            item_Armor->uAttributes &= 0xFFFFFF0Fu;
             ptr_50C9A4 = 0;
           }
           v52 = (double)GetTickCount() * 0.1;
@@ -1005,7 +1005,7 @@
                 if ( _50C9A8_item_enchantment_timer <= 0 )
                 {
                   _50C9A8_item_enchantment_timer = 0;
-                  item_Armor->uAttributes &= 0xFu;
+                  item_Armor->uAttributes &= 0xFFFFFF0Fu;
                   ptr_50C9A4 = 0;
                 }
                 v97 = (double)GetTickCount();
@@ -1050,7 +1050,7 @@
               if ( _50C9A8_item_enchantment_timer <= 0 )
               {
                 _50C9A8_item_enchantment_timer = 0;
-                item_Armor->uAttributes &= 0xFu;
+                item_Armor->uAttributes &= 0xFFFFFF0Fu;
                 ptr_50C9A4 = 0;
               }
               v97 = (double)GetTickCount();
@@ -1114,7 +1114,7 @@
           if ( _50C9A8_item_enchantment_timer <= 0 )
           {
             _50C9A8_item_enchantment_timer = 0;
-            item_Boot->uAttributes &= 0xFu;
+            item_Boot->uAttributes &= 0xFFFFFF0Fu;
             ptr_50C9A4 = 0;
           }
           v64 = (double)GetTickCount() * 0.1;
@@ -1185,7 +1185,7 @@
             if ( _50C9A8_item_enchantment_timer <= 0 )
             {
               _50C9A8_item_enchantment_timer = 0;
-              item_Belt->uAttributes &= 0xFu;
+              item_Belt->uAttributes &= 0xFFFFFF0Fu;
               ptr_50C9A4 = 0;
             }
             v78 = (double)GetTickCount() * 0.1;
@@ -1260,7 +1260,7 @@
               if ( _50C9A8_item_enchantment_timer <= 0 )
               {
                 _50C9A8_item_enchantment_timer = 0;
-                item_CloakCollar->uAttributes &= 0xFu;
+                item_CloakCollar->uAttributes &= 0xFFFFFF0Fu;
                 ptr_50C9A4 = 0;
               }
               v118 = (double)GetTickCount() * 0.1;
@@ -1324,7 +1324,7 @@
           if ( _50C9A8_item_enchantment_timer <= 0 )
           {
             _50C9A8_item_enchantment_timer = 0;
-            item_Helm->uAttributes &= 0xFu;
+            item_Helm->uAttributes &= 0xFFFFFF0Fu;
             ptr_50C9A4 = 0;
           }
           v130 = (double)GetTickCount() * 0.1;
@@ -1388,7 +1388,7 @@
         if ( _50C9A8_item_enchantment_timer <= 0 )
         {
           _50C9A8_item_enchantment_timer = 0;
-          item_MainHand3->uAttributes &= 0xFu;
+          item_MainHand3->uAttributes &= 0xFFFFFF0Fu;
           ptr_50C9A4 = 0;
         }
         v141 = (double)GetTickCount() * 0.1;
@@ -1460,7 +1460,7 @@
         if ( _50C9A8_item_enchantment_timer <= 0 )
         {
           _50C9A8_item_enchantment_timer = 0;
-          item_Shield->uAttributes &= 0xFu;
+          item_Shield->uAttributes &= 0xFFFFFF0Fu;
           ptr_50C9A4 = 0;
         }
         v158 = (double)GetTickCount() * 0.1;
@@ -1602,7 +1602,7 @@
     if (_50C9A8_item_enchantment_timer <= 0)
     {
       _50C9A8_item_enchantment_timer = 0;
-      item->uAttributes &= 0xF;
+      item->uAttributes &= 0xFFFFFF0F;
       ptr_50C9A4 = 0;
     }
     pRenderer->_4A63E6(x, y, item_texture, enchantment_texture, GetTickCount() * 0.1, 0, 255);
diff -r e86b4951da70 -r 938af16d5b88 UiGame.cpp
--- a/UiGame.cpp	Fri May 24 08:17:05 2013 +0400
+++ b/UiGame.cpp	Fri May 24 08:17:50 2013 +0400
@@ -2570,7 +2570,7 @@
 LABEL_15:
     //v12 = &pIndoor->pFaces[pOutline->uFace1ID];
     if (bWizardEyeActive && uWizardEyeSkillLevel >= 3 &&
-        (pFace1->uAttributes & 0x2000000 || pFace2->uAttributes & 0x2000000) &&
+        (pFace1->uAttributes & 0x2000 || pFace2->uAttributes & 0x2000) &&
         (pIndoor->pFaceExtras[pFace1->uFaceExtraID].uEventID || pIndoor->pFaceExtras[pFace2->uFaceExtraID].uEventID))
     {
       if (uNumBlueFacesInBLVMinimap < 49)
diff -r e86b4951da70 -r 938af16d5b88 mm7_3.cpp
--- a/mm7_3.cpp	Fri May 24 08:17:05 2013 +0400
+++ b/mm7_3.cpp	Fri May 24 08:17:50 2013 +0400
@@ -14915,7 +14915,7 @@
 				if ( v81 < 0 )
 					v81 = 0;
 				rand();
-				pActor->uAttributes &= 0xFBFFFF;
+				pActor->uAttributes &= 0xFFFBFFFF;
 				if ( v81 < 5120 )
 				{
 					v45 = stru_50C198.special_ability_use_check(pActor, actor_id);