Mercurial > mm7

comparison UIHouses.cpp @ 1294:6bbd50bda571

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 17 Jun 2013 09:09:30 +0600
parents 24bc24b64ec2 62f4cdaa726b
children 86a83e12d795
comparison
equal deleted inserted replaced
1293:557c0c3cc314 1294:6bbd50bda571
708 //v3 = dword_F8B198; 708 //v3 = dword_F8B198;
709 v8 = window_SpeakInHouse; 709 v8 = window_SpeakInHouse;
710 } 710 }
711 else if (uActiveCharacter) 711 else if (uActiveCharacter)
712 { 712 {
713 if ( !pPlayers[uActiveCharacter]->_4B6FF9() ) 713 if ( !pPlayers[uActiveCharacter]->IsPlayerHealableByTemple() )
714 return; 714 return;
715 v8 = window_SpeakInHouse; 715 v8 = window_SpeakInHouse;
716 } 716 }
717 } 717 }
718 //LABEL_11: 718 //LABEL_11:
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 {
4918 ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2u); 4918 ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2u);
4919 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful); 4919 PlayHouseSound((unsigned int)window_SpeakInHouse->ptr_1C, HouseSound_NotEnoughMoney_TrainingSuccessful);
4920 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, v25); 4920 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, v25);
4921 return; 4921 return;
4922 } 4922 }
4923 if ( !v1->_4B6FF9() ) 4923 if ( !v1->IsPlayerHealableByTemple() )
4924 return; 4924 return;
4925 v25 = 0; 4925 v25 = 0;
4926 if ( pParty->uNumGold < v2 ) 4926 if ( pParty->uNumGold < v2 )
4927 { 4927 {
4928 ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2u); 4928 ShowStatusBarString(pGlobalTXT_LocalizationStrings[155], 2u);
4991 v63 = 1; 4991 v63 = 1;
4992 v41 = pDialogueWindow->GetControl(pDialogueWindow->pStartingPosActiveItem); 4992 v41 = pDialogueWindow->GetControl(pDialogueWindow->pStartingPosActiveItem);
4993 strcpy(a1, ""); 4993 strcpy(a1, "");
4994 v41->uHeight = 0; 4994 v41->uHeight = 0;
4995 v41->uY = 0; 4995 v41->uY = 0;
4996 if ( v1->_4B6FF9() ) 4996 if ( v1->IsPlayerHealableByTemple() )
4997 { 4997 {
4998 sprintf(a1, "%s %d %s", pGlobalTXT_LocalizationStrings[104], HIDWORD(v60), pGlobalTXT_LocalizationStrings[97]); 4998 sprintf(a1, "%s %d %s", pGlobalTXT_LocalizationStrings[104], HIDWORD(v60), pGlobalTXT_LocalizationStrings[97]);
4999 v63 = 0; 4999 v63 = 0;
5000 } 5000 }
5001 strcpy(&a1[100], pGlobalTXT_LocalizationStrings[68]); 5001 strcpy(&a1[100], pGlobalTXT_LocalizationStrings[68]);