# HG changeset patch # User Ritor1 # Date 1364995963 -21600 # Node ID 2fe7bcaa52e4f4665a60ead3ef623ee9b437333b # Parent 5ab8f88a121a21d179b5fbbc6786066751db8548 m diff -r 5ab8f88a121a -r 2fe7bcaa52e4 UIHouses.cpp --- a/UIHouses.cpp Tue Apr 02 19:24:14 2013 +0600 +++ b/UIHouses.cpp Wed Apr 03 19:32:43 2013 +0600 @@ -4595,10 +4595,10 @@ void GuildDialog() { //GUIWindow *pWindow; // ebx@1 - //Player *currPlayer; // edi@1 - signed int base_teach_price; // ebx@1 - int v3; // edi@6 - int result; // eax@11 + //Player *currPlayer; // edi@1 + signed int base_teach_price; // ebx@1 + int v3; // edi@6 + int result; // eax@11 //unsigned int v5; // ebx@13 int v6; // esi@13 signed int v7; // esi@17 @@ -4827,13 +4827,8 @@ } else { - if( byte_4ED970_skill_learn_ability_by_class_table[pPlayers[uActiveCharacter]->classType][v23-36] && pPlayers[uActiveCharacter]->pActiveSkills[v23-36] ) - { - all_text_height += pFontArrus->CalcTextHeight(pSkillNames[v23 - 36], &working_window, 0, 0); - v61++; - pSkillFlag = true; - } - if( byte_4ED970_skill_learn_ability_by_class_table[pPlayers[uActiveCharacter]->classType][v23 - 36] && !pPlayers[uActiveCharacter]->pActiveSkills[v23 - 36] ) + if( byte_4ED970_skill_learn_ability_by_class_table[pPlayers[uActiveCharacter]->classType][v23 - 36] + && !pPlayers[uActiveCharacter]->pActiveSkills[v23 - 36] ) { all_text_height += pFontArrus->CalcTextHeight(pSkillNames[v23 - 36], &working_window, 0, 0); v61++; @@ -4888,7 +4883,8 @@ } else { - if ( byte_4ED970_skill_learn_ability_by_class_table[pPlayers[uActiveCharacter]->classType][v29 - 36] && !pPlayers[uActiveCharacter]->pActiveSkills[v23-36] ) + if ( byte_4ED970_skill_learn_ability_by_class_table[pPlayers[uActiveCharacter]->classType][v29 - 36] + && !pPlayers[uActiveCharacter]->pActiveSkills[v23-36] ) { pButton->uY = v58 + v26; pTextHeight = pFontArrus->CalcTextHeight(pSkillNames[v29 - 36], &working_window, 0, 0); @@ -4902,13 +4898,13 @@ pTextColor = pColorWhite; working_window.DrawTitleText(pFontArrus, 0, v32, pTextColor, pSkillNames[v29 - 36], 3); } - else - { + else + { pButton->uW = 0; pButton->uHeight = 0; pButton->uY = 0; - } - } + } + } ++pItemNum; } while ( pItemNum < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem );