Mercurial > mm7

comparison UI/UIPopup.cpp @ 1465:090ff42290c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 26 Aug 2013 10:39:24 +0600
parents 2ca62c9e7b3c
children c4ab816fcc5e
comparison
equal deleted inserted replaced
1464:b870630761df 1465:090ff42290c4
549 } 549 }
550 else 550 else
551 { 551 {
552 if ( (inspect_item->uAttributes & 8) && (inspect_item->uSpecEnchantmentType || inspect_item->uEnchantmentType) ) 552 if ( (inspect_item->uAttributes & 8) && (inspect_item->uSpecEnchantmentType || inspect_item->uEnchantmentType) )
553 { 553 {
554 sub_493F79(&v67, inspect_item->uExpireTime - pParty->uTimePlayed); 554 init_summoned_item(&v67, inspect_item->uExpireTime - pParty->uTimePlayed);
555 strcpy(pTmpBuf.data(), "Duration:"); 555 strcpy(pTmpBuf.data(), "Duration:");
556 Str = (char *)(v67.field_18_expire_year - game_starting_year); 556 Str = (char *)(v67.field_18_expire_year - game_starting_year);
557 if (v67.field_18_expire_year != 1168 ) 557 if (v67.field_18_expire_year != 1168 )
558 { 558 {
559 sprintf(v65, " %d:yr", v67.field_18_expire_year - game_starting_year); 559 sprintf(v65, " %d:yr", v67.field_18_expire_year - game_starting_year);
1594 } 1594 }
1595 1595
1596 } 1596 }
1597 1597
1598 //----- (00418083) -------------------------------------------------------- 1598 //----- (00418083) --------------------------------------------------------
1599 void __cdecl CharacterUI_StatsTab_ShowHint() 1599 void CharacterUI_StatsTab_ShowHint()
1600 { 1600 {
1601 int pStringNum; // edi@1 1601 int pStringNum; // edi@1
1602 signed int pTextColor; // eax@15 1602 signed int pTextColor; // eax@15
1603 char *pHourWord; // ecx@17 1603 char *pHourWord; // ecx@17
1604 char *pDayWord; // eax@20 1604 char *pDayWord; // eax@20
1685 break; 1685 break;
1686 case 14://Experience 1686 case 14://Experience
1687 v15 = pPlayers[uActiveCharacter]->uLevel; 1687 v15 = pPlayers[uActiveCharacter]->uLevel;
1688 do 1688 do
1689 { 1689 {
1690 if ( (signed __int64)pPlayers[uActiveCharacter]->uExperience < (unsigned int)sub_4B46F8(v15) ) 1690 if ( (signed __int64)pPlayers[uActiveCharacter]->uExperience < (unsigned int)GetExperienceRequiredForLevel(v15) )
1691 break; 1691 break;
1692 ++v15; 1692 ++v15;
1693 } 1693 }
1694 while ( v15 <= 10000 ); 1694 while ( v15 <= 10000 );
1695 pTmpBuf[0] = 0; 1695 pTmpBuf[0] = 0;
1696 pTmpBuf2[0] = 0; 1696 pTmpBuf2[0] = 0;
1697 if ( v15 > pPlayers[uActiveCharacter]->uLevel ) 1697 if ( v15 > pPlayers[uActiveCharacter]->uLevel )
1698 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[147], v15); 1698 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[147], v15);
1699 v16 = sub_4B46F8(v15) - LODWORD(pPlayers[uActiveCharacter]->uExperience); 1699 v16 = GetExperienceRequiredForLevel(v15) - LODWORD(pPlayers[uActiveCharacter]->uExperience);
1700 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[538], v16, v15 + 1); 1700 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[538], v16, v15 + 1);
1701 strcat(pTmpBuf.data(), "\n"); 1701 strcat(pTmpBuf.data(), "\n");
1702 strcat(pTmpBuf.data(), pTmpBuf2.data()); 1702 strcat(pTmpBuf.data(), pTmpBuf2.data());
1703 sprintf(pTmpBuf2.data(), "%s\n \n%s", pPlayerExperienceAttributeDescription, pTmpBuf.data()); 1703 sprintf(pTmpBuf2.data(), "%s\n \n%s", pPlayerExperienceAttributeDescription, pTmpBuf.data());
1704 if ( pGlobalTXT_LocalizationStrings[83] && pTmpBuf2.data() ) 1704 if ( pGlobalTXT_LocalizationStrings[83] && pTmpBuf2.data() )
1761 break; 1761 break;
1762 } 1762 }
1763 } 1763 }
1764 1764
1765 //----- (00410B28) -------------------------------------------------------- 1765 //----- (00410B28) --------------------------------------------------------
1766 void __thiscall DrawSpellDescriptionPopup(int spell_index) 1766 void DrawSpellDescriptionPopup(int spell_index)
1767 { 1767 {
1768 Player *v1; // edi@1 1768 Player *v1; // edi@1
1769 SpellInfo *v2; // esi@1 1769 SpellInfo *v2; // esi@1
1770 unsigned int v3; // eax@2 1770 unsigned int v3; // eax@2
1771 int v4; // eax@4 1771 int v4; // eax@4