mm7: Player.cpp comparison

comparison Player.cpp @ 1709:8251e59fd7c1

ITEM_ENCHANTED to ITEM_HARDENED, created helper functions to get params from itemtable for ItemGens

author	Grumpy7
date	Tue, 24 Sep 2013 07:29:55 +0200
parents	f8414042db1f
children	0f6cd60ca987

comparison

equal deleted inserted replaced

-:f8414042db1f
+:8251e59fd7c1
 {
 if ( enchant_count )
 {
 for ( i = 0; i < enchant_count; ++i )
 {
-if (!(pInventoryItemList[item_index_tabl[i]].uAttributes&ITEM_ENCHANTED))
+if (!(pInventoryItemList[item_index_tabl[i]].uAttributes&ITEM_HARDENED))
-pInventoryItemList[item_index_tabl[rand() % avalible_items]].uAttributes |= ITEM_ENCHANTED;
+pInventoryItemList[item_index_tabl[rand() % avalible_items]].uAttributes |= ITEM_HARDENED;
 }
 }
 else
 {
 for ( i = 0; i < avalible_items; ++i )
 {
-pInventoryItemList[item_index_tabl[i]].uAttributes |= ITEM_ENCHANTED;
+pInventoryItemList[item_index_tabl[i]].uAttributes |= ITEM_HARDENED;
 }
 }
 }
 }
 unsigned int slot_height; // ebp@1
 int *pInvPos; // edx@4
 unsigned int slot_width; // [sp+14h] [bp+4h]@1
 item_in_slot = &this->pInventoryItemList[pInventoryMatrix[index]-1];
