mm7: Player.cpp comparison

comparison Player.cpp @ 1731:34dd357a489d

Player::CompareVariable cleanup first round

author	Grumpy7
date	Thu, 26 Sep 2013 08:07:50 +0200
parents	baa4eda7f924
children	c6fe09a06712

comparison

equal deleted inserted replaced

-:baa4eda7f924
+:34dd357a489d
 if (HasItemEquipped(EQUIP_OFF_HAND) && GetEquippedItemEquipType(EQUIP_OFF_HAND) != EQUIP_SHIELD)
 // ADD: shield check because shield recovery is added later and can be accidentally doubled
 {
 if (base_recovery_times_per_weapon_type[GetOffHandItem()->GetPlayerSkillType()] > weapon_recovery)
 {
 weapon = GetOffHandItem();
 weapon_recovery = base_recovery_times_per_weapon_type[weapon->GetPlayerSkillType()];
 }
 }
 uint armour_recovery = 0;
 return;
 }
 }
 //----- (00449BB4) --------------------------------------------------------
-bool Player::CompareVariable( enum VariableType VarNum, signed int pValue )
+bool Player::CompareVariable( enum VariableType VarNum, signed int pValue )   // in some cases this calls only calls v4 >= pValue, which i've changed to return false, since these values are supposed to be positive
 {
-Player *v3; // esi@1
+Assert(pValue >= 0, "Compare variable shouldn't have negative arguments");
 signed int v4; // edi@1
 unsigned int v5; // eax@8
 int v6; // eax@9
 enum CHARACTER_RACE v7; // eax@11
 signed int v8; // eax@17
 unsigned __int8 v9; // sf@17
 unsigned __int8 v10; // of@17
 int v11; // eax@19
 unsigned int v12; // eax@20
 unsigned int test_bit_value; // eax@25
-unsigned __int8 our_bit_value; // cl@25
+unsigned __int8 byteWithRequestedBit; // cl@25
 signed int v15; // ecx@28
 ItemGen *v16; // eax@28
 int v18; // edi@90
 DDM_DLV_Header *v19; // eax@122
 DDM_DLV_Header *v21; // eax@126
 char *v27; // edi@155
 int v28; // ebx@161
 int v29; // eax@161
 v6 = 0;
-v3 = this;
 v4 = -1;
 if ( VarNum > VAR_AutoNotes )
 {
 switch ( VarNum )
 {
 v19 = &pOutdoor->ddm;
 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor )
 v19 = &pIndoor->dlv;
 v6 = v19->uReputation >= pValue;
 return v6;
-case VAR_History_28|VAR_Sex:
+case VAR_Unknown1:
 v21 = &pOutdoor->ddm;
 if ( uCurrentlyLoadedLevelType != LEVEL_Outdoor )
 v21 = &pIndoor->dlv;
 v6 = v21->field_C_alert == pValue;
 return v6;
-case VAR_MonthEquals2|VAR_Sex:
-case VAR_MonthEquals2|VAR_Class:
 case VAR_Counter1:
 case VAR_Counter2:
 case VAR_Counter3:
 case VAR_Counter4:
 case VAR_Counter5:
 case VAR_Counter6:
 case VAR_Counter7:
 case VAR_Counter8:
+case VAR_Counter9:
+case VAR_Counter10:
 v22 = *(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44304];
 if ( v22 | *(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44300]
 && (signed __int64)(__PAIR__(v22, *(int *)&stru_AA1058[3].pSounds[8 * VarNum + 44300])
 + (signed __int64)((double)(460800 * pValue) * 0.033333335)) <= (signed __int64)pParty->uTimePlayed )
 return true;
 return false;
 case VAR_NumSkillPoints:
 v4 = this->uSkillPoints;
 return v4 >= pValue;
-case VAR_CircusPrises:
+case VAR_CircusPrises:    //isn't used in MM6 since 0x1D6u is a book of regeneration
 v4 = 0;
-v23 = pParty->pPlayers;//[0].pInventoryItems;
+for (int playerNum = 0; playerNum < 4; playerNum++)
-do
 {
-v24 = v23->pInventoryItemList;
+for (int invPos = 0; invPos < 138; invPos++)
-v25 = 138;
-do
 {
-switch ( v24->uItemID )
+int itemId = pParty->pPlayers[playerNum].pInventoryItemList[invPos].uItemID;
+switch ( itemId )
 {
 case 0x1D6u:
 ++v4;
 break;
 case 0x1D7u:
 v4 += 3;
 break;
 case 0x1DDu:
 v4 += 5;
 break;
 }
-++v24;
---v25;
 }
-while ( v25 );
-++v23;
 }
-while ( v23 <= &pParty->pPlayers[3] );
 return v4 >= pValue;
-case VAR_MonthEquals2:
+case VAR_MonthIs:
 v6 = pParty->uCurrentMonth == pValue;
 return v6;
 case VAR_IsFlying:
 if ( pParty->bFlying
 && (pParty->pPartyBuffs[PARTY_BUFF_FLY].uExpireTime> 0) )
 return true;
 return false;
 case VAR_HiredNPCHasSpeciality:
-LOBYTE(v6) = CheckHiredNPCSpeciality(pValue);
+return CheckHiredNPCSpeciality(pValue);
-return v6;
 case VAR_NPCs2:
 return pNPCStats->pNewNPCData[pValue].Hired();
-case VAR_MonthEquals|VAR_CurrentSP:
+case VAR_PlayerBits:
 test_bit_value = 0x80u >> ((signed __int16)pValue - 1) % 8;
-our_bit_value = this->field_1A50[((signed __int16)pValue - 1)/8];
+byteWithRequestedBit = this->field_1A50[((signed __int16)pValue - 1)/8];
-if ( !((unsigned __int8)test_bit_value & our_bit_value) )
+if ( !((unsigned __int8)test_bit_value & byteWithRequestedBit) )
 return v4 >= pValue;
 v4 = pValue;
 return v4 >= pValue;
 case VAR_ItemEquipped:
-v26 = (ITEM_EQUIP_TYPE)0;
+for (int i = 0; i < 16; i++)
-v27 = (char *)&this->pEquipment;
+{
-break;
+if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) && GetNthEquippedIndexItem(i)->uItemID == pValue )
+{
+return true;
+}
+}
+return false;
 case VAR_GoldInBank:
 v4 = pParty->uNumGoldInBank;
 return v4 >= pValue;
