Mercurial > mm7

comparison UI/UiGame.cpp @ 1629:2149b14614ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 16 Sep 2013 09:37:30 +0600
parents aaefada3e1d8
children 07fe868f0b44
comparison
equal deleted inserted replaced
1628:7ce831a2a393 1629:2149b14614ad
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);
1740 pPortrait = pTexture_PlayerFaceEradicated; 1740 pPortrait = pTexture_PlayerFaceEradicated;
1741 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime ) 1741 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime )
1742 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait); 1742 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait);
1743 else 1743 else
1744 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait); 1744 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait);
1745 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_7].uExpireTime 1745 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime
1746 | pPlayer->pPlayerBuffs[PLAYER_BUFF_8].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime 1746 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime
1747 | pPlayer->pPlayerBuffs[PLAYER_BUFF_14].uExpireTime ) 1747 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime )
1748 sub_441A4E(i); 1748 sub_441A4E(i);
1749 continue; 1749 continue;
1750 } 1750 }
1751 if (pPlayer->IsDead()) 1751 if (pPlayer->IsDead())
1752 { 1752 {
1753 pPortrait = pTexture_PlayerFaceDead; 1753 pPortrait = pTexture_PlayerFaceDead;
1754 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime ) 1754 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime )
1755 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait); 1755 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait);
1756 else 1756 else
1757 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait); 1757 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait);
1758 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_7].uExpireTime 1758 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime
1759 | pPlayer->pPlayerBuffs[PLAYER_BUFF_8].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime 1759 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime
1760 | pPlayer->pPlayerBuffs[PLAYER_BUFF_14].uExpireTime ) 1760 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime )
1761 sub_441A4E(i); 1761 sub_441A4E(i);
1762 continue; 1762 continue;
1763 } 1763 }
1764 face_expression_ID = 0; 1764 face_expression_ID = 0;
1765 for ( uint j = 0; j < pPlayerFrameTable->uNumFrames; ++j ) 1765 for ( uint j = 0; j < pPlayerFrameTable->uNumFrames; ++j )
1780 pPortrait = (Texture *)pTextures_PlayerFaces[i][pPlayer->field_1AA2];//pFace = (Texture *)pTextures_PlayerFaces[i][pFrame->uTextureID]; 1780 pPortrait = (Texture *)pTextures_PlayerFaces[i][pPlayer->field_1AA2];//pFace = (Texture *)pTextures_PlayerFaces[i][pFrame->uTextureID];
1781 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime ) 1781 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime )
1782 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait); 1782 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait);
1783 else 1783 else
1784 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait); 1784 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait);
1785 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_7].uExpireTime 1785 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime
1786 | pPlayer->pPlayerBuffs[PLAYER_BUFF_8].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime 1786 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime
1787 | pPlayer->pPlayerBuffs[PLAYER_BUFF_14].uExpireTime ) 1787 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime )
1788 sub_441A4E(i); 1788 sub_441A4E(i);
1789 continue; 1789 continue;
1790 } 1790 }
1791 } 1791 }
1792 if ( pParty->bTurnBasedModeOn == 1 ) 1792 if ( pParty->bTurnBasedModeOn == 1 )