diff Player.cpp @ 1460:ff2118028c71

renaming _guilds_member_bits to _achieved_awards_bits
author Gloval
date Wed, 21 Aug 2013 20:58:36 +0400
parents bfe342ae0c1f
children 845907a747d3
line wrap: on
line diff
--- a/Player.cpp	Wed Aug 14 00:40:51 2013 +0400
+++ b/Player.cpp	Wed Aug 21 20:58:36 2013 +0400
@@ -641,13 +641,13 @@
     switch ( uClass )
     {
       case 0x1Au:
-        return(_449B57_test_bit((unsigned __int8 *)this->_guilds_member_bits, 65));
+        return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 65));
       case 0x1Bu:
-        return(_449B57_test_bit((unsigned __int8 *)this->_guilds_member_bits, 67));
+        return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 67));
       case 0x22u:
-        return(_449B57_test_bit((unsigned __int8 *)this->_guilds_member_bits, 77));
+        return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 77));
       case 0x23u:
-        return(_449B57_test_bit((unsigned __int8 *)this->_guilds_member_bits, 79));
+        return(_449B57_test_bit((unsigned __int8 *)this->_achieved_awards_bits, 79));
         break;
       default:
         assert("Should not be able to get here" && false);
@@ -5406,7 +5406,7 @@
   uExperience = 251 + rand() % 100;
   uBirthYear = 1147 - rand() % 6;
   memset(pActiveSkills, 0, sizeof(pActiveSkills));
-  memset(_guilds_member_bits, 0, 64);
+  memset(_achieved_awards_bits, 0, 64);
   memset(&spellbook, 0, sizeof(PlayerSpells));
 
   for (uint i = 0; i < 37; ++i)
@@ -6715,7 +6715,7 @@
           goto _j_cmp_against_arg;
         case VAR_Award:
           test_bit_value = 0x80u >> ((signed __int16)pValue - 1) % 8;
-          our_bit_value = this->_guilds_member_bits[((signed __int16)pValue - 1) /8];
+          our_bit_value = this->_achieved_awards_bits[((signed __int16)pValue - 1) /8];
           if ( !((unsigned __int8)test_bit_value & our_bit_value) )
             return true;
           return false;
@@ -7177,7 +7177,7 @@
         return;
       case VAR_Award:
         if ( !((unsigned __int8)(0x80u >> ((signed __int16)var_value - 1) % 8) & 
-			  pPlayers[currPlayerId + 1]->_guilds_member_bits[((signed __int16)var_value - 1)/ 8])
+			  pPlayers[currPlayerId + 1]->_achieved_awards_bits[((signed __int16)var_value - 1)/ 8])
               //&& dword_723E80_award_related[2 * a3] )
 		    && pAwards[var_value].pText )
         {
@@ -7185,7 +7185,7 @@
           DrawPlayerBuffAnimBasedOnCondition(currPlayerId);
           PlaySoundBasedOnCondition(currPlayerId);
         }
-        _449B7E_toggle_bit((unsigned char *)this->_guilds_member_bits, var_value, 1u);
+        _449B7E_toggle_bit((unsigned char *)this->_achieved_awards_bits, var_value, 1u);
         return;
       case VAR_Experience:
         this->uExperience = var_value;
@@ -7599,7 +7599,7 @@
               return;
             case VAR_Award:
               v13 = pPlayers[uPlayerIdx + 1];
-              if (_449B57_test_bit((unsigned __int8 *)pPlayers[uPlayerIdx + 1]->_guilds_member_bits, val) 
+              if (_449B57_test_bit((unsigned __int8 *)pPlayers[uPlayerIdx + 1]->_achieved_awards_bits, val) 
              
 				&& pAwards[val].pText )
               {
@@ -7608,7 +7608,7 @@
                 v3 = 1;
                 v14->PlaySound(SPEECH_96, 0);
               }
-              v15 = (char *)v4->_guilds_member_bits;
+              v15 = (char *)v4->_achieved_awards_bits;
               goto LABEL_44;
             case VAR_Experience:
               v16 = __CFADD__(val, LODWORD(Dst->uExperience));
@@ -8234,7 +8234,7 @@
           this->sAgeModifier -= (signed __int16)pValue;
           return result;
         case VAR_Award:
-          _449B7E_toggle_bit((unsigned char *)this->_guilds_member_bits, (signed __int16)pValue, 0);
+          _449B7E_toggle_bit((unsigned char *)this->_achieved_awards_bits, (signed __int16)pValue, 0);
           return result;
         case VAR_Experience:
           v12 = (char *)&this->uExperience;