Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/UIHouses.cpp	Mon Jun 17 09:09:03 2013 +0600
+++ b/UIHouses.cpp	Mon Jun 17 09:09:30 2013 +0600
@@ -710,7 +710,7 @@
 		  }
 		  else if (uActiveCharacter)
 		  {
-			if ( !pPlayers[uActiveCharacter]->_4B6FF9() )
+			if ( !pPlayers[uActiveCharacter]->IsPlayerHealableByTemple() )
 			  return;
 			v8 = window_SpeakInHouse;
 		  }
@@ -4748,7 +4748,7 @@
     HIDWORD(v59) = TargetColor(0xFFu, 0xFFu, 0x9Bu);
     v1 = pPlayers[uActiveCharacter];
     //v2 = pPlayers[uActiveCharacter]->_4B807C(p2DEvents_minus1__20[13 * (unsigned int)v0->ptr_1C]);
-    v2 = pPlayers[uActiveCharacter]->_4B807C(p2DEvents[v0->par1C - 1].fPriceMultiplier);
+    v2 = pPlayers[uActiveCharacter]->GetTempleHealCostModifier(p2DEvents[v0->par1C - 1].fPriceMultiplier);
     HIDWORD(v60) = v2;
     if ( dialog_menu_id != HOUSE_DIALOGUE_MAIN )
     {
@@ -4920,7 +4920,7 @@
           pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, v25);
           return;
         }
-        if ( !v1->_4B6FF9() )
+        if ( !v1->IsPlayerHealableByTemple() )
             return;
         v25 = 0;
         if ( pParty->uNumGold < v2 )
@@ -4993,7 +4993,7 @@
     strcpy(a1, "");
     v41->uHeight = 0;
     v41->uY = 0;
-    if ( v1->_4B6FF9() )
+    if ( v1->IsPlayerHealableByTemple() )
         {
         sprintf(a1, "%s %d %s", pGlobalTXT_LocalizationStrings[104], HIDWORD(v60), pGlobalTXT_LocalizationStrings[97]);
         v63 = 0;