Mercurial > mm7

comparison Player.cpp @ 523:8f7f651311bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Sat, 02 Mar 2013 01:32:30 +0200
parents 663c4f618f56
children 9caf59edb1ee
comparison
equal deleted inserted replaced
522:61343380715b 523:8f7f651311bc
8866 case VAR_Age: 8866 case VAR_Age:
8867 Dst->sAgeModifier += val; 8867 Dst->sAgeModifier += val;
8868 return; 8868 return;
8869 case VAR_Award: 8869 case VAR_Award:
8870 v13 = pPlayers[uPlayerIdx + 1]; 8870 v13 = pPlayers[uPlayerIdx + 1];
8871 v33 = 0x80u >> ((signed __int16)val - 1) % 8; 8871 if (_449B57_test_bit((unsigned __int8 *)pPlayers[uPlayerIdx + 1]->_guilds_member_bits, val)
8872 if ( !((unsigned __int8)(0x80u >> ((signed __int16)val - 1) % 8) & v13->_guilds_member_bits[((signed __int16)val - 1) >> 3]) 8872
8873 //&& dword_723E80_award_related[2 * val] )
8874 && pAwards[val].pText ) 8873 && pAwards[val].pText )
8875 { 8874 {
8876 v14 = pPlayers[uPlayerIdx + 1]; 8875 v14 = pPlayers[uPlayerIdx + 1];
8877 v34 = 1; 8876 v34 = 1;
8878 v3 = 1; 8877 v3 = 1;