# HG changeset patch
# User Ritor1
# Date 1364318352 -21600
# Node ID 1133e34a7560c661da1a4bbb524066619d1f24a3
# Parent  35c31a49d9891b247973ed31a61fde3967a95f80# Parent  fe4c8b113548fbe0fc7b1c2b4b564283d917b50b
Слияние

diff -r fe4c8b113548 -r 1133e34a7560 NPC.cpp
--- a/NPC.cpp	Tue Mar 26 20:06:51 2013 +0200
+++ b/NPC.cpp	Tue Mar 26 23:19:12 2013 +0600
@@ -385,10 +385,10 @@
 			} while ((decode_step<78)&&!break_loop);
 		}
 
-	for (i=0; i<78; ++i)
+	for ( i = 0; i < 77; ++i )
 		{
 		pProfessionChance[i].uTotalprofChance=0;
-		for (int ii=1; ii<59; ++ii)
+		for ( int ii = 1; ii < 59; ++ii )
 			{
 			pProfessionChance[i].uTotalprofChance+=pProfessionChance[i].professionChancePerArea[ii];
 			}
diff -r fe4c8b113548 -r 1133e34a7560 mm7_3.cpp
--- a/mm7_3.cpp	Tue Mar 26 20:06:51 2013 +0200
+++ b/mm7_3.cpp	Tue Mar 26 23:19:12 2013 +0600
@@ -12657,7 +12657,7 @@
       {
         pInString = (char *)ptr_F8B1E8;
       }
-      else if (v1 == 1)
+      else if (v1 == 1)//QuestNPCDialogue
       {
         if (pNPC->greet)
         {
@@ -12667,7 +12667,7 @@
             pInString = pNPCStats->pNPCGreetings[pNPC->greet - 1].pGreeting1;
         }
       }
-      else if (v1 == 2)
+      else if (v1 == 2)//HiredNPCDialogue
       {
         auto prof = pNPCStats->pProfessions + pNPC->uProfession - 1;