comparison UI/UIGuilds.cpp @ 1465:090ff42290c4

Слияние
author Ritor1
date Mon, 26 Aug 2013 10:39:24 +0600
parents ff2118028c71
children 58d15177edd0 5cc08e71a308
comparison
equal deleted inserted replaced
1464:b870630761df 1465:090ff42290c4
189 return; 189 return;
190 } 190 }
191 } 191 }
192 return; 192 return;
193 } 193 }
194 if ( !(unsigned __int16)_449B57_test_bit((unsigned __int8 *)pPlayers[uActiveCharacter]->_guilds_member_bits, 194 if ( !(unsigned __int16)_449B57_test_bit((unsigned __int8 *)pPlayers[uActiveCharacter]->_achieved_awards_bits,
195 guild_mambership_flags[(unsigned int)window_SpeakInHouse->ptr_1C-139]) ) 195 guild_mambership_flags[(unsigned int)window_SpeakInHouse->ptr_1C-139]) )
196 { //you must me member 196 { //you must me member
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;