diff GUIWindow.cpp @ 457:e5cf03a3d98e

m
author Ritor1
date Sun, 24 Feb 2013 20:39:03 +0600
parents 5e5dfedcc0ad
children c43f156a95c9
line wrap: on
line diff
--- a/GUIWindow.cpp	Sun Feb 24 13:53:18 2013 +0600
+++ b/GUIWindow.cpp	Sun Feb 24 20:39:03 2013 +0600
@@ -1048,7 +1048,7 @@
   v19 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0x15u, 0x99u, 0xE9u);
   pRenderer->DrawTextureIndexed(0x1DDu, 0, pTexture_Dialogue_Background);
   pRenderer->DrawTextureTransparent(0x1D4u, 0, &pIcons_LOD->pTextures[uTextureID_507B04]);
-  if ( array_5913D8[6] != (NPCData *)uNumDialogueNPCPortraits || !uHouse_ExitPic )
+  if ( pDialogueNPCCount != uNumDialogueNPCPortraits || !uHouse_ExitPic )
   {
     w.uFrameWidth = 130;
     w.uFrameHeight = 2 * LOBYTE(pFontCreate->uFontHeight);
@@ -1068,7 +1068,7 @@
   }
   v18.uFrameWidth += 8;
   v18.uFrameZ += 8;
-  if ( !array_5913D8[6] )
+  if ( !pDialogueNPCCount )
   {
     if ( dword_F8B198 == 31 )
     {
@@ -1123,7 +1123,7 @@
         goto LABEL_57;
       }
       v15 = 3;
-      v13 = array_5913D8[v8 - (dword_591080 != 0)]->pName;
+      v13 = HouseNPCData[v8 - (dword_591080 != 0)]->pName;
       v9 = pNPCPortraits_x[6 + (uNumDialogueNPCPortraits - 1)][v8] + pDialogueNPCPortraits[v8]->uTextureHeight + 2;
     }
     v11 = v19;
@@ -1131,7 +1131,7 @@
     v18.DrawTitleText(pFontCreate, 0x1E3u, v10, v11, v13, v15);
     goto LABEL_57;
   }
-  v4 = (char *)array_5913D8[6] - 1;
+  v4 = (char *)pDialogueNPCCount - 1;
   pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0] - 4, pNPCPortraits_y[0][0] - 4, &pIcons_LOD->pTextures[uTextureID_50795C]);
   pRenderer->DrawTextureIndexed(pNPCPortraits_x[0][0], pNPCPortraits_y[0][0], pDialogueNPCPortraits[(signed int)v4]);
   if ( pCurrentScreen == SCREEN_E )
@@ -1220,7 +1220,7 @@
     }
   }
 LABEL_58:
-  if ( array_5913D8[6] == (NPCData *)uNumDialogueNPCPortraits && uHouse_ExitPic )
+  if ( pDialogueNPCCount == uNumDialogueNPCPortraits && uHouse_ExitPic )
   {
     pRenderer->DrawTextureIndexed(556, 451, &pIcons_LOD->pTextures[uTextureID_x_x_u]);
     pRenderer->DrawTextureIndexed(476, 451, &pIcons_LOD->pTextures[uTextureID_x_ok_u]);
@@ -1948,7 +1948,7 @@
         else
         {
           if ( v26 || !dword_591080 )
-            v27 = array_5913D8[v26 - (dword_591080 != 0)]->pName;
+            v27 = HouseNPCData[v26 - (dword_591080 != 0)]->pName;
           else
             //v27 = (char *)p2DEvents_minus1_::08[13 * a4];
             v27 = (char *)p2DEvents[pButton - 1].pProprieterName;
@@ -1956,7 +1956,7 @@
           v29 = (char*)pGlobalTXT_LocalizationStrings[435];// "Converse with %s" Побеседовать с ^Pt[%s]
         }
         sprintf(&byte_591180[100 * v26], v29, v30);
-        array_5913D8[v26 + 7] = (NPCData *)pWindow->CreateButton(pNPCPortraits_x[uNumDialogueNPCPortraits - 1][v26],
+        HouseNPCData[v26 + 7] = (NPCData *)pWindow->CreateButton(pNPCPortraits_x[uNumDialogueNPCPortraits - 1][v26],
                                                                  pNPCPortraits_y[uNumDialogueNPCPortraits - 1][v26],
                                              0x3Fu, 0x49u, 1, 0, 0x19Au, v26, 0, &byte_591180[100 * v26], 0, 0, 0);
         ++v26;