Mercurial > mm7

comparison UIHouses.cpp @ 1274:351bc06722f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::_4B807C changed to Player::GetTempleHealCostModifier, cleaned up
author Grumpy7
date Sat, 15 Jun 2013 05:08:48 +0200
parents 0aeac0b9ca30
children ce8ea73e7678
comparison
equal deleted inserted replaced
1273:fbb7428fa58c 1274:351bc06722f2
4746 v57.uFrameZ = 334; 4746 v57.uFrameZ = 334;
4747 HIDWORD(v58) = TargetColor(0xFFu, 0xFFu, 0xFFu); 4747 HIDWORD(v58) = TargetColor(0xFFu, 0xFFu, 0xFFu);
4748 HIDWORD(v59) = TargetColor(0xFFu, 0xFFu, 0x9Bu); 4748 HIDWORD(v59) = TargetColor(0xFFu, 0xFFu, 0x9Bu);
4749 v1 = pPlayers[uActiveCharacter]; 4749 v1 = pPlayers[uActiveCharacter];
4750 //v2 = pPlayers[uActiveCharacter]->_4B807C(p2DEvents_minus1__20[13 * (unsigned int)v0->ptr_1C]); 4750 //v2 = pPlayers[uActiveCharacter]->_4B807C(p2DEvents_minus1__20[13 * (unsigned int)v0->ptr_1C]);
4751 v2 = pPlayers[uActiveCharacter]->_4B807C(p2DEvents[v0->par1C - 1].fPriceMultiplier); 4751 v2 = pPlayers[uActiveCharacter]->GetTempleHealCostModifier(p2DEvents[v0->par1C - 1].fPriceMultiplier);
4752 HIDWORD(v60) = v2; 4752 HIDWORD(v60) = v2;
4753 if ( dialog_menu_id != HOUSE_DIALOGUE_MAIN ) 4753 if ( dialog_menu_id != HOUSE_DIALOGUE_MAIN )
4754 { 4754 {
4755 if ( dialog_menu_id != HOUSE_DIALOGUE_TEMPLE_HEAL ) 4755 if ( dialog_menu_id != HOUSE_DIALOGUE_TEMPLE_HEAL )
4756 { 4756 {