Mercurial > mm7

diff UI/UiGame.cpp @ 1653:d453ed393d6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NPCGreetings
author Ritor1
date Wed, 18 Sep 2013 11:04:47 +0600
parents 07fe868f0b44
children a7eebb6ee7a2 e1d1fe32c194
line wrap: on
line diff
--- a/UI/UiGame.cpp	Wed Sep 18 09:21:38 2013 +0600
+++ b/UI/UiGame.cpp	Wed Sep 18 11:04:47 2013 +0600
@@ -434,9 +434,9 @@
         if (pNPC->greet)
         {
           if ((pNPC->uFlags & 3) == 2)
-            pInString = pNPCStats->pNPCGreetings[pNPC->greet - 1].pGreeting2;
+            pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreeting[1];
           else
-            pInString = pNPCStats->pNPCGreetings[pNPC->greet - 1].pGreeting1;
+            pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreeting[0];
         }
       }
       else if (pGreetType == 2)//HiredNPC_greet