-item_texture = pIcons_LOD->LoadTexturePtr(pItemsTable->pItems[item_in_slot->uItemID].pIconName, TEXTURE_16BIT_PALETTE);
+item_texture = pIcons_LOD->LoadTexturePtr(item_in_slot->GetIconName(), TEXTURE_16BIT_PALETTE);
 item_in_slot->Reset();
 slot_width = GetSizeInInventorySlots(item_texture->uTextureWidth);
 slot_height = GetSizeInInventorySlots(item_texture->uTextureHeight);
 if ( !areWeLoadingTexture )
 {
 int merchantLevel; // [sp+10h] [bp-8h]@1
 int itemValue;
 merchantLevel = GetActualSkillLevel(PLAYER_SKILL_MERCHANT);
 idemId = pItem->uItemID;
-equipType = pItemsTable->pItems[idemId].uEquipType;
+equipType = pItem->GetItemEquipType();
 itemValue = pItem->GetValue();
 switch (building_type)
 {
 case BuildingType_WeaponShop:
 bool Player::CanRepair( ItemGen *pItem )
 {
 unsigned __int16 v2; // ax@1
 int v5; // edi@7
-ItemDesc* v7 = &pItemsTable->pItems[pItem->uItemID];
+ITEM_EQUIP_TYPE equipType = pItem->GetItemEquipType();
-if (CheckHiredNPCSpeciality(Smith) && v7->uEquipType <= 2 ||
+if (CheckHiredNPCSpeciality(Smith) && equipType <= 2 ||
-CheckHiredNPCSpeciality(Armorer) && v7->uEquipType >= 3 && v7->uEquipType <= 9 ||
+CheckHiredNPCSpeciality(Armorer) && equipType >= 3 && equipType <= 9 ||
-CheckHiredNPCSpeciality(Alchemist) && v7->uEquipType >= 9 )
+CheckHiredNPCSpeciality(Alchemist) && equipType >= 9 )
 return true;
 v2 = GetActualSkillLevel(PLAYER_SKILL_REPAIR);
 if ( (signed int)SkillToMastery(v2) >= 4 )
 return true;
 int multiplier = GetMultiplierForSkillLevel(v2, 1, 2, 3, 5);
 v5 = multiplier * (v2 & 0x3F);
-return v5 >= v7->uItemID_Rep_St;
+return v5 >= pItemsTable->pItems[pItem->uItemID].uItemID_Rep_St;
 }
 //----- (004911F3) --------------------------------------------------------
 int Player::GetMerchant()
 {
 if ( !ignoreOffhand )
 {
 if ( this->HasItemEquipped(EQUIP_OFF_HAND) )
 {
 ItemGen *offHandItemGen = (ItemGen *)&this->pInventoryItemList[this->pEquipment.uShield - 1];
-int itemId = offHandItemGen->uItemID;
+if ( offHandItemGen->GetItemEquipType() != EQUIP_SHIELD )
-if ( pItemsTable->pItems[itemId].uEquipType != EQUIP_SHIELD )
 {
 offHndWpnDmg = CalculateMeleeDmgToEnemyWithWeapon(offHandItemGen, uTargetActorID, false);
 }
 }
 }
 }
 //----- (0048D62C) --------------------------------------------------------
 ITEM_EQUIP_TYPE Player::GetEquippedItemEquipType(ITEM_EQUIP_TYPE uEquipSlot)
 {
-return pItemsTable->pItems[pInventoryItemList[pEquipment.pIndices[uEquipSlot] - 1].uItemID].uEquipType;
+return pInventoryItemList[pEquipment.pIndices[uEquipSlot] - 1].GetItemEquipType();
 }
 //----- (0048D651) --------------------------------------------------------
 PLAYER_SKILL_TYPE Player::GetEquippedItemSkillType(ITEM_EQUIP_TYPE uEquipSlot)
 {
-return (PLAYER_SKILL_TYPE)pItemsTable->pItems[pInventoryItemList[pEquipment.pIndices[uEquipSlot] - 1].uItemID].uSkillType;
+return (PLAYER_SKILL_TYPE)pInventoryItemList[pEquipment.pIndices[uEquipSlot] - 1].GetPlayerSkillType();
 }
 //----- (0048D676) --------------------------------------------------------
 bool Player::IsUnarmed()
 {
 //----- (0048D6AA) --------------------------------------------------------
 bool Player::HasItemEquipped(ITEM_EQUIP_TYPE uEquipIndex)
 {
 auto i = pEquipment.pIndices[uEquipIndex];
 if (i)
-return (~(pOwnItems[i - 1].uAttributes & ITEM_BROKEN)) != 0;
+return !pOwnItems[i - 1].IsBroken();
 else
 return false;
 }
 //----- (0048D6D0) --------------------------------------------------------
 {
 v6 = this->pActiveSkills[34];
 v7 = v6 & 0x3F;
 v8 = SkillToMastery(v6);
 itemvalue = itemToSteal->GetValue();
-v10 = pItemsTable->pItems[itemToSteal->uItemID].uEquipType;
+v10 = itemToSteal->GetItemEquipType();
 if ( v10 == EQUIP_OFF_HAND || v10 == EQUIP_MAIN_HAND || v10 == EQUIP_BOW )
 itemvalue *= 3;
 currMaxItemValue = StealingRandomBonuses[rand() % 5] + v7 * StealingMasteryBonuses[v8];
 *fineIfFailed = 100 * (reputation + extraStealDifficulty) + itemvalue;
 if (a5)
 enchBonusSum = 0;
 for (int i = 0; i < v7; i++)
 {
 enchBonusSum += rand() % StealingEnchantmentBonusForSkill[stealingMastery] + 1;
 }
-if ( pItemsTable->pItems[actroPtr->array_000234[3].uItemID].uEquipType != EQUIP_GOLD )
+if ( actroPtr->array_000234[3].GetItemEquipType() != EQUIP_GOLD )
 return 2;
 enchTypePtr = &actroPtr->array_000234[3].uSpecEnchantmentType;
 if ( (int)enchBonusSum >= *enchTypePtr )
 {
 actroPtr->array_000234[3].uItemID = 0;
 tempItem.Reset();
 HasFullItemSlots = false;
 int i;
 for (i = 0; i < 4; i++)
 {
-if ( actroPtr->array_000234[i].uItemID != 0 && pItemsTable->pItems[actroPtr->array_000234[i].uItemID].uEquipType != EQUIP_GOLD )
+if ( actroPtr->array_000234[i].uItemID != 0 && actroPtr->array_000234[i].GetItemEquipType() != EQUIP_GOLD )
 break;
 }
 if (i == 4)
 HasFullItemSlots = true;
 carriedItemId = actroPtr->uCarriedItemID;
 ItemGen* itemToSteal = &actroPtr->array_000234[rand() % 4];
 memcpy(&tempItem, itemToSteal, sizeof(tempItem));
 itemToSteal->Reset();
 carriedItemId = tempItem.uItemID;
 }
-sub_421B2C_PlaceInInventory_or_DropPickedItem();
+if (carriedItemId != 0)     // looks odd in current context, but avoids accessing zeroth element of pItemsTable->pItems
-sprintf(
+{
-pTmpBuf2.data(),
+sub_421B2C_PlaceInInventory_or_DropPickedItem();
-pGlobalTXT_LocalizationStrings[304],   // Official                   //TODO: add a normal "%d stole %d" message
+sprintf(
-this->pName,
+pTmpBuf2.data(),
-pItemsTable->pItems[carriedItemId].pUnidentifiedName);
+pGlobalTXT_LocalizationStrings[304],   // Official                   //TODO: add a normal "%d stole %d" message
-ShowStatusBarString(pTmpBuf2.data(), 2u);
+this->pName,
-sub_421B2C_PlaceInInventory_or_DropPickedItem();
+pItemsTable->pItems[carriedItemId].pUnidentifiedName);
-memcpy(&pParty->pPickedItem, &tempItem, sizeof(ItemGen));
+ShowStatusBarString(pTmpBuf2.data(), 2u);
-pMouse->SetCursorBitmapFromItemID(carriedItemId);
+sub_421B2C_PlaceInInventory_or_DropPickedItem();
-return 2;
+memcpy(&pParty->pPickedItem, &tempItem, sizeof(ItemGen));
+pMouse->SetCursorBitmapFromItemID(carriedItemId);
+return 2;
+}
 }
 }
 sprintfex(pTmpBuf2.data(), pGlobalTXT_LocalizationStrings[377], this->pName);   //%s failed to steal anything
 ShowStatusBarString(pTmpBuf2.data(), 2u);
 return 2;
 if (broke_armor )
 {
 armor_indx = pEquipment.uArmor;
 if ( armor_indx )
 {
-if ( !(pOwnItems[armor_indx-1].uAttributes & ITEM_ENCHANTED))
+if ( !(pOwnItems[armor_indx-1].uAttributes & ITEM_HARDENED))
 {
 pOwnItems[armor_indx-1].SetBroken();
 }
 }
 }
 v46[v4++] = i;
 }
 if ( !v4 )
 return 0;
 v48 = &this->pInventoryItemList[v46[rand() % v4]];
-v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + pItemsTable->pItems[v48->uItemID].uDamageMod);
+v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + v48->GetDamageMod());
 break;
 case SPECIAL_ATTACK_BREAK_ARMOR:
 for (int i = 0; i < 16; i++ )
 {
 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) )
 }
 }
 if ( !v4 )
 return 0;
 v48 = &this->pInventoryItemList[v46[rand() % v4]];
