Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
2117:c7bf59066842 2118:16e2ed54f269
1443 dst = strlen(pTmpBuf2.data()); 1443 dst = strlen(pTmpBuf2.data());
1444 i += 2; 1444 i += 2;
1445 break; 1445 break;
1446 case 17://текст наёмного НПС 1446 case 17://текст наёмного НПС
1447 { 1447 {
1448 uint pay_percentage = pNPCStats->pProfessions[npc->uProfession - 1].uHirePrice / 100; 1448 uint pay_percentage = pNPCStats->pProfessions[npc->uProfession].uHirePrice / 100;
1449 if ( !pay_percentage ) 1449 if ( !pay_percentage )
1450 pay_percentage = 1; 1450 pay_percentage = 1;
1451 sprintf(a1, "%lu", pay_percentage); 1451 sprintf(a1, "%lu", pay_percentage);
1452 strcat(pTmpBuf2.data(), a1); 1452 strcat(pTmpBuf2.data(), a1);
1453 dst = strlen(pTmpBuf2.data()); 1453 dst = strlen(pTmpBuf2.data());
2681 } 2681 }
2682 if ( pParty->pHirelings[0].pName && pParty->pHirelings[1].pName ) 2682 if ( pParty->pHirelings[0].pName && pParty->pHirelings[1].pName )
2683 ShowStatusBarString(pGlobalTXT_LocalizationStrings[533], 2);// ""I cannot join you, you're party is full"" 2683 ShowStatusBarString(pGlobalTXT_LocalizationStrings[533], 2);// ""I cannot join you, you're party is full""
2684 else 2684 else
2685 { 2685 {
2686 if ( speakingNPC->uProfession != 51 ) 2686 if ( speakingNPC->uProfession != 51 ) //burglars have no hiring price
2687 { 2687 {
2688 if ( pParty->uNumGold < pNPCStats->pProfessions[speakingNPC->uProfession - 1].uHirePrice ) 2688 if ( pParty->uNumGold < pNPCStats->pProfessions[speakingNPC->uProfession].uHirePrice )
2689 { 2689 {
2690 ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2);// "You don't have enough gold" 2690 ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2);// "You don't have enough gold"
2691 dialogue_show_profession_details = false; 2691 dialogue_show_profession_details = false;
2692 uDialogueType = 13; 2692 uDialogueType = 13;
2693 if ( uActiveCharacter ) 2693 if ( uActiveCharacter )
2695 if ( !dword_7241C8 ) 2695 if ( !dword_7241C8 )
2696 pGame->Draw(); 2696 pGame->Draw();
2697 dword_7241C8 = 0; 2697 dword_7241C8 = 0;
2698 return; 2698 return;
2699 } 2699 }
2700 Party::TakeGold(pNPCStats->pProfessions[speakingNPC->uProfession - 1].uHirePrice); 2700 Party::TakeGold(pNPCStats->pProfessions[speakingNPC->uProfession].uHirePrice);
2701 } 2701 }
2702 LOBYTE(speakingNPC->uFlags) |= 0x80u; 2702 LOBYTE(speakingNPC->uFlags) |= 0x80u;
2703 if ( pParty->pHirelings[0].pName ) 2703 if ( pParty->pHirelings[0].pName )
2704 { 2704 {
2705 memcpy(&pParty->pHirelings[1], speakingNPC, sizeof(pParty->pHirelings[1])); 2705 memcpy(&pParty->pHirelings[1], speakingNPC, sizeof(pParty->pHirelings[1]));