diff UI/UIPopup.cpp @ 1465:090ff42290c4

Слияние
author Ritor1
date Mon, 26 Aug 2013 10:39:24 +0600
parents 2ca62c9e7b3c
children c4ab816fcc5e
line wrap: on
line diff
--- a/UI/UIPopup.cpp	Mon Aug 26 10:39:10 2013 +0600
+++ b/UI/UIPopup.cpp	Mon Aug 26 10:39:24 2013 +0600
@@ -551,7 +551,7 @@
                 {
                 if ( (inspect_item->uAttributes & 8) && (inspect_item->uSpecEnchantmentType || inspect_item->uEnchantmentType) )
                     {
-                    sub_493F79(&v67, inspect_item->uExpireTime - pParty->uTimePlayed);
+                    init_summoned_item(&v67, inspect_item->uExpireTime - pParty->uTimePlayed);
                     strcpy(pTmpBuf.data(), "Duration:");
                     Str = (char *)(v67.field_18_expire_year - game_starting_year);
                     if (v67.field_18_expire_year != 1168 )
@@ -1596,7 +1596,7 @@
     }
 
 //----- (00418083) --------------------------------------------------------
-void __cdecl CharacterUI_StatsTab_ShowHint()
+void  CharacterUI_StatsTab_ShowHint()
 {
   int pStringNum; // edi@1
   signed int pTextColor; // eax@15
@@ -1687,7 +1687,7 @@
       v15 = pPlayers[uActiveCharacter]->uLevel;
       do
       {
-        if ( (signed __int64)pPlayers[uActiveCharacter]->uExperience < (unsigned int)sub_4B46F8(v15) )
+        if ( (signed __int64)pPlayers[uActiveCharacter]->uExperience < (unsigned int)GetExperienceRequiredForLevel(v15) )
           break;
         ++v15;
       }
@@ -1696,7 +1696,7 @@
       pTmpBuf2[0] = 0;
       if ( v15 > pPlayers[uActiveCharacter]->uLevel )
         sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[147], v15);
-      v16 = sub_4B46F8(v15) - LODWORD(pPlayers[uActiveCharacter]->uExperience);
+      v16 = GetExperienceRequiredForLevel(v15) - LODWORD(pPlayers[uActiveCharacter]->uExperience);
       sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[538], v16, v15 + 1);
       strcat(pTmpBuf.data(), "\n");
       strcat(pTmpBuf.data(), pTmpBuf2.data());
@@ -1763,7 +1763,7 @@
 }
 
     //----- (00410B28) --------------------------------------------------------
-    void __thiscall DrawSpellDescriptionPopup(int spell_index)
+    void  DrawSpellDescriptionPopup(int spell_index)
         {
         Player *v1; // edi@1
         SpellInfo *v2; // esi@1