-case VAR_ThieverySkill|0x80:
+case VAR_IsMightMoreThanBase:
 v28 = GetActualMight();
-v29 = v3->GetBaseStrength();
+v29 = GetBaseStrength();
-goto LABEL_168;
+return (v28 >= v29);
-case VAR_DisarmTrapSkill|0x80:
+case VAR_IsIntellectMoreThanBase:
 v28 = GetActualIntelligence();
-v29 = v3->GetBaseIntelligence();
+v29 = GetBaseIntelligence();
-goto LABEL_168;
+return (v28 >= v29);
-case VAR_MonthEquals:
+case VAR_IsPersonalityMoreThanBase:
 v28 = GetActualWillpower();
-v29 = v3->GetBaseWillpower();
+v29 = GetBaseWillpower();
-goto LABEL_168;
+return (v28 >= v29);
-case VAR_MonthEquals|VAR_Sex:
+case VAR_IsEnduranceMoreThanBase:
 v28 = GetActualEndurance();
-v29 = v3->GetBaseEndurance();
+v29 = GetBaseEndurance();
-goto LABEL_168;
+return (v28 >= v29);
-case VAR_IdentifyMonsterSkill|0x80:
+case VAR_IsSpeedMoreThanBase:
 v28 = GetActualSpeed();
