Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/Player.cpp	Sat Mar 02 01:30:24 2013 +0200
+++ b/Player.cpp	Sat Mar 02 01:32:30 2013 +0200
@@ -8868,9 +8868,8 @@
               return;
             case VAR_Award:
               v13 = pPlayers[uPlayerIdx + 1];
-              v33 = 0x80u >> ((signed __int16)val - 1) % 8;
-              if ( !((unsigned __int8)(0x80u >> ((signed __int16)val - 1) % 8) & v13->_guilds_member_bits[((signed __int16)val - 1) >> 3])
-                //&& dword_723E80_award_related[2 * val] )
+              if (_449B57_test_bit((unsigned __int8 *)pPlayers[uPlayerIdx + 1]->_guilds_member_bits, val) 
+             
 				&& pAwards[val].pText )
               {
                 v14 = pPlayers[uPlayerIdx + 1];