Mercurial > mm7

diff UI/UiGame.cpp @ 1658:55bdb9b043e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Wed, 18 Sep 2013 10:23:47 +0200
parents a7eebb6ee7a2
children 620b6ba3e6b8
line wrap: on
line diff
--- a/UI/UiGame.cpp	Wed Sep 18 10:22:16 2013 +0200
+++ b/UI/UiGame.cpp	Wed Sep 18 10:23:47 2013 +0200
@@ -434,9 +434,9 @@
         if (pNPC->greet)
         {
           if ((pNPC->uFlags & 3) == 2)
-            pInString = pNPCStats->pNPCGreetings[pNPC->greet - 1].pGreeting2;
+            pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreeting2;
           else
-            pInString = pNPCStats->pNPCGreetings[pNPC->greet - 1].pGreeting1;
+            pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreeting1;
         }
       }
       else if (pGreetType == 2)//HiredNPC_greet