--- a/mm7_2.cpp	Tue Feb 26 17:24:53 2013 +0600
+++ b/mm7_2.cpp	Wed Feb 27 02:25:31 2013 +0400
@@ -91,7 +91,7 @@
     v3 = 8 * *((char *)v2 + v1);
     if ( *(&byte_4F09B1[pParty->uDaysPlayed % 7] + v3 * 4) )
     {
-      if ( !dword_4F09CC[v3] || (unsigned __int16)_449B57_test_bit(pParty->_award_bits, LOWORD(dword_4F09CC[v3])) )
+      if ( !dword_4F09CC[v3] || (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, LOWORD(dword_4F09CC[v3])) )
         break;
     }
     ++v1;
@@ -3659,7 +3659,7 @@
 LABEL_12:
     if ( v0 == 487 )
     {
-      if ( !(unsigned __int16)_449B57_test_bit(pParty->_award_bits, 239) )
+      if ( !(unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 239) )
         v0 = 486;
     }
     v5 = window_SpeakInHouse;
@@ -3757,7 +3757,7 @@
   //v3 = dword_F8B198;
   if ( dword_F8B19C != 1 )
     goto LABEL_13;
-  if ( in_current_bilding_type == BildingType_Training )
+  if ( in_current_building_type == BildingType_Training )
   {
     if ( uMessageParam == 17 )
     {
@@ -3778,9 +3778,9 @@
     goto LABEL_9;
   }
   v8 = window_SpeakInHouse;
-  if ( (in_current_bilding_type == BildingType_Stables || in_current_bilding_type == BildingType_Boats)
+  if ( (in_current_building_type == BildingType_Stables || in_current_building_type == BildingType_Boats)
     && (v1 = 0, *(&byte_4F09B1[32 * (unsigned __int8)*(&byte_4F0CCF[4 * (unsigned int)window_SpeakInHouse->ptr_1C] + uMessageParam)] + pParty->uDaysPlayed % 7))
-    || in_current_bilding_type != BildingType_Temple || uMessageParam != BildingType_MindGuild )
+    || in_current_building_type != BildingType_Temple || uMessageParam != BildingType_MindGuild )
   {
 LABEL_9:
     pDialogueWindow->Release();
@@ -3801,34 +3801,34 @@
   }
 LABEL_11:
   dword_F8B19C = uMessageParam;
-  if ( in_current_bilding_type < BildingType_19 )
-  {
-    v9 = pIcons_LOD->LoadTexture(off_4F03B8[in_current_bilding_type], TEXTURE_16BIT_PALETTE);
+  if ( in_current_building_type < BildingType_19 )
+  {
+    v9 = pIcons_LOD->LoadTexture(off_4F03B8[in_current_building_type], TEXTURE_16BIT_PALETTE);
     //v3 = dword_F8B198;
     dword_F8B164 = &pIcons_LOD->pTextures[v9];
 LABEL_13:
     v8 = window_SpeakInHouse;
   }
-  if ( in_current_bilding_type > BildingType_Tavern )
-  {
-    if ( in_current_bilding_type == BildingType_Bank )
+  if ( in_current_building_type > BildingType_Tavern )
+  {
+    if ( in_current_building_type == BildingType_Bank )
     {
       if ( dword_F8B19C >= 7 && dword_F8B19C <= 8 )
         pKeyActionMap->EnterText(1, 10, v8);
       return;
     }
-    if ( in_current_bilding_type != BildingType_Temple && in_current_bilding_type != BildingType_Training )
+    if ( in_current_building_type != BildingType_Temple && in_current_building_type != BildingType_Training )
       return;
   }
   else
   {
-    if ( in_current_bilding_type != BildingType_Tavern )
-    {
-      if ( in_current_bilding_type <= (signed int)v1 )
+    if ( in_current_building_type != BildingType_Tavern )
+    {
+      if ( in_current_building_type <= (signed int)v1 )
         return;
-      if ( in_current_bilding_type > BildingType_AlchemistShop )
-      {
-        if ( in_current_bilding_type <= BildingType_16 )
+      if ( in_current_building_type > BildingType_AlchemistShop )
+      {
+        if ( in_current_building_type <= BildingType_16 )
         {
           if ( (signed __int64)__PAIR__(
                                  *(int *)&stru_AA1058[3].pSounds[8 * (unsigned int)v8->ptr_1C + 44472],
@@ -3862,7 +3862,7 @@
           }
           return;
         }
-        if ( in_current_bilding_type != BildingType_TownHall )
+        if ( in_current_building_type != BildingType_TownHall )
           return;
         if ( uMessageParam == 99 )
         {
@@ -4078,12 +4078,12 @@
       case 96:
         pDialogueWindow->eWindowType = WINDOW_MainMenu;
         UI_CreateEndConversationButton();
-        FillAviableSkillsToTeach(in_current_bilding_type);
+        FillAviableSkillsToTeach(in_current_building_type);
         break;
       case 101:
         pDialogueWindow->eWindowType = WINDOW_MainMenu;
         UI_CreateEndConversationButton();
-        sub_4B3A72(in_current_bilding_type);
+        sub_4B3A72(in_current_building_type);
         break;
       case 102:
         dword_F8B19C = 102;
@@ -4148,7 +4148,7 @@
                   if ( pParty->uNumGold < v37 )
                   {
                     ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2u);
-                    if ( in_current_bilding_type == BildingType_Training || in_current_bilding_type == BildingType_Tavern )
+                    if ( in_current_building_type == BildingType_Training || in_current_building_type == BildingType_Tavern )
                       v39 = 4;
                     else
                       v39 = 2;
@@ -4170,7 +4170,7 @@
               {
                 pDialogueWindow->eWindowType = WINDOW_MainMenu;
                 UI_CreateEndConversationButton();
-                sub_4B3AD4(in_current_bilding_type);
+                sub_4B3AD4(in_current_building_type);
               }
             }
           }
@@ -4220,7 +4220,7 @@
       //while ( v43 < (unsigned __int8)_4F063C_smthn_by_2da_uType[p2DEvents_minus1___00[26 * (unsigned int)v8->ptr_1C]] );
       while ( v43 < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)v8->ptr_1C - 1].uType] );
     }
-    if ( in_current_bilding_type == BildingType_WeaponShop )
+    if ( in_current_building_type == BildingType_WeaponShop )
     {
       v47 = v8->ptr_1C;
       v48 = 0;
@@ -4265,7 +4265,7 @@
       //while ( v43 < (unsigned __int8)_4F063C_smthn_by_2da_uType[p2DEvents_minus1___00[26 * (unsigned int)v8->ptr_1C]] );
       while ( v43 < (unsigned __int8)uItemsAmountPerShopType[p2DEvents[(unsigned int)v8->ptr_1C - 1].uType] );
     }
-    if ( in_current_bilding_type == BildingType_WeaponShop )
+    if ( in_current_building_type == BildingType_WeaponShop )
     {
       v52 = v8->ptr_1C;
       v53 = 0;
@@ -4334,7 +4334,7 @@
         {
           UI_CreateEndConversationButton();
           dword_F8B19C = 94;
-          sub_4B3AD4(in_current_bilding_type);
+          sub_4B3AD4(in_current_building_type);
         }
         else
         {
@@ -4343,13 +4343,13 @@
             pVideoPlayer->_4BF5B2();
 LABEL_28:
             dword_F8B19C = 1;
-            sub_4B3B42(in_current_bilding_type);
+            sub_4B3B42(in_current_building_type);
             return 1;
           }
           pVideoPlayer->_4BF5B2();
           UI_CreateEndConversationButton();
           dword_F8B19C = 101;
-          sub_4B3A72(in_current_bilding_type);
+          sub_4B3A72(in_current_building_type);
         }
         return 1;
       }
@@ -4512,7 +4512,7 @@
           {
             ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2u);// "You don't have enough gold"
             v13 = window_SpeakInHouse->ptr_1C;
-            if ( in_current_bilding_type == BildingType_Training )
+            if ( in_current_building_type == BildingType_Training )
               v55 = 4;
             else
               v55 = 2;
@@ -5037,7 +5037,7 @@
   pRenderer->EndScene();
   pRenderer->Present();
   pVideoPlayer->pResetflag = 0;
-  _449B57_test_bit(pParty->_award_bits, 99);
+  _449B57_test_bit(pParty->_quest_bits, 99);
   _this.Load("winbg.pcx", 2);
   pRenderer->BeginScene();
   pRenderer->DrawTextureRGB(0, 0, &_this);
@@ -5052,13 +5052,13 @@
   pWindow.uFrameZ = 543;
   pWindow.uFrameW = 397;
   pFont = LoadFont("endgame.fnt", "FONTPAL", NULL);
-  if ( (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 99) )
+  if ( (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 99) )
   {
     v1 = pGlobalTXT_LocalizationStrings[675];
   }
   else
   {
-    result = _449B57_test_bit(pParty->_award_bits, 100);
+    result = _449B57_test_bit(pParty->_quest_bits, 100);
     if ( !(short)result )
       return result;
     v1 = pGlobalTXT_LocalizationStrings[676];
@@ -14954,9 +14954,9 @@
         sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], v24);
         ShowStatusBarString(pTmpBuf2, 2u);
         if ( v19->uItemID == 506 )
-          _449B7E_toggle_bit(pParty->_award_bits, 184, 1u);
+          _449B7E_toggle_bit(pParty->_quest_bits, 184, 1u);
         if ( v19->uItemID == 455 )
-          _449B7E_toggle_bit(pParty->_award_bits, 185, 1u);
+          _449B7E_toggle_bit(pParty->_quest_bits, 185, 1u);
         if ( !pParty->AddItem(v19) )
           pParty->SetHoldingItem(v19);
         v21 = v26;