diff GUIWindow.cpp @ 498:89e360b3a0fd

Слияние
author Ritor1
date Wed, 27 Feb 2013 09:26:16 +0600
parents 4a87e83c53d1 4bd56919f075
children dd5124185551
line wrap: on
line diff
--- a/GUIWindow.cpp	Wed Feb 27 09:14:15 2013 +0600
+++ b/GUIWindow.cpp	Wed Feb 27 09:26:16 2013 +0600
@@ -563,7 +563,7 @@
         for ( i = dword_506528; i < 512; ++i )
         {
           v14 = (char *)pQuestTable[i-1];//(&dword_722F10)[4 * i];
-          if ( (unsigned __int16)_449B57_test_bit(pParty->_award_bits, i) && v14 )
+          if ( (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, i) && v14 )
           {
             v15 = dword_506520++;
             pStru179.field_0[v15] = i;
@@ -1070,7 +1070,7 @@
   v18.uFrameZ += 8;
   if ( !pDialogueNPCCount )
   {
-    if ( in_current_bilding_type == BildingType_Jail )
+    if ( in_current_building_type == BildingType_Jail )
     {
       JailDialog();
       goto LABEL_58;
@@ -1151,7 +1151,7 @@
       //p2DEvents_minus1__10[13 * (unsigned int)ptr_507BC0->ptr_1C]);
       p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pProprieterTitle);
     v18.DrawTitleText(pFontCreate, 0x1E3u, 0x71u, v19, pTmpBuf, 3u);
-      switch ( in_current_bilding_type )
+      switch ( in_current_building_type )
       {
         case BildingType_WeaponShop:
           WeaponShopDialog();