mm7: UI/UIHouses.cpp comparison

comparison UI/UIHouses.cpp @ 1439:468f434a8d8a

Слияние

author	Ritor1
date	Mon, 22 Jul 2013 18:00:58 +0600
parents	94e4c3ef9b8e e6908823897f
children	b67a3e0d6fc3

comparison

equal deleted inserted replaced

-:bc99e1a48bea
+:468f434a8d8a
 {"Out02 Castle Harmondy Abandoned", 0x24, 0, 25, 0, 0 },
 {"Human Temple02",              0x24, 0x3AB, 23, 27, 0 },
 {"Player Castle Good",          0x24, 0, 25, 0, 0 },
 {"Player Castle Bad",           0x24, 0, 25, 0, 0}
 }};
+//----- (004B1784) --------------------------------------------------------
+bool __cdecl HouseUI_CheckIfPlayerCanInteract()
+{
+Player *pPlayer; // ebx@1
+bool result; // eax@2
+int v3; // eax@3
+GUIWindow v4; // [sp+4h] [bp-54h]@3
+pPlayer = pPlayers[uActiveCharacter];
+if ( pPlayer->CanAct() )
+{
+pDialogueWindow->pNumPresenceButton = dword_F8B1E0;
+result = 1;
+}
+else
+{
+pDialogueWindow->pNumPresenceButton = 0;
+memcpy(&v4, pPrimaryWindow, sizeof(v4));
+v4.uFrameX = 483;
+v4.uFrameWidth = 148;
+v4.uFrameZ = 334;
+sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[427], pPlayer->pName, pGlobalTXT_LocalizationStrings[562]);//
+// "%s is in no condition to %s"
+// "do anything"
+v3 = pFontArrus->CalcTextHeight(pTmpBuf.data(), &v4, 0, 0);
+v4.DrawTitleText(pFontArrus, 0, (212 - v3) / 2 + 101, ui_house_player_cant_interact_color, pTmpBuf.data(), 3u);
+result = 0;
+}
+return result;
+}
 //----- (0044622E) --------------------------------------------------------
 bool EnterHouse(enum HOUSE_ID uHouseID)
 {
 	//enum HOUSE_ID v1; // edi@1
 s1 = v4 * (100 - v1->GetMerchant()) / 100;
 if ( (signed int)s1 < v4 / 3 )
 s1 = v4 / 3;
 if ( dialog_menu_id == HOUSE_DIALOGUE_MAIN)
 {
-if ( sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
+if ( HouseUI_CheckIfPlayerCanInteract() )
 {
 v16 = pDialogueWindow;
 v58 = 255;
 v62 = 0;
 v17 = LOBYTE(pFontArrus->uFontHeight) - 3;
 switch(dialog_menu_id)
 {
 case HOUSE_DIALOGUE_MAIN:
 {
-if ( !sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
+if ( !HouseUI_CheckIfPlayerCanInteract() )
 return;
 sprintf(pTopic1, "\f%05d", pDialogueWindow->pCurrentPosActiveItem == 2 ? pColorYellow : pColorWhite);
 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[178], pOutString); // Rent room for %d gold
 strcat(pTopic1, pTmpBuf2.data());
 pButton->uW = v41;
 }
 pNumActiveItem++;
 if ( pNumActiveItem >= pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem )
 {
-sprintfex(pTmpBuf.data(), "%s%s%s%s", &pTopic1, &pTopic2, &pTopic3, &pTopic4);
+sprintfex(pTmpBuf.data(), "%s%s%s%s", pTopic1, pTopic2, pTopic3, pTopic4);
 dialog_window.DrawTitleText(pFontArrus, 0, 146, 0, pTmpBuf.data(), 3);
 }
 }
 while ( pNumActiveItem < pDialogueWindow->pStartingPosActiveItem + pDialogueWindow->pNumPresenceButton );
 }
 break;
 }
 case HOUSE_DIALOGUE_LEARN_SKILLS:
 {
-if ( !sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
+if ( !HouseUI_CheckIfPlayerCanInteract() )
 return;
 v0 = 0;
 v9 = (signed __int64)(p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].flt_24 * 500.0);
 pItemNum = v9 * (100 - pPlayer->GetMerchant()) / 100;
 if ( pItemNum < v9 / 3 )
 break;
 }
 case HOUSE_DIALOGUE_TAVERN_ARCOMAGE_MAIN:
 {
-if ( sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
+if ( HouseUI_CheckIfPlayerCanInteract() )
 {
 v48 = 2;
 pShopOptions[0] = pGlobalTXT_LocalizationStrings[620];
 pShopOptions[1] = pGlobalTXT_LocalizationStrings[622];
 pOutString = 0;
 {
 if ( dialog_menu_id != HOUSE_DIALOGUE_TEMPLE_DONATE )
 {
 if ( dialog_menu_id == HOUSE_DIALOGUE_LEARN_SKILLS )
 {
-if ( sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
+if ( HouseUI_CheckIfPlayerCanInteract() )
 {
 v4 = pDialogueWindow;
 v61 = pDialogueWindow;
 v5 = window_SpeakInHouse->ptr_1C;
 v66 = 0;
 if ( v11 < v10 / 3 )
 v11 = v10 / 3;
 //i = v11;
 }
-if (sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win())
+if (HouseUI_CheckIfPlayerCanInteract())
 {
 if ( dialog_menu_id != HOUSE_DIALOGUE_MAIN )
 {
 if ( dialog_menu_id != HOUSE_DIALOGUE_TRAININGHALL_TRAIN )
 {
 if ( dialog_menu_id == HOUSE_DIALOGUE_LEARN_SKILLS )
 {
-if (sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win())
+if (HouseUI_CheckIfPlayerCanInteract())
 {
 //i = 0;
 int _v0 = 0;
 v13 = pDialogueWindow;
 //v14 = (signed __int64)(*(float *)&p2DEvents_minus1__24[13 * (unsigned int)ptr_507BC0->ptr_1C] * 500.0);
 }
 }
 }
 return;
 }
-if ( !sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
+if ( !HouseUI_CheckIfPlayerCanInteract() )
 {
 //v31 = pNPCTopics[122].pText;
 //v32 = color2;
 v33 = pFontArrus->CalcTextHeight(pNPCTopics[122].pText, &v65, 0, 0);
 v65.DrawTitleText(pFontArrus, 0, (212 - v33) / 2 + 101, color2, pNPCTopics[122].pText, 3);
 v65.DrawTitleText(pFontArrus, v35, v36, v58, v60, v62);
 v63 = 3;
 goto LABEL_55;
 }
-if (sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win())
+if (HouseUI_CheckIfPlayerCanInteract())
 {
 v43 = pDialogueWindow;
 v72 = 0;
 pShopOptions[0] = pTmpBuf.data();
 pShopOptions[1] = pGlobalTXT_LocalizationStrings[160];// "Learn Skills"
 v4 = v3 / 3;
 v32 = v3 / 3;
 }
 if ( dialog_menu_id != HOUSE_DIALOGUE_MAIN)
 {
-if ( sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
+if ( HouseUI_CheckIfPlayerCanInteract() )
 {
 v5 = 0;
 __debugbreak();
 //pSkillAvailabilityPerClass[8 + v58->uClass][4 + v23]
 v28.DrawTitleText(pFontArrus, 0, (212 - v26) / 2 + 101, v25, v24, 3u);
 pDialogueWindow->pNumPresenceButton = 0;
 return ;
 }
-if ( !sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
+if ( !HouseUI_CheckIfPlayerCanInteract() )
 return;
 v8 = pDialogueWindow;
 v33 = 0;
 v34 = 0;
 v29 = pDialogueWindow;

Mercurial > mm7

comparison UI/UIHouses.cpp @ 1439:468f434a8d8a