Mercurial > mm7

comparison UI/UIHouses.cpp @ 1460:ff2118028c71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renaming _guilds_member_bits to _achieved_awards_bits
author Gloval
date Wed, 21 Aug 2013 20:58:36 +0400
parents 6de9c1316852
children 845907a747d3
comparison
equal deleted inserted replaced
1457:9dc33590f93e 1460:ff2118028c71
935 else 935 else
936 { //guilds 936 { //guilds
937 v19 = guild_mambership_flags[uHouseID - HOUSE_FIRE_GUILD_INITIATE_EMERALD_ISLE]; //guilds flags 937 v19 = guild_mambership_flags[uHouseID - HOUSE_FIRE_GUILD_INITIATE_EMERALD_ISLE]; //guilds flags
938 //v20 = uHouseID; 938 //v20 = uHouseID;
939 //if ( !((unsigned __int8)(0x80u >> v19 % 8) & pPlayers[uActiveCharacter]->_guilds_member_bits[v19 /8]) ) 939 //if ( !((unsigned __int8)(0x80u >> v19 % 8) & pPlayers[uActiveCharacter]->_guilds_member_bits[v19 /8]) )
940 if(_449B57_test_bit(pPlayers[uActiveCharacter]->_guilds_member_bits,v19)) 940 if(_449B57_test_bit(pPlayers[uActiveCharacter]->_achieved_awards_bits,v19))
941 { 941 {
942 PlayHouseSound(uHouseID, HouseSound_Greeting_2); 942 PlayHouseSound(uHouseID, HouseSound_Greeting_2);
943 return 1; 943 return 1;
944 } 944 }
945 } 945 }
4015 ++pMessageQueue_50CBD0->uNumMessages; 4015 ++pMessageQueue_50CBD0->uNumMessages;
4016 }*/ 4016 }*/
4017 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, v5); 4017 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, v5);
4018 return; // void func 4018 return; // void func
4019 } 4019 }
4020 if ( !(unsigned __int16)_449B57_test_bit((unsigned __int8 *)v1->_guilds_member_bits, word_4F0754[2 * (unsigned int)window_SpeakInHouse->ptr_1C]) ) 4020 if ( !(unsigned __int16)_449B57_test_bit((unsigned __int8 *)v1->_achieved_awards_bits, word_4F0754[2 * (unsigned int)window_SpeakInHouse->ptr_1C]) )
4021 { 4021 {
4022 v24 = pNPCTopics[171].pText; 4022 v24 = pNPCTopics[171].pText;
4023 v25 = v31; 4023 v25 = v31;
4024 v26 = pFontArrus->CalcTextHeight(pNPCTopics[171].pText, &v28, 0, 0); 4024 v26 = pFontArrus->CalcTextHeight(pNPCTopics[171].pText, &v28, 0, 0);
4025 v28.DrawTitleText(pFontArrus, 0, (212 - v26) / 2 + 101, v25, v24, 3u); 4025 v28.DrawTitleText(pFontArrus, 0, (212 - v26) / 2 + 101, v25, v24, 3u);