Mercurial > mm7

diff UI/UiGame.cpp @ 1655:a7eebb6ee7a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Window Resize (change arguments to MM7_Initialize)
author Nomad
date Wed, 18 Sep 2013 11:13:38 +0200
parents d453ed393d6e
children 620b6ba3e6b8
line wrap: on
line diff
--- a/UI/UiGame.cpp	Wed Sep 18 11:05:06 2013 +0600
+++ b/UI/UiGame.cpp	Wed Sep 18 11:13:38 2013 +0200
@@ -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