--- a/GUIWindow.cpp	Fri Mar 01 17:37:47 2013 +0600
+++ b/GUIWindow.cpp	Fri Mar 01 17:38:04 2013 +0600
@@ -403,7 +403,7 @@
   v1->pControlsTail = 0;
   v1->uNumControls = 0;
   v1->eWindowType = WINDOW_null;
-  v10 = v1->field_3C;
+  v10 = v1->numVisibleWindows;
   v11 = uNumVisibleWindows;
   while ( v10 < v11 )
   {
@@ -1146,9 +1146,7 @@
   else
   {
     sprintfex( pTmpBuf, pGlobalTXT_LocalizationStrings[429],
-      //p2DEvents_minus1_::08[13 * (unsigned int)ptr_507BC0->ptr_1C],
       p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].pProprieterName,
-      //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_building_type )
@@ -1173,10 +1171,7 @@
         case BildingType_MindGuild:
         case BildingType_BodyGuild:
         case BildingType_LightGuild:
-        case BildingType_Dark:
-        //case BildingType_14:
-        //case BildingType_15:
-        //case BildingType_16:
+        case BildingType_DarkGuild:
           GuildDialog();
           break;
         case BildingType_18:
@@ -1193,7 +1188,7 @@
           BankDialog();
           break;
         case BildingType_Temple:
-          TampleDialog();
+          TempleDialog();
           break;
         case BildingType_Stables:
           TravelByTransport();
@@ -1784,9 +1779,9 @@
   pWindow->uFrameHeight = uHeight;
   pWindow->eWindowType = eWindowType;
   pWindow->field_44 = 0;
-  uNumVisibleWindows = v10;
-  pWindow->field_3C = v10;
-  pVisibleWindowsIdxs[v10] = uNextFreeWindowID + 1;
+  ++uNumVisibleWindows;
+  pWindow->numVisibleWindows = uNumVisibleWindows;
+  pVisibleWindowsIdxs[uNumVisibleWindows] = uNextFreeWindowID + 1;
   if ( (signed int)eWindowType <= 20 )
   {
     if (eWindowType != WINDOW_Chest)
@@ -1801,7 +1796,7 @@
           pCurrentScreen = SCREEN_NPC_DIALOGUE;
           pBtn_ExitCancel = pWindow->CreateButton(0x1D7u, 0x1BDu, 0xA9u, 0x23u, 1, 0, 0x71u, 0, 0, pGlobalTXT_LocalizationStrings[79], //"Exit"
                          (Texture *)(uTextureID_506438 != -1 ? &pIcons_LOD->pTextures[uTextureID_506438] : 0), 0);
-          if ( pWindow->ptr_1C != (void *)1 )
+          if ( pWindow->par1C != 1 )
           {
             num_menu_buttons = 0;
             v11 = LOBYTE(pFontArrus->uFontHeight) - 3;