Mercurial > mm7

comparison Player.cpp @ 1037:ff2d888f8033

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Wed, 22 May 2013 22:26:31 +0400
parents 7f8be9f9769e 306ec23b37df
children 4430136083a6
comparison
equal deleted inserted replaced
1036:7f8be9f9769e 1037:ff2d888f8033
8001 _449B7E_toggle_bit((unsigned char *)field_1A50, var_value, 1u); 8001 _449B7E_toggle_bit((unsigned char *)field_1A50, var_value, 1u);
8002 break; 8002 break;
8003 case VAR_NPCs2: 8003 case VAR_NPCs2:
8004 pParty->field_709 = 0; 8004 pParty->field_709 = 0;
8005 LOBYTE(pNPCStats->pNewNPCData[var_value].uFlags) |= 0x80u; 8005 LOBYTE(pNPCStats->pNewNPCData[var_value].uFlags) |= 0x80u;
8006 Party__CountHirelings(); 8006 pParty->CountHirelings();
8007 viewparams->bRedrawGameUI = 1; 8007 viewparams->bRedrawGameUI = true;
8008 break; 8008 break;
8009 case VAR_NumSkillPoints: 8009 case VAR_NumSkillPoints:
8010 this->uSkillPoints = var_value; 8010 this->uSkillPoints = var_value;
8011 break; 8011 break;
8012 } 8012 }
8957 _449B7E_toggle_bit((unsigned char *)Dst->field_1A50, val, 1u); 8957 _449B7E_toggle_bit((unsigned char *)Dst->field_1A50, val, 1u);
8958 break; 8958 break;
8959 case VAR_NPCs2: 8959 case VAR_NPCs2:
8960 pParty->field_709 = 0; 8960 pParty->field_709 = 0;
8961 LOBYTE(pNPCStats->pNewNPCData[val].uFlags) |= 0x80u; 8961 LOBYTE(pNPCStats->pNewNPCData[val].uFlags) |= 0x80u;
8962 Party__CountHirelings(); 8962 pParty->CountHirelings();
8963 viewparams->bRedrawGameUI = 1; 8963 viewparams->bRedrawGameUI = true;
8964 break; 8964 break;
8965 case VAR_NumSkillPoints: 8965 case VAR_NumSkillPoints:
8966 Dst->uSkillPoints += val; 8966 Dst->uSkillPoints += val;
8967 break; 8967 break;
8968 } 8968 }
9073 } 9073 }
9074 else 9074 else
9075 { 9075 {
9076 pParty->field_709 = 0; 9076 pParty->field_709 = 0;
9077 LOBYTE(pNPCStats->pNewNPCData[(int)pValue].uFlags) &= 0x7Fu; 9077 LOBYTE(pNPCStats->pNewNPCData[(int)pValue].uFlags) &= 0x7Fu;
9078 Party__CountHirelings(); 9078 pParty->CountHirelings();
9079 viewparams->bRedrawGameUI = 1; 9079 viewparams->bRedrawGameUI = true;
9080 } 9080 }
9081 break; 9081 break;
9082 case 241: 9082 case 241:
9083 if ( (signed int)pNPCStats->uNumNewNPCs > 0 ) 9083 if ( (signed int)pNPCStats->uNumNewNPCs > 0 )
9084 { 9084 {
9100 if ( pParty->pHirelings[0].uProfession == pValue ) 9100 if ( pParty->pHirelings[0].uProfession == pValue )
9101 memset(pParty->pHirelings, 0, 0x4Cu); 9101 memset(pParty->pHirelings, 0, 0x4Cu);
9102 if ( pParty->pHirelings[1].uProfession == pValue ) 9102 if ( pParty->pHirelings[1].uProfession == pValue )
9103 memset(&pParty->pHirelings[1], 0, 0x4Cu); 9103 memset(&pParty->pHirelings[1], 0, 0x4Cu);
9104 pParty->field_709 = 0; 9104 pParty->field_709 = 0;
9105 Party__CountHirelings(); 9105 pParty->CountHirelings();
9106 break; 9106 break;
9107 case 243: 9107 case 243:
9108 v17 = (char *)&this->uSkillPoints; 9108 v17 = (char *)&this->uSkillPoints;
9109 result = *v17; 9109 result = *v17;
9110 if ( (unsigned int)pValue <= *(int *)v17 ) 9110 if ( (unsigned int)pValue <= *(int *)v17 )