Mercurial > mm7

comparison UI/UIGuilds.cpp @ 1843:2e6d3cd052e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some char* cast removal + adding const_casts where appropriate
author Grumpy7
date Sun, 13 Oct 2013 07:18:03 +0200
parents 24e756a50073
children 05b433b8cb37
comparison
equal deleted inserted replaced
1842:175bf8da83d9 1843:2e6d3cd052e0
231 v13 = pRenderer->pActiveZBuffer[result] & 0xFFFF; 231 v13 = pRenderer->pActiveZBuffer[result] & 0xFFFF;
232 if ( pRenderer->pActiveZBuffer[result] & 0xFFFF ) 232 if ( pRenderer->pActiveZBuffer[result] & 0xFFFF )
233 { 233 {
234 v15 = (ItemGen *)(&pParty->pPlayers[1].uExpressionTimeLength + 18 * (v13 + 12 * (int)window_SpeakInHouse->ptr_1C)); 234 v15 = (ItemGen *)(&pParty->pPlayers[1].uExpressionTimeLength + 18 * (v13 + 12 * (int)window_SpeakInHouse->ptr_1C));
235 v17 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction( (ItemGen *)&pParty->pPlayers[1].uExpressionTimeLength + v13 + 12 * (int)window_SpeakInHouse->ptr_1C, BuildingType_MagicShop, (int)window_SpeakInHouse->ptr_1C, 2); 235 v17 = pPlayers[uActiveCharacter]->SelectPhrasesTransaction( (ItemGen *)&pParty->pPlayers[1].uExpressionTimeLength + v13 + 12 * (int)window_SpeakInHouse->ptr_1C, BuildingType_MagicShop, (int)window_SpeakInHouse->ptr_1C, 2);
236 v18 = BuildDialogueString((char *)pMerchantsBuyPhrases[v17], uActiveCharacter - 1, v15, (char *)window_SpeakInHouse->ptr_1C, 2, 0); 236 v18 = BuildDialogueString(pMerchantsBuyPhrases[v17], uActiveCharacter - 1, v15, (char *)window_SpeakInHouse->ptr_1C, 2, 0);
237 pTextHeight = pFontArrus->CalcTextHeight(v18, &working_window, 0, 0); 237 pTextHeight = pFontArrus->CalcTextHeight(v18, &working_window, 0, 0);
238 working_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, pColorWhite, v18, 3); 238 working_window.DrawTitleText(pFontArrus, 0, (174 - pTextHeight) / 2 + 138, pColorWhite, v18, 3);
239 return; 239 return;
240 } 240 }
241 } 241 }