Mercurial > mm7

diff UI/UiGame.cpp @ 1662:620b6ba3e6b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 18 Sep 2013 14:20:00 +0600
parents e1d1fe32c194 a7eebb6ee7a2
children 5302a9811767
line wrap: on
line diff
--- a/UI/UiGame.cpp	Wed Sep 18 14:19:37 2013 +0600
+++ b/UI/UiGame.cpp	Wed Sep 18 14:20:00 2013 +0600
@@ -434,9 +434,9 @@
         if (pNPC->greet)
         {
           if ((pNPC->uFlags & 3) == 2)
-            pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreeting[1];
+            pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreeting2;
           else
-            pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreeting[0];
+            pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreeting1;
         }
       }
       else if (pGreetType == 2)//HiredNPC_greet