-v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + pItemsTable->pItems[v48->uItemID].uDamageMod);
+v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + v48->GetDamageMod());
 break;
 case SPECIAL_ATTACK_BREAK_WEAPON:
 for (int i = 0; i < 16; i++ )
 {
 if ( HasItemEquipped((ITEM_EQUIP_TYPE)i) )
 }
 }
 if ( !v4 )
 return 0;
 v48 = &this->pInventoryItemList[v46[rand() % v4]];
-v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + pItemsTable->pItems[v48->uItemID].uDamageMod);
+v11 = 3 * (pItemsTable->pItems[v48->uItemID].uMaterial + v48->GetDamageMod());
 break;
 case SPECIAL_ATTACK_STEAL:
 for ( int i = 0; i < 126; i++ )
 {
 int ItemPosInList = this->pInventoryMatrix[i];
 return 1;
 break;
 case SPECIAL_ATTACK_BREAK_ANY:
 case SPECIAL_ATTACK_BREAK_ARMOR:
 case SPECIAL_ATTACK_BREAK_WEAPON:
-if ( !(v48->uAttributes & ITEM_ENCHANTED) )
+if ( !(v48->uAttributes & ITEM_HARDENED) )
 {
 PlaySound(SPEECH_40, 0);
 v48->SetBroken();
 pAudioPlayer->PlaySound((SoundID)47, 0, 0, -1, 0, 0, 0, 0);
 }
 auto v12_desc = &pItemsTable->pItems[v12->uItemID];
 if (base_recovery_times_per_weapon_type[v12_desc->uSkillType] > weapon_recovery)
 {
 weapon = &pInventoryItemList[pEquipment.uShield - 1];
 weapon_desc = &pItemsTable->pItems[weapon->uItemID];
-weapon_recovery = base_recovery_times_per_weapon_type[pItemsTable->pItems[weapon->uItemID].uSkillType];
+weapon_recovery = base_recovery_times_per_weapon_type[weapon->GetPlayerSkillType()];
 }
 }
 uint armour_recovery = 0;
 if ( HasItemEquipped(EQUIP_ARMOUR) )
 {
-auto armour_skill_type = pItemsTable->pItems[pInventoryItemList[pEquipment.uArmor - 1].uItemID].uSkillType;
+auto armour_skill_type = pInventoryItemList[pEquipment.uArmor - 1].GetPlayerSkillType();
 uint base_armour_recovery = base_recovery_times_per_weapon_type[armour_skill_type];
 float multiplier;
 if (armour_skill_type == PLAYER_SKILL_LEATHER)
 {
 uint shield_recovery = 0;
 if (HasItemEquipped(EQUIP_OFF_HAND) && GetEquippedItemEquipType(EQUIP_OFF_HAND) == EQUIP_SHIELD)
 {
 auto shield = &pInventoryItemList[pEquipment.uShield - 1];
-auto skill_type = pItemsTable->pItems[shield->uItemID].uSkillType;
+auto skill_type = shield->GetPlayerSkillType();
 uint shield_base_recovery = base_recovery_times_per_weapon_type[skill_type];
 float multiplier = GetArmorRecoveryMultiplierFromSkillLevel(skill_type, 1.0f, 0, 0, 0);
 shield_recovery = (uint)(shield_base_recovery * multiplier);
 }
 switch(attr)      //TODO would be nice to move these into separate functions
 {
 case CHARACTER_ATTRIBUTE_RANGED_DMG_BONUS:
 case CHARACTER_ATTRIBUTE_RANGED_ATTACK:
 if ( HasItemEquipped(EQUIP_BOW) )
-v5 = pItemsTable->pItems[this->pOwnItems[this->pEquipment.uBow-1].uItemID].uDamageMod;
+v5 = this->pOwnItems[this->pEquipment.uBow-1].GetDamageMod();
 return v5;
 break;
 case CHARACTER_ATTRIBUTE_RANGED_DMG_MIN:
 if ( !HasItemEquipped(EQUIP_BOW) )
 if ( this->HasItemEquipped(EQUIP_MAIN_HAND) )
 {
 v17 = this->GetEquippedItemEquipType(EQUIP_MAIN_HAND);
 if ( v17 >= 0 && v17 <= 2)
 {
-v5 = pItemsTable->pItems[this->pOwnItems[this->pEquipment.uMainHand-1].uItemID].uDamageMod;
+v5 = this->pOwnItems[this->pEquipment.uMainHand-1].GetDamageMod();
 }
 }
 if ( getOnlyMainHandDmg || !this->HasItemEquipped(EQUIP_OFF_HAND) || (this->GetEquippedItemEquipType(EQUIP_OFF_HAND) < 0) || this->GetEquippedItemEquipType(EQUIP_OFF_HAND) > 2 )
 return v5;
 else
 if ( this->HasItemEquipped(EQUIP_MAIN_HAND) )
 {
 v9 = this->GetEquippedItemEquipType(EQUIP_MAIN_HAND);
 if ( v9 >= 0 && v9 <= 2)
 {
-v5 = pItemsTable->pItems[this->pOwnItems[this->pEquipment.uMainHand - 1].uItemID].uDamageDice +
+v5 = this->pOwnItems[this->pEquipment.uMainHand - 1].GetDamageDice() +
-pItemsTable->pItems[this->pOwnItems[this->pEquipment.uMainHand - 1].uItemID].uDamageMod;
+this->pOwnItems[this->pEquipment.uMainHand - 1].GetDamageMod();
-if ( !this->pEquipment.uShield && pItemsTable->pItems[this->pOwnItems[this->pEquipment.uMainHand - 1].uItemID].uSkillType == 4)
+if ( !this->pEquipment.uShield && this->pOwnItems[this->pEquipment.uMainHand - 1].GetPlayerSkillType() == 4)
 {
 ++v5;
 }
 }
 }
 {
 return v5;
 }
 else
 {
-v14 = pItemsTable->pItems[this->pOwnItems[this->pEquipment.uShield].uItemID].uDamageMod;
+v14 = this->pOwnItems[this->pEquipment.uShield].GetDamageMod();
-v15 = pItemsTable->pItems[this->pOwnItems[this->pEquipment.uShield].uItemID].uDamageDice;
+v15 = this->pOwnItems[this->pEquipment.uShield].GetDamageDice();
 return v5 + v15 + v14;
 }
 break;
 case   CHARACTER_ATTRIBUTE_STRENGTH:
 case CHARACTER_ATTRIBUTE_RANGED_ATTACK:
 for (int i = 0; i < 16; i++)
 {
 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) )
 {
-PLAYER_SKILL_TYPE currentItemSkillType = (PLAYER_SKILL_TYPE)pItemsTable->pItems[this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID].uSkillType;
+PLAYER_SKILL_TYPE currentItemSkillType = (PLAYER_SKILL_TYPE)this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].GetPlayerSkillType();
 int currentItemSkillLevel = this->GetActualSkillLevel(currentItemSkillType);
 if ( currentItemSkillType == PLAYER_SKILL_BOW )
 {
 int multiplier = GetMultiplierForSkillLevel(currentItemSkillLevel, 1, 1, 1, 1);
 return multiplier * (currentItemSkillLevel & 0x3F);
 }
 for (int i = 0; i < 16; i++)
 {
 if ( this->HasItemEquipped((ITEM_EQUIP_TYPE)i) )
 {
-int currItemId = this->pInventoryItemList[this->pEquipment.pIndices[i] - 1].uItemID;
+ItemGen* currItemPtr = &this->pInventoryItemList[this->pEquipment.pIndices[i] - 1];
-if ( pItemsTable->pItems[currItemId].uEquipType == EQUIP_MAIN_HAND || pItemsTable->pItems[currItemId].uEquipType == EQUIP_OFF_HAND )
+if ( currItemPtr->GetItemEquipType() == EQUIP_MAIN_HAND || currItemPtr->GetItemEquipType() == EQUIP_OFF_HAND )
 {
-PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)pItemsTable->pItems[currItemId].uSkillType;
+PLAYER_SKILL_TYPE currItemSkillType = (PLAYER_SKILL_TYPE)currItemPtr->GetPlayerSkillType();
 int currItemSkillLevel = this->GetActualSkillLevel(currItemSkillType);
 int baseSkillBonus;
 int multiplier;
 switch (currItemSkillType)
 {
 thisb = this;
 playerAffected = &pParty->pPlayers[player_num-1];
 v73 = 1;
 if ( pParty->bTurnBasedModeOn == 1 && (pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3) )
 return;
-if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_REAGENT )
+if ( pParty->pPickedItem.GetItemEquipType() == EQUIP_REAGENT )
 {
 if ( pParty->pPickedItem.uItemID == 160 )
 {
 playerAffected->SetCondition(Condition_Poison1, 1);
 }
 }
 pMouse->RemoveHoldingItem();
 return;
 }
-if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_POTION )
+if ( pParty->pPickedItem.GetItemEquipType() == EQUIP_POTION )
 {
 switch ( pParty->pPickedItem.uItemID )
 {
 case 221: //Catalyst
 playerAffected->SetCondition(Condition_Poison1, 1);
 pMouse->RemoveHoldingItem();
 return;
 }
-if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_SPELL_SCROLL )
+if ( pParty->pPickedItem.GetItemEquipType() == EQUIP_SPELL_SCROLL )
 {
 if ( pCurrentScreen == SCREEN_CASTING )
 return;
 if ( !playerAffected->CanAct() )
 {
 }
 }
 return;
 }
-if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_BOOK )
+if ( pParty->pPickedItem.GetItemEquipType() == EQUIP_BOOK )
 {
 v15 = pParty->pPickedItem.uItemID - 400;
 v72 = playerAffected->spellbook.bHaveSpell[pParty->pPickedItem.uItemID-400];//(char *)&v3->pConditions[0] + pParty->pPickedItem.uItemID + 2;
 if ( v72 )
 {
 //       }
 pMouse->RemoveHoldingItem();
 return;
 }
-if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == EQUIP_MESSAGE_SCROLL )
+if ( pParty->pPickedItem.GetItemEquipType() == EQUIP_MESSAGE_SCROLL )
 {
 if ( playerAffected->CanAct() )
 {
 CreateMsgScrollWindow(pParty->pPickedItem.uItemID);
 playerAffected->PlaySound(SPEECH_37, 0);
 item.uItemID = val;
 if ( val >= ITEM_ARTIFACT_PUCK && val <= ITEM_RELIC_MEKORIGS_HAMMER )
 pParty->pIsArtifactFound[val-500] = 1;
 if ( val >= ITEM_WAND_FIRE && val <= ITEM_WAND_INCENERATION )
 {
-item.uNumCharges = rand() % 6 + pItemsTable->pItems[item.uItemID].uDamageMod + 1;
+item.uNumCharges = rand() % 6 + item.GetDamageMod() + 1;
 item.uMaxCharges = LOBYTE(item.uNumCharges);
 }
 pParty->SetHoldingItem(&item);
 return;
 case VAR_FixedGold:
 v8 = playerPtr->pEquipment.uArmor;
 SoundID soundToPlay;
 if ( !v8
 || playerPtr->pInventoryItemList[v8 - 1].IsBroken()
 ||
-(pItemsTable->pItems[playerPtr->pInventoryItemList[v8 - 1].uItemID].uSkillType != PLAYER_SKILL_CHAIN
+(playerPtr->pInventoryItemList[v8 - 1].GetPlayerSkillType() != PLAYER_SKILL_CHAIN
-&& pItemsTable->pItems[playerPtr->pInventoryItemList[v8 - 1].uItemID].uSkillType != PLAYER_SKILL_PLATE
+&& playerPtr->pInventoryItemList[v8 - 1].GetPlayerSkillType() != PLAYER_SKILL_PLATE
 )
 )
 {
 int randVal = rand() % 4;
 switch (randVal)
 return;
 }
 }
 v9 = tmpItem.uItemID;
 memcpy(&pParty->pPickedItem, &tmpItem, sizeof(ItemGen));
-pMouse->SetCursorBitmap(pItemsTable->pItems[pParty->pPickedItem.uItemID].pIconName);
+pMouse->SetCursorBitmap(pParty->pPickedItem.GetIconName());
 return;
 }
 else
 {
 v10 = this->AddItem(invMatrixIndex, pickedItemId);

Mercurial > mm7

comparison Player.cpp @ 1709:8251e59fd7c1