Mercurial > mm7

diff UI/UIHouses.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 4bbb80c7dba7
line wrap: on
line diff
--- a/UI/UIHouses.cpp	Wed Sep 18 14:19:37 2013 +0600
+++ b/UI/UIHouses.cpp	Wed Sep 18 14:20:00 2013 +0600
@@ -3404,7 +3404,7 @@
       {
         house_window.uFrameWidth = game_viewport_width;
         house_window.uFrameZ = 452;
-        pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreeting[((pNPC->uFlags & 3) == 2)];
+        pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreetings[((pNPC->uFlags & 3) == 2)];
         //pInString = (char *)*(&pNPCStats->field_17884 + ((pNPC->uFlags & 3) == 2) + 2 * pNPC->greet);
         pRenderer->GetLeather(8, 352 - (pFontArrus->CalcTextHeight(pInString, &house_window, 13, 0) + 7),
            pIcons_LOD->GetTexture(uTextureID_Leather), pIcons_LOD->GetTexture(uTextureID_Leather)->uTextureHeight