comparison UI/UIGuilds.cpp @ 1393:28f87f5234a1

More hardcoded UI colors moved to varibables.
author Nomad
date Thu, 18 Jul 2013 16:11:57 +0200
parents bedc304ab617
children 38df78aba732
comparison
equal deleted inserted replaced
1392:e3e9c0467529 1393:28f87f5234a1
93 strcpy(v49, ""); 93 strcpy(v49, "");
94 if ( dialog_menu_id != HOUSE_DIALOGUE_MAIN ) 94 if ( dialog_menu_id != HOUSE_DIALOGUE_MAIN )
95 { 95 {
96 if ( dialog_menu_id != HOUSE_DIALOGUE_GUILD_BUY_BOOKS ) //buy skill 96 if ( dialog_menu_id != HOUSE_DIALOGUE_GUILD_BUY_BOOKS ) //buy skill
97 { 97 {
98 if ( sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() ) 98 if ( HouseUI_CheckIfPlayerCanInteract() )
99 { 99 {
100 if ( pPlayers[uActiveCharacter]->pActiveSkills[dialog_menu_id-36] ) 100 if ( pPlayers[uActiveCharacter]->pActiveSkills[dialog_menu_id-36] )
101 { 101 {
102 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[403], pClassNames[dialog_menu_id - 16]); //"You already know the %s skill" 102 sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[403], pClassNames[dialog_menu_id - 16]); //"You already know the %s skill"
103 ShowStatusBarString(pTmpBuf.data(), 2); 103 ShowStatusBarString(pTmpBuf.data(), 2);
149 v63 += 70; 149 v63 += 70;
150 v62 += 280; 150 v62 += 280;
151 ++v7; 151 ++v7;
152 } 152 }
153 while ( v63 < 452 ); 153 while ( v63 < 452 );
154 if ( sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() ) 154 if ( HouseUI_CheckIfPlayerCanInteract() )
155 { 155 {
156 v8 = 0; 156 v8 = 0;
157 v9 = 12; 157 v9 = 12;
158 do 158 do
159 { 159 {
197 v38 = pFontArrus->CalcTextHeight(pNPCTopics[121].pText, &working_window, 0, 0); 197 v38 = pFontArrus->CalcTextHeight(pNPCTopics[121].pText, &working_window, 0, 0);
198 working_window.DrawTitleText(pFontArrus, 0, (212 - v38) / 2 + 101, pColorYellow, pNPCTopics[121].pText, 3u); 198 working_window.DrawTitleText(pFontArrus, 0, (212 - v38) / 2 + 101, pColorYellow, pNPCTopics[121].pText, 3u);
199 pDialogueWindow->pNumPresenceButton = 0; 199 pDialogueWindow->pNumPresenceButton = 0;
200 return; 200 return;
201 } 201 }
202 if ( !sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() ) 202 if ( !HouseUI_CheckIfPlayerCanInteract() )
203 return; 203 return;
204 v61 = 0; 204 v61 = 0;
205 pSkillFlag = false; 205 pSkillFlag = false;
206 pActiveItem = pDialogueWindow->pStartingPosActiveItem; 206 pActiveItem = pDialogueWindow->pStartingPosActiveItem;
207 v22 = pActiveItem + pDialogueWindow->pNumPresenceButton; 207 v22 = pActiveItem + pDialogueWindow->pNumPresenceButton;