Mercurial > mm7

comparison mm7_3.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 ccf8b4815a1f
children c10163a6d946 1eb5021cefcb c508daac2c07
comparison
equal deleted inserted replaced
651:2bf48d11d742 652:1ff57450f090
3915 3915
3916 v0 = &pOutdoor->ddm; 3916 v0 = &pOutdoor->ddm;
3917 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor ) 3917 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor )
3918 v0 = &pIndoor->dlv; 3918 v0 = &pIndoor->dlv;
3919 v1 = 0; 3919 v1 = 0;
3920 if ( CheckHiredNPCSpeciality(0x2Du) ) 3920 if ( CheckHiredNPCSpeciality(Pirate) )
3921 v1 = 5;
3922 if ( CheckHiredNPCSpeciality(0x33u) )
3923 v1 += 5; 3921 v1 += 5;
3924 if ( CheckHiredNPCSpeciality(0x30u) ) 3922 if ( CheckHiredNPCSpeciality(Burglar) )
3925 v1 += 5; 3923 v1 += 5;
3926 if ( CheckHiredNPCSpeciality(0x32u) ) 3924 if ( CheckHiredNPCSpeciality(Gypsy) )
3927 v1 += 5; 3925 v1 += 5;
3928 if ( CheckHiredNPCSpeciality(0x34u) ) 3926 if ( CheckHiredNPCSpeciality(Duper) )
3927 v1 += 5;
3928 if ( CheckHiredNPCSpeciality(FallenWizard) )
3929 v1 += 5; 3929 v1 += 5;
3930 return v1 + v0->uReputation; 3930 return v1 + v0->uReputation;
3931 } 3931 }
3932 3932
3933 3933
11944 lPitch = pRenderer->uTargetSurfacePitch; 11944 lPitch = pRenderer->uTargetSurfacePitch;
11945 GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0, 0); 11945 GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0, 0);
11946 uBlue = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0, 0xFFu); 11946 uBlue = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0, 0xFFu);
11947 auto bWizardEyeActive = pParty->WizardEyeActive(); 11947 auto bWizardEyeActive = pParty->WizardEyeActive();
11948 auto uWizardEyeSkillLevel = pParty->WizardEyeSkillLevel(); 11948 auto uWizardEyeSkillLevel = pParty->WizardEyeSkillLevel();
11949 if (CheckHiredNPCSpeciality(0x26u)) 11949 if (CheckHiredNPCSpeciality(Cartographer))
11950 { 11950 {
11951 bWizardEyeActive = true; 11951 bWizardEyeActive = true;
11952 uWizardEyeSkillLevel = 2; 11952 uWizardEyeSkillLevel = 2;
11953 } 11953 }
11954 pRenderer->Clip_v2(uX, uY, uZ - 1, uW - 1); 11954 pRenderer->Clip_v2(uX, uY, uZ - 1, uW - 1);
13862 signed int __cdecl GetTravelTime() 13862 signed int __cdecl GetTravelTime()
13863 { 13863 {
13864 signed int v0; // esi@1 13864 signed int v0; // esi@1
13865 13865
13866 v0 = uDefaultTravelTime_ByFoot; 13866 v0 = uDefaultTravelTime_ByFoot;
13867 if ( CheckHiredNPCSpeciality(5u) ) 13867 if ( CheckHiredNPCSpeciality(Guide) )
13868 --v0; 13868 --v0;
13869 if ( CheckHiredNPCSpeciality(6u) ) 13869 if ( CheckHiredNPCSpeciality(Tracker) )
13870 v0 -= 2; 13870 v0 -= 2;
13871 if ( CheckHiredNPCSpeciality(7u) ) 13871 if ( CheckHiredNPCSpeciality(Pathfinder) )
13872 v0 -= 3; 13872 v0 -= 3;
13873 if ( CheckHiredNPCSpeciality(0x2Cu) ) 13873 if ( CheckHiredNPCSpeciality(Explorer) )
13874 --v0; 13874 --v0;
13875 if ( v0 < 1 ) 13875 if ( v0 < 1 )
13876 v0 = 1; 13876 v0 = 1;
13877 return v0; 13877 return v0;
13878 } 13878 }