Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/mm7_1.cpp	Tue Mar 12 03:10:35 2013 +0200
+++ b/mm7_1.cpp	Tue Mar 12 04:45:38 2013 +0200
@@ -3601,11 +3601,11 @@
 	if(v0->classType == PLAYER_CLASS_WARLOCK)
 		++uRestUI_FoodRequiredToRest;
   }
-  if ( CheckHiredNPCSpeciality(0x1Du) )
+  if ( CheckHiredNPCSpeciality(Porter) )
     --uRestUI_FoodRequiredToRest;
-  if ( CheckHiredNPCSpeciality(0x1Eu) )
+  if ( CheckHiredNPCSpeciality(QuarterMaster) )
     uRestUI_FoodRequiredToRest -= 2;
-  if ( CheckHiredNPCSpeciality(0x30u) )
+  if ( CheckHiredNPCSpeciality(Gypsy) )
     --uRestUI_FoodRequiredToRest;
   if ( uRestUI_FoodRequiredToRest < 1 )
     uRestUI_FoodRequiredToRest = 1;
@@ -3927,11 +3927,11 @@
       }
       while ( (signed int)v2 < v14 );
     }
-    if ( CheckHiredNPCSpeciality(0x1Fu) )
+    if ( CheckHiredNPCSpeciality(Factor) )
       v4 += (signed int)(10 * v4) / 100;
-    if ( CheckHiredNPCSpeciality(0x20u) )
+    if ( CheckHiredNPCSpeciality(Banker) )
       v4 += (signed int)(20 * v4) / 100;
-    if ( CheckHiredNPCSpeciality(0x2Du) )
+    if ( CheckHiredNPCSpeciality(Pirate) )
       v4 += (signed int)(10 * v4) / 100;
     if ( v3 )
     {