Mercurial > mm7

comparison UI/UIHouses.cpp @ 2234:fd0b2a697416

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixing inverted guild greetings
author Grumpy7
date Sun, 23 Feb 2014 00:34:38 +0100
parents e9625ad08541
children aff7a7b072b7
comparison
equal deleted inserted replaced
2233:a9fa57fda3ae 2234:fd0b2a697416
890 else 890 else
891 { //guilds 891 { //guilds
892 v19 = guild_mambership_flags[uHouseID - HOUSE_FIRE_GUILD_INITIATE_EMERALD_ISLE]; //guilds flags 892 v19 = guild_mambership_flags[uHouseID - HOUSE_FIRE_GUILD_INITIATE_EMERALD_ISLE]; //guilds flags
893 //v20 = uHouseID; 893 //v20 = uHouseID;
894 //if ( !((unsigned __int8)(0x80u >> v19 % 8) & pPlayers[uActiveCharacter]->_guilds_member_bits[v19 /8]) ) 894 //if ( !((unsigned __int8)(0x80u >> v19 % 8) & pPlayers[uActiveCharacter]->_guilds_member_bits[v19 /8]) )
895 if(_449B57_test_bit(pPlayers[uActiveCharacter]->_achieved_awards_bits,v19)) 895 if(!_449B57_test_bit(pPlayers[uActiveCharacter]->_achieved_awards_bits,v19))
896 { 896 {
897 PlayHouseSound(uHouseID, HouseSound_Greeting_2); 897 PlayHouseSound(uHouseID, HouseSound_Greeting_2);
898 return 1; 898 return 1;
899 } 899 }
900 } 900 }