Mercurial > mm7

comparison mm7_1.cpp @ 652:1ff57450f090

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Some fixes to TravelByTransport * Minor bug with npc profession names * Fixed not loading npc profession decriptions * NPC professions enum
author Nomad
date Tue, 12 Mar 2013 04:45:38 +0200
parents 0e368c04acfb
children ecfb1b3c9a39
comparison
equal deleted inserted replaced
651:2bf48d11d742 652:1ff57450f090
3599 break; 3599 break;
3600 } 3600 }
3601 if(v0->classType == PLAYER_CLASS_WARLOCK) 3601 if(v0->classType == PLAYER_CLASS_WARLOCK)
3602 ++uRestUI_FoodRequiredToRest; 3602 ++uRestUI_FoodRequiredToRest;
3603 } 3603 }
3604 if ( CheckHiredNPCSpeciality(0x1Du) ) 3604 if ( CheckHiredNPCSpeciality(Porter) )
3605 --uRestUI_FoodRequiredToRest; 3605 --uRestUI_FoodRequiredToRest;
3606 if ( CheckHiredNPCSpeciality(0x1Eu) ) 3606 if ( CheckHiredNPCSpeciality(QuarterMaster) )
3607 uRestUI_FoodRequiredToRest -= 2; 3607 uRestUI_FoodRequiredToRest -= 2;
3608 if ( CheckHiredNPCSpeciality(0x30u) ) 3608 if ( CheckHiredNPCSpeciality(Gypsy) )
3609 --uRestUI_FoodRequiredToRest; 3609 --uRestUI_FoodRequiredToRest;
3610 if ( uRestUI_FoodRequiredToRest < 1 ) 3610 if ( uRestUI_FoodRequiredToRest < 1 )
3611 uRestUI_FoodRequiredToRest = 1; 3611 uRestUI_FoodRequiredToRest = 1;
3612 if ( !_strcmpi(pCurrentMapName, "d29.blv") && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 98) ) 3612 if ( !_strcmpi(pCurrentMapName, "d29.blv") && (unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 98) )
3613 uRestUI_FoodRequiredToRest = 0; 3613 uRestUI_FoodRequiredToRest = 0;
3925 v3 += pNPCStats->pProfessions[v13].uHirePrice;//*(&pNPCStats->field_13A58 + 5 * v13); 3925 v3 += pNPCStats->pProfessions[v13].uHirePrice;//*(&pNPCStats->field_13A58 + 5 * v13);
3926 ++v2; 3926 ++v2;
3927 } 3927 }
3928 while ( (signed int)v2 < v14 ); 3928 while ( (signed int)v2 < v14 );
3929 } 3929 }
3930 if ( CheckHiredNPCSpeciality(0x1Fu) ) 3930 if ( CheckHiredNPCSpeciality(Factor) )
3931 v4 += (signed int)(10 * v4) / 100; 3931 v4 += (signed int)(10 * v4) / 100;
3932 if ( CheckHiredNPCSpeciality(0x20u) ) 3932 if ( CheckHiredNPCSpeciality(Banker) )
3933 v4 += (signed int)(20 * v4) / 100; 3933 v4 += (signed int)(20 * v4) / 100;
3934 if ( CheckHiredNPCSpeciality(0x2Du) ) 3934 if ( CheckHiredNPCSpeciality(Pirate) )
3935 v4 += (signed int)(10 * v4) / 100; 3935 v4 += (signed int)(10 * v4) / 100;
3936 if ( v3 ) 3936 if ( v3 )
3937 { 3937 {
3938 v3 = (signed int)(v4 * v3 / 100) / 100; 3938 v3 = (signed int)(v4 * v3 / 100) / 100;
3939 if ( v3 < 1 ) 3939 if ( v3 < 1 )