Mercurial > mm7

diff UI/UIGuilds.cpp @ 1410:38df78aba732

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
deleted stru220.h and stru220 (bezier terrain stuff) stru167 -> TrailParticle stru167warp -> TrailParticleGenerator
author Nomad
date Fri, 26 Jul 2013 22:19:29 +0200
parents 28f87f5234a1
children 2423bc2af692
line wrap: on
line diff
--- a/UI/UIGuilds.cpp	Fri Jul 26 21:16:51 2013 +0200
+++ b/UI/UIGuilds.cpp	Fri Jul 26 22:19:29 2013 +0200
@@ -183,7 +183,7 @@
         v16 = (int)window_SpeakInHouse->ptr_1C;
         uPlayerID = uActiveCharacter - 1;
         v17 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction( (ItemGen *)&pParty->pPlayers[1].uExpressionTimeLength + v13 + 12 * (int)v14, BildingType_MagicShop, v16,  2);
-        v18 = BuilDialogueString((char *)pMerchantsBuyPhrases[v17], uPlayerID, v15, (char *)v14, 2, 0);     
+        v18 = BuildDialogueString((char *)pMerchantsBuyPhrases[v17], uPlayerID, v15, (char *)v14, 2, 0);     
         v19 = pFontArrus->CalcTextHeight(v18, &working_window, 0, 0);
         working_window.DrawTitleText(pFontArrus, 0, (174 - v19) / 2 + 138,  pColorWhite, v18, 3);
         return;