Mercurial > mm7

changeset 826:1133e34a7560

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 26 Mar 2013 23:19:12 +0600
parents 35c31a49d989 (diff) fe4c8b113548 (current diff)
children 085eb19b7ffd
files mm7_3.cpp
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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];
 			}
--- 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;