Mercurial > mm7
comparison UI/UIGuilds.cpp @ 1410:38df78aba732
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 |
comparison
equal
deleted
inserted
replaced
1409:c9e3b93ec570 | 1410:38df78aba732 |
---|---|
181 v14 = window_SpeakInHouse->ptr_1C; | 181 v14 = window_SpeakInHouse->ptr_1C; |
182 v15 = (ItemGen *)(&pParty->pPlayers[1].uExpressionTimeLength + 18 * (v13 + 12 * (int)v14)); | 182 v15 = (ItemGen *)(&pParty->pPlayers[1].uExpressionTimeLength + 18 * (v13 + 12 * (int)v14)); |
183 v16 = (int)window_SpeakInHouse->ptr_1C; | 183 v16 = (int)window_SpeakInHouse->ptr_1C; |
184 uPlayerID = uActiveCharacter - 1; | 184 uPlayerID = uActiveCharacter - 1; |
185 v17 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction( (ItemGen *)&pParty->pPlayers[1].uExpressionTimeLength + v13 + 12 * (int)v14, BildingType_MagicShop, v16, 2); | 185 v17 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction( (ItemGen *)&pParty->pPlayers[1].uExpressionTimeLength + v13 + 12 * (int)v14, BildingType_MagicShop, v16, 2); |
186 v18 = BuilDialogueString((char *)pMerchantsBuyPhrases[v17], uPlayerID, v15, (char *)v14, 2, 0); | 186 v18 = BuildDialogueString((char *)pMerchantsBuyPhrases[v17], uPlayerID, v15, (char *)v14, 2, 0); |
187 v19 = pFontArrus->CalcTextHeight(v18, &working_window, 0, 0); | 187 v19 = pFontArrus->CalcTextHeight(v18, &working_window, 0, 0); |
188 working_window.DrawTitleText(pFontArrus, 0, (174 - v19) / 2 + 138, pColorWhite, v18, 3); | 188 working_window.DrawTitleText(pFontArrus, 0, (174 - v19) / 2 + 138, pColorWhite, v18, 3); |
189 return; | 189 return; |
190 } | 190 } |
191 } | 191 } |