Mercurial > mm7

diff mm7_4.cpp @ 2118:16e2ed54f269

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ritor1
date Mon, 23 Dec 2013 23:39:26 +0600
parents c7bf59066842 18dee3152c52
children ba3de1337989
line wrap: on
line diff
--- a/mm7_4.cpp	Mon Dec 23 23:38:51 2013 +0600
+++ b/mm7_4.cpp	Mon Dec 23 23:39:26 2013 +0600
@@ -1445,7 +1445,7 @@
           break;
         case 17://òåêñò íà¸ìíîãî ÍÏÑ
         {
-          uint pay_percentage = pNPCStats->pProfessions[npc->uProfession - 1].uHirePrice / 100;
+          uint pay_percentage = pNPCStats->pProfessions[npc->uProfession].uHirePrice / 100;
           if ( !pay_percentage )
             pay_percentage = 1;
           sprintf(a1, "%lu", pay_percentage);
@@ -2683,9 +2683,9 @@
       ShowStatusBarString(pGlobalTXT_LocalizationStrings[533], 2);// ""I cannot join you, you're party is full""
     else
     {
-      if ( speakingNPC->uProfession != 51 )
+      if ( speakingNPC->uProfession != 51 ) //burglars have no hiring price
       {
-        if ( pParty->uNumGold < pNPCStats->pProfessions[speakingNPC->uProfession - 1].uHirePrice )
+        if ( pParty->uNumGold < pNPCStats->pProfessions[speakingNPC->uProfession].uHirePrice )
         {
           ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2);// "You don't have enough gold"
           dialogue_show_profession_details = false;
@@ -2697,7 +2697,7 @@
           dword_7241C8 = 0;
           return;
         }
-        Party::TakeGold(pNPCStats->pProfessions[speakingNPC->uProfession - 1].uHirePrice);
+        Party::TakeGold(pNPCStats->pProfessions[speakingNPC->uProfession].uHirePrice);
       }
       LOBYTE(speakingNPC->uFlags) |= 0x80u;
       if ( pParty->pHirelings[0].pName )