-v29 = v3->GetBaseSpeed();
+v29 = GetBaseSpeed();
-goto LABEL_168;
+return (v28 >= v29);
-case VAR_ArmsmasterSkill|0x80:
+case VAR_IsAccuracyMoreThanBase:
 v28 = GetActualAccuracy();
-v29 = v3->GetBaseAccuracy();
+v29 = GetBaseAccuracy();
-goto LABEL_168;
+return (v28 >= v29);
-case VAR_MonthEquals|VAR_MaxHP:
+case VAR_IsLuckMoreThanBase:
 v28 = GetActualLuck();
-v29 = v3->GetBaseLuck();
+v29 = GetBaseLuck();
-LABEL_168:
+return (v28 >= v29);
-v10 = __OFSUB__(v28, v29);
-v9 = v28 - v29 < 0;
-LABEL_169:
-if ( v9 ^ v10 )
-return v4 >= pValue;
-return true;
 default:
-return v4 >= pValue;
-}
-while ( !v3->HasItemEquipped(v26)
-|| *(int *)&v3->pInventoryItemList[*(int *)v27-1] != pValue )
-{
-v26 = (ITEM_EQUIP_TYPE)((int)v26 + 1);
-v27 += 4;
-if ( (signed int)v26 >= 16 )
 return false;
 }
