changeset 1609:debc6edce54c

Слияние
author Ritor1
date Thu, 12 Sep 2013 11:55:16 +0600
parents fb809d1891bd (diff) 1efbaf1d01c3 (current diff)
children fa0e700bcc80
files UI/UIHouses.cpp
diffstat 1 files changed, 17 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/UI/UIHouses.cpp	Wed Sep 11 18:01:30 2013 +0600
+++ b/UI/UIHouses.cpp	Thu Sep 12 11:55:16 2013 +0600
@@ -3811,8 +3811,8 @@
   int v38; // eax@52
   signed int v39; // ecx@54
   int v40; // edi@57
-  GUIButton *v41; // eax@60
-  GUIButton *v42; // esi@60
+  //GUIButton *v41; // eax@60
+  //GUIButton *v42; // esi@60
   const char *v43; // ebx@60
   int v44; // eax@60
   unsigned int v45; // ecx@60
@@ -4025,15 +4025,15 @@
     v40 = (174 - (signed int)pNPC * v39 - v34) / 2 - (signed int)pNPC / 2 + 138;
     for ( i = pDialogueWindow->pStartingPosActiveItem; i < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem; ++i )
     {
-      v41 = pDialogueWindow->GetControl(i);
-      v42 = v41;
-      v43 = v41->pButtonName;
-      v41->uY = (unsigned int)((char *)pNPC + v40);
-      v44 = pFontArrus->CalcTextHeight(v41->pButtonName, &v52, 0, 0);
-      v45 = v42->uY;
-      v42->uHeight = v44;
+      pButton = pDialogueWindow->GetControl(i);
+      //v42 = v41;
+      v43 = pButton->pButtonName;
+      pButton->uY = (unsigned int)((char *)pNPC + v40);
+      v44 = pFontArrus->CalcTextHeight(pButton->pButtonName, &v52, 0, 0);
+      v45 = pButton->uY;
+      pButton->uHeight = v44;
       v40 = v45 + v44 - 1;
-      v42->uW = v40;
+      pButton->uW = v40;
       v46 = TargetColor(0xE1u, 0xCDu, 0x23u);
       if ( (char *)pDialogueWindow->pCurrentPosActiveItem != pInString )
         v46 = TargetColor(0xFFu, 0xFFu, 0xFFu);
@@ -4061,19 +4061,12 @@
 //----- (004B4F4F) --------------------------------------------------------
 void JailDialog()
 {
-  const char *v0; // esi@1
-  const char *v1; // ST10_4@1
-  unsigned __int16 v2; // ST0C_2@1
-  int v3; // eax@1
-  GUIWindow v5; // [sp+8h] [bp-54h]@1
+  GUIWindow jail_dialogue_window; // [sp+8h] [bp-54h]@1
 
-  memcpy(&v5, window_SpeakInHouse, sizeof(v5));
-  v0 = pGlobalTXT_LocalizationStrings[672];
-  v1 = pGlobalTXT_LocalizationStrings[672];
-  v5.uFrameX = 483;
-  v5.uFrameWidth = 148;
-  v5.uFrameZ = 334;
-  v2 = TargetColor(0xFFu, 0xFFu, 0x9Bu);
-  v3 = pFontArrus->CalcTextHeight(v0, &v5, 0, 0);
-  v5.DrawTitleText(pFontArrus, 0, (310 - v3) / 2 + 18, v2, v1, 3u);
+  memcpy(&jail_dialogue_window, window_SpeakInHouse, sizeof(jail_dialogue_window));
+  jail_dialogue_window.uFrameX = 483;
+  jail_dialogue_window.uFrameWidth = 148;
+  jail_dialogue_window.uFrameZ = 334;
+  jail_dialogue_window.DrawTitleText(pFontArrus, 0, (310 - pFontArrus->CalcTextHeight(pGlobalTXT_LocalizationStrings[672], &jail_dialogue_window, 0, 0)) / 2 + 18,
+     TargetColor(0xFFu, 0xFFu, 0x9Bu), pGlobalTXT_LocalizationStrings[672], 3);
 }
\ No newline at end of file