Mercurial > mm7

comparison UI/UiGame.cpp @ 1621:25d3f9e43634

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Sun, 15 Sep 2013 02:21:26 +0200
parents aaefada3e1d8
children 07fe868f0b44
comparison
equal deleted inserted replaced
1620:61ea994a1812 1621:25d3f9e43634
346 NPCData *pNPC; // ebx@2 346 NPCData *pNPC; // ebx@2
347 int pGreetType; // eax@2 347 int pGreetType; // eax@2
348 int pTextHeight; // esi@39 348 int pTextHeight; // esi@39
349 GUIButton *pButton; // eax@43 349 GUIButton *pButton; // eax@43
350 int v32; // ebx@93 350 int v32; // ebx@93
351 uint v35; // esi@93 351 //uint v35; // esi@93
352 int v38; // eax@95 352 int v38; // eax@95
353 signed int v39; // esi@99 353 signed int v39; // esi@99
354 signed int v40; // eax@102 354 signed int v40; // eax@102
355 unsigned int v41; // ebx@102 355 unsigned int v41; // ebx@102
356 int v42; // edi@102 356 int v42; // edi@102
597 } 597 }
598 } 598 }
599 599
600 // Install Buttons(Установка кнопок)-------- 600 // Install Buttons(Установка кнопок)--------
601 v32 = 0; 601 v32 = 0;
602 v35 = (uint)pDialogueWindow->pStartingPosActiveItem; 602 //v35 = (uint)pDialogueWindow->pStartingPosActiveItem;
603 for ( uint i = v35 + pDialogueWindow->pNumPresenceButton; v35 < i; i = pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem ) 603 for ( int i = pDialogueWindow->pStartingPosActiveItem; i < pDialogueWindow->pStartingPosActiveItem + pDialogueWindow->pNumPresenceButton; ++i )
604 { 604 {
605 pButton = pDialogueWindow->GetControl(v35); 605 pButton = pDialogueWindow->GetControl(i);
606 if ( !pButton ) 606 if ( !pButton )
607 break; 607 break;
608 v38 = pFontArrus->CalcTextHeight(pButton->pButtonName, &window, 0, 0); 608 v38 = pFontArrus->CalcTextHeight(pButton->pButtonName, &window, 0, 0);
609 v32 += v38; 609 v32 += v38;
610 ++v35; 610 //++v35;
611 } 611 }
612 v39 = pDialogueWindow->pNumPresenceButton; 612 v39 = pDialogueWindow->pNumPresenceButton;
613 if ( v39 ) 613 if ( v39 )
614 { 614 {
615 pOutString = (GUIFont *)((174 - v32) / v39); 615 pOutString = (GUIFont *)((174 - v32) / v39);