-return true;
+}
-}
+if ( VarNum == VAR_AutoNotes )  //TODO: find out why the double subtraction. or whether this is even used
-if ( VarNum == VAR_AutoNotes )
+{
-{
+test_bit_value = 0x80u >> (pValue - 2) % 8;
-test_bit_value = 0x80u >> ((signed __int16)(pValue - 1) - 1) % 8;
+byteWithRequestedBit = pParty->_autonote_bits[(pValue - 2) /8];
-our_bit_value = pParty->_autonote_bits[((signed __int16)(pValue - 1) - 1) /8];
+return (test_bit_value & byteWithRequestedBit);
-if ( !((unsigned __int8)test_bit_value & our_bit_value) )
-return false;
-return true;
 }
 if ( VarNum <= VAR_BaseLuck )
 {
 if ( VarNum != VAR_BaseLuck )
 {
 switch ( VarNum )
 {
 case VAR_Hour:
-if ( (signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60 % 24 == pValue )
+if ( (long long)(pParty->uTimePlayed * 0.234375) / 60 / 60 % 24 == pValue )
 return true;
 return false;
 case VAR_DayOfYear:
-v5 = (unsigned int)((signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60) / 0x18 % 0x150 + 1;
+if (((long long)(pParty->uTimePlayed * 0.234375) / 60 / 60) / 24 % 336 + 1 == pValue)
-v6 = v5 == pValue;
+return true;
-return v6;
+return false;
 case VAR_DayOfWeek:
-v5 = (unsigned int)((signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375) / 60 / 60) / 0x18 % 7;
+if (((long long)(pParty->uTimePlayed * 0.234375) / 60 / 60) / 24 % 7)
-v6 = v5 == pValue;
+return true;
-return v6;
+return false;
 case VAR_Sex:
-if ( pValue == (CHARACTER_RACE)this->uSex )
+if ( pValue == this->uSex )
 return true;
-return v4 >= pValue;
+return false;
 case VAR_Class:
-v7 = (CHARACTER_RACE)this->classType;
+if ( pValue == this->classType )
-if ( pValue == v7 )
 return true;
-return v4 >= pValue;
+return false;
 case VAR_Race:
-v7 = GetRace();
+if ( pValue == GetRace() )
-if ( pValue == v7 )
 return true;
 return v4 >= pValue;
 case VAR_CurrentHP:
 v4 = this->sHealth;
 return v4 >= pValue;
 case VAR_MaxHP:
 v8 = GetMaxHealth();
-v10 = __OFSUB__(v3->sHealth, v8);
+v9 = this->sHealth;
-v9 = v3->sHealth - v8 < 0;
+return (v9 >= v8);
-goto LABEL_169;
 case VAR_CurrentSP:
 v4 = this->sMana;
 return v4 >= pValue;
 case VAR_MaxSP:
-v11 = GetMaxMana();
+v8 = GetMaxMana();
-v10 = __OFSUB__(v3->sMana, v11);
+v9 = this->sMana;
-v9 = v3->sMana - v11 < 0;
+return (v9 >= v8);
-goto LABEL_169;
 case VAR_ActualAC:
-v12 = GetActualAC();
+v4 = GetActualAC();
-goto _j_cmp_against_arg;
+return v4 >= pValue;
 case VAR_ACModifier:
 v4 = this->sACModifier;
 return v4 >= pValue;
 case VAR_BaseLevel:
 v4 = this->uLevel;
 return v4 >= pValue;
 case VAR_LevelModifier:
 v4 = this->sLevelModifier;
 return v4 >= pValue;
 case VAR_Age:
-v12 = GetActualAge();
+v4 = GetActualAge();
-goto _j_cmp_against_arg;
+return v4 >= pValue;
 case VAR_Award:
-test_bit_value = 0x80u >> ((signed __int16)pValue - 1) % 8;
+test_bit_value = 0x80u >> (pValue - 1) % 8;
-our_bit_value = this->_achieved_awards_bits[((signed __int16)pValue - 1) /8];
+byteWithRequestedBit = this->_achieved_awards_bits[(pValue - 1) /8];
-if ( !((unsigned __int8)test_bit_value & our_bit_value) )
+return ( test_bit_value & byteWithRequestedBit );
-return true;
-return false;
 case VAR_Experience:
 v4 = LODWORD(this->uExperience);
 return v4 >= pValue;
 case VAR_QBits_QuestsDone:
 test_bit_value = 0x80u >> (pValue - 1) % 8;
-our_bit_value = pParty->_quest_bits[(pValue - 1)/8];
+byteWithRequestedBit = pParty->_quest_bits[(pValue - 1)/8];
-if ( test_bit_value & our_bit_value )
+return ( test_bit_value & byteWithRequestedBit );
-return true;
-return false;
 case VAR_PlayerItemInHands:
-v15 = 0;
+for (int i = 0; i < 138; i++)
-v16 = v3->pInventoryItemList;
+{
-break;
+if (pInventoryItemList[i].uItemID == pValue)
+{
+return true;
+}
+}
+return pParty->pPickedItem.uItemID == pValue;
 case VAR_FixedGold:
 v4 = pParty->uNumGold;
 return v4 >= pValue;
 case VAR_MightBonus:
 v4 = this->uMightBonus;
 return v4 >= pValue;
 case VAR_FixedFood:
 v4 = pParty->uNumFoodRations;
 return v4 >= pValue;
 default:
-return v4 >= pValue;
+return false;
 }
-while ( v16->uItemID != pValue )
-{
-++v15;
-++v16;
-if ( v15 >= 138 )
-{
-v6 = pParty->pPickedItem.uItemID == pValue;
-return v6;
-}
-}
-return true;
 }
 v4 = this->uLuck;
 return v4 >= pValue;
 }
 if ( VarNum <= VAR_MagicResistance )
 return v4 >= pValue;
 case VAR_DarkResistance:
 v4 = this->sResDarkBase;
 return v4 >= pValue;
 case VAR_ActualMight:
-v12 = GetActualMight();
+v4 = GetActualMight();
-goto _j_cmp_against_arg;
+return v4 >= pValue;
 case VAR_ActualIntellect:
-v12 = GetActualIntelligence();
+v4 = GetActualIntelligence();
-goto _j_cmp_against_arg;
+return v4 >= pValue;
 case VAR_ActualPersonality:
-v12 = GetActualWillpower();
+v4 = GetActualWillpower();
-goto _j_cmp_against_arg;
+return v4 >= pValue;
 case VAR_ActualEndurance:
-v12 = GetActualEndurance();
+v4 = GetActualEndurance();
-goto _j_cmp_against_arg;
+return v4 >= pValue;
 case VAR_ActualSpeed:
-v12 = GetActualSpeed();
+v4 = GetActualSpeed();
-goto _j_cmp_against_arg;
+return v4 >= pValue;
 case VAR_ActualAccuracy:
-v12 = GetActualAccuracy();
+v4 = GetActualAccuracy();
-goto _j_cmp_against_arg;
+return v4 >= pValue;
 case VAR_ActualLuck:
-v12 = GetActualLuck();
+v4 = GetActualLuck();
-_j_cmp_against_arg:
+return v4 >= pValue;
-v4 = v12;
 break;
 default:
 return v4 >= pValue;
 }
 }
 {
 switch ( VarNum )
 {
 case VAR_MindResistanceBonus:
 v4 = this->sResMindBonus;
-break;
+return v4 >= pValue;
 case VAR_FireResistanceBonus:
 v4 = this->sResFireBonus;
-break;
+return v4 >= pValue;
 case VAR_AirResistanceBonus:
 v4 = this->sResAirBonus;
-break;
+return v4 >= pValue;
 case VAR_WaterResistanceBonus:
 v4 = this->sResWaterBonus;
-break;
+return v4 >= pValue;
 case VAR_EarthResistanceBonus:
 v4 = this->sResEarthBonus;
-break;
+return v4 >= pValue;
 case VAR_SpiritResistanceBonus:
 v4 = this->sResSpiritBonus;
-break;
+return v4 >= pValue;
 }
-return v4 >= pValue;
 }
 if ( VarNum == VAR_BodyResistanceBonus )
 {
 v4 = this->sResBodyBonus;
 return v4 >= pValue;
 return v4 >= pValue;
 }
 if ( VarNum <= VAR_MagicResistanceBonus || VarNum > VAR_DiplomacySkill )
 return v4 >= pValue;
 }
-LABEL_90:
 v18 = *((short *)&this->pConditions[16] + VarNum);
 if ( pValue <= 63 )
 v4 = v18 & 0x3F;
 else
 v4 = pValue & v18;
 return v4 >= pValue;
 }
 if ( VarNum == 104 )
-goto LABEL_90;
+{
+v18 = *((short *)&this->pConditions[16] + VarNum);
+if ( pValue <= 63 )
+v4 = v18 & 0x3F;
+else
+v4 = pValue & v18;
+return v4 >= pValue;
+}
 if ( (signed int)VarNum <= 104 )
 return v4 >= pValue;
 if ( (signed int)VarNum > 0x79 )
 {
 if ( VarNum != 122 )
 return v4 >= pValue;
 }
 v4 = pValue;
 return v4 >= pValue;
 }
-return &LODWORD(this->pConditions[VarNum]);// *((int *)this + 2 * VarNum - 210);
+return (this->pConditions[VarNum - 105] > 0);// *((int *)this + 2 * VarNum - 210); the original was never used, which is why probably it wasn't correct
 }
 //----- (0044A5CB) --------------------------------------------------------
 void Player::SetVariable(enum VariableType var_type, signed int var_value)
 }
 else
 {
 switch ( var_type )
 {
-case VAR_MonthEquals|VAR_CurrentSP:
+case VAR_PlayerBits:
 __debugbreak(); //how do I get here?
 _449B7E_toggle_bit((unsigned char *)field_1A50, var_value, 1u);
 break;
 case VAR_NPCs2:
 __debugbreak(); //how do I get here?
 }
 else
 {
 switch ( var_type )
 {
-case VAR_MonthEquals|VAR_CurrentSP:
+case VAR_PlayerBits:
 _449B7E_toggle_bit((unsigned char *)Dst->field_1A50, val, 1u);
 break;
 case VAR_NPCs2:
 pParty->field_709 = 0;
 LOBYTE(pNPCStats->pNewNPCData[val].uFlags) |= 0x80u;

Mercurial > mm7

comparison Player.cpp @ 1731:34dd357a489d