diff --git a/changelog.txt b/changelog.txt index cc18e584f..89fe34460 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,10 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- +== 07/21/2014 == +Uleat: More inventory slot constant conversions. This should be the bulk of everything..but, due to the size of the server code, there +may be some hidden ones. (client_packet.cpp and the client translators still need a thorough review.) +Note: Please report any abnormal behaviour with inventory-related content..each diff file was reviewed 3 times..but, things CAN be missed. + == 07/27/2014 == Uleat: More updates to the dictionary. Added a 'constants' file for each client translator..these will tie-in to the dictionary. Started replacement of hard-coded numeric values with a pre-defined constant. This will help in the transition. diff --git a/common/Item.cpp b/common/Item.cpp index 133cfe506..3bdd33866 100644 --- a/common/Item.cpp +++ b/common/Item.cpp @@ -166,7 +166,7 @@ ItemInst* Inventory::GetItem(int16 slot_id) const ItemInst* result = nullptr; // Cursor - if (slot_id == EmuConstants::CURSOR) { + if (slot_id == MainCursor) { // Cursor slot result = m_cursor.peek_front(); } @@ -188,7 +188,7 @@ ItemInst* Inventory::GetItem(int16 slot_id) const result = _GetItem(m_inv, slot_id); } else if ((slot_id >= EmuConstants::EQUIPMENT_BEGIN && slot_id <= EmuConstants::EQUIPMENT_END) || - (slot_id >= EmuConstants::TRIBUTE_BEGIN && slot_id <= EmuConstants::TRIBUTE_END) || (slot_id == EmuConstants::POWER_SOURCE)) { + (slot_id >= EmuConstants::TRIBUTE_BEGIN && slot_id <= EmuConstants::TRIBUTE_END) || (slot_id == MainPowerSource)) { // Equippable slots (on body) result = _GetItem(m_worn, slot_id); } @@ -318,7 +318,7 @@ bool Inventory::CheckNoDrop(int16 slot_id) { if (!inst) return false; if (!inst->GetItem()->NoDrop) return true; if (inst->GetItem()->ItemClass == 1) { - for (uint8 i = 0; i < 10; i++) { + for (uint8 i = SUB_BEGIN; i < EmuConstants::ITEM_CONTAINER_SIZE; i++) { ItemInst* bagitem = GetItem(Inventory::CalcSlotId(slot_id, i)); if (bagitem && !bagitem->GetItem()->NoDrop) return true; } @@ -332,26 +332,30 @@ ItemInst* Inventory::PopItem(int16 slot_id) { ItemInst* p = nullptr; - if (slot_id == MainCursor) { // Cursor + if (slot_id == MainCursor) { p = m_cursor.pop(); } - else if ((slot_id >= 0 && slot_id <= 21) || (slot_id >= 400 && slot_id <= 404) || (slot_id == 9999)) { // Worn slots + else if ((slot_id >= EmuConstants::EQUIPMENT_BEGIN && slot_id <= EmuConstants::EQUIPMENT_END) || (slot_id == MainPowerSource)) { p = m_worn[slot_id]; m_worn.erase(slot_id); } - else if ((slot_id >= 22 && slot_id <= 29)) { + else if ((slot_id >= EmuConstants::GENERAL_BEGIN && slot_id <= EmuConstants::GENERAL_END)) { p = m_inv[slot_id]; m_inv.erase(slot_id); } - else if (slot_id >= 2000 && slot_id <= 2023) { // Bank slots + else if (slot_id >= EmuConstants::TRIBUTE_BEGIN && slot_id <= EmuConstants::TRIBUTE_END) { + p = m_worn[slot_id]; + m_worn.erase(slot_id); + } + else if (slot_id >= EmuConstants::BANK_BEGIN && slot_id <= EmuConstants::BANK_END) { p = m_bank[slot_id]; m_bank.erase(slot_id); } - else if (slot_id >= 2500 && slot_id <= 2501) { // Shared bank slots + else if (slot_id >= EmuConstants::SHARED_BANK_BEGIN && slot_id <= EmuConstants::SHARED_BANK_END) { p = m_shbank[slot_id]; m_shbank.erase(slot_id); } - else if (slot_id >= 3000 && slot_id <= 3007) { // Trade window slots + else if (slot_id >= EmuConstants::TRADE_BEGIN && slot_id <= EmuConstants::TRADE_END) { p = m_trade[slot_id]; m_trade.erase(slot_id); } @@ -371,7 +375,7 @@ bool Inventory::HasSpaceForItem(const Item_Struct *ItemToTry, int16 Quantity) { if (ItemToTry->Stackable) { - for (int16 i = 22; i <= 29; i++) { + for (int16 i = EmuConstants::GENERAL_BEGIN; i <= EmuConstants::GENERAL_END; i++) { ItemInst* InvItem = GetItem(i); @@ -387,9 +391,9 @@ bool Inventory::HasSpaceForItem(const Item_Struct *ItemToTry, int16 Quantity) { } if (InvItem && InvItem->IsType(ItemClassContainer)) { - int16 BaseSlotID = Inventory::CalcSlotId(i, 0); + int16 BaseSlotID = Inventory::CalcSlotId(i, SUB_BEGIN); uint8 BagSize = InvItem->GetItem()->BagSlots; - for (uint8 BagSlot = 0; BagSlot < BagSize; BagSlot++) { + for (uint8 BagSlot = SUB_BEGIN; BagSlot < BagSize; BagSlot++) { InvItem = GetItem(BaseSlotID + BagSlot); @@ -408,7 +412,7 @@ bool Inventory::HasSpaceForItem(const Item_Struct *ItemToTry, int16 Quantity) { } } - for (int16 i = 22; i <= 29; i++) { + for (int16 i = EmuConstants::GENERAL_BEGIN; i <= EmuConstants::GENERAL_END; i++) { ItemInst* InvItem = GetItem(i); @@ -431,11 +435,11 @@ bool Inventory::HasSpaceForItem(const Item_Struct *ItemToTry, int16 Quantity) { } else if (InvItem->IsType(ItemClassContainer) && CanItemFitInContainer(ItemToTry, InvItem->GetItem())) { - int16 BaseSlotID = Inventory::CalcSlotId(i, 0); + int16 BaseSlotID = Inventory::CalcSlotId(i, SUB_BEGIN); uint8 BagSize = InvItem->GetItem()->BagSlots; - for (uint8 BagSlot = 0; BagSlotIsType(ItemClassContainer) && inst->GetItem()->BagSize >= min_size) @@ -628,11 +632,11 @@ int16 Inventory::FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size, boo continue; } - int16 base_slot_id = Inventory::CalcSlotId(i, 0); + int16 base_slot_id = Inventory::CalcSlotId(i, SUB_BEGIN); uint8 slots = inst->GetItem()->BagSlots; uint8 j; - for (j = 0; j= EmuConstants::CURSOR_BAG_BEGIN && slot_id <= EmuConstants::CURSOR_BAG_END) - parent_slot_id = EmuConstants::CURSOR; + parent_slot_id = MainCursor; /* - // this is not a bag range... + // this is not a bag range... using this risks over-writing existing items else if (slot_id >= EmuConstants::BANK_BEGIN && slot_id <= EmuConstants::BANK_END) parent_slot_id = EmuConstants::BANK_BEGIN + (slot_id - EmuConstants::BANK_BEGIN) / EmuConstants::ITEM_CONTAINER_SIZE; */ @@ -686,7 +690,7 @@ int16 Inventory::CalcSlotId(int16 bagslot_id, uint8 bagidx) { int16 slot_id = INVALID_INDEX; - if (bagslot_id == EmuConstants::CURSOR || bagslot_id == 8000) + if (bagslot_id == MainCursor || bagslot_id == 8000) slot_id = EmuConstants::CURSOR_BAG_BEGIN + bagidx; else if (bagslot_id >= EmuConstants::GENERAL_BEGIN && bagslot_id <= EmuConstants::GENERAL_END) @@ -714,7 +718,7 @@ uint8 Inventory::CalcBagIdx(int16 slot_id) { index = (slot_id - EmuConstants::CURSOR_BAG_BEGIN); // % EmuConstants::ITEM_CONTAINER_SIZE; - not needed since range is 10 slots /* - // this is not a bag range... + // this is not a bag range... using this risks over-writing existing items else if (slot_id >= EmuConstants::BANK_BEGIN && slot_id <= EmuConstants::BANK_END) index = (slot_id - EmuConstants::BANK_BEGIN) % EmuConstants::ITEM_CONTAINER_SIZE; */ @@ -806,41 +810,41 @@ bool Inventory::CanItemFitInContainer(const Item_Struct *ItemToTry, const Item_S // Test whether a given slot can support a container item bool Inventory::SupportsContainers(int16 slot_id) { - if ((slot_id >= 22 && slot_id <= 30) || // Personal inventory slots - (slot_id >= 2000 && slot_id <= 2023) || // Bank slots - (slot_id >= 2500 && slot_id <= 2501) || // Shared bank slots - (slot_id == MainCursor) || // Cursor - (slot_id >= 3000 && slot_id <= 3007)) // Trade window + if ((slot_id == MainCursor) || + (slot_id >= EmuConstants::GENERAL_BEGIN && slot_id <= EmuConstants::GENERAL_END) || + (slot_id >= EmuConstants::BANK_BEGIN && slot_id <= EmuConstants::BANK_END) || + (slot_id >= EmuConstants::SHARED_BANK_BEGIN && slot_id <= EmuConstants::SHARED_BANK_END) || + (slot_id >= EmuConstants::TRADE_BEGIN && slot_id <= EmuConstants::TRADE_END)) return true; return false; } int Inventory::GetSlotByItemInst(ItemInst *inst) { if (!inst) - return -1; + return INVALID_INDEX; int i = GetSlotByItemInstCollection(m_worn, inst); - if (i != -1) { + if (i != INVALID_INDEX) { return i; } i = GetSlotByItemInstCollection(m_inv, inst); - if (i != -1) { + if (i != INVALID_INDEX) { return i; } i = GetSlotByItemInstCollection(m_bank, inst); - if (i != -1) { + if (i != INVALID_INDEX) { return i; } i = GetSlotByItemInstCollection(m_shbank, inst); - if (i != -1) { + if (i != INVALID_INDEX) { return i; } i = GetSlotByItemInstCollection(m_trade, inst); - if (i != -1) { + if (i != INVALID_INDEX) { return i; } @@ -848,7 +852,7 @@ int Inventory::GetSlotByItemInst(ItemInst *inst) { return MainCursor; } - return -1; + return INVALID_INDEX; } void Inventory::dumpEntireInventory() { @@ -965,29 +969,33 @@ int16 Inventory::_PutItem(int16 slot_id, ItemInst* inst) int16 result = INVALID_INDEX; - if (slot_id == MainCursor) { // Cursor + if (slot_id == MainCursor) { // Replace current item on cursor, if exists m_cursor.pop(); // no memory delete, clients of this function know what they are doing m_cursor.push_front(inst); result = slot_id; } - else if ((slot_id >= 0 && slot_id <= 21) || (slot_id >= 400 && slot_id <= 404) || (slot_id == 9999)) { // Worn slots + else if ((slot_id >= EmuConstants::EQUIPMENT_BEGIN && slot_id <= EmuConstants::EQUIPMENT_END) || (slot_id == MainPowerSource)) { m_worn[slot_id] = inst; result = slot_id; } - else if ((slot_id >= 22 && slot_id <= 29)) { + else if ((slot_id >= EmuConstants::GENERAL_BEGIN && slot_id <= EmuConstants::GENERAL_END)) { m_inv[slot_id] = inst; result = slot_id; } - else if (slot_id >= 2000 && slot_id <= 2023) { // Bank slots + else if (slot_id >= EmuConstants::TRIBUTE_BEGIN && slot_id <= EmuConstants::TRIBUTE_END) { + m_worn[slot_id] = inst; + result = slot_id; + } + else if (slot_id >= EmuConstants::BANK_BEGIN && slot_id <= EmuConstants::BANK_END) { m_bank[slot_id] = inst; result = slot_id; } - else if (slot_id >= 2500 && slot_id <= 2501) { // Shared bank slots + else if (slot_id >= EmuConstants::SHARED_BANK_BEGIN && slot_id <= EmuConstants::SHARED_BANK_END) { m_shbank[slot_id] = inst; result = slot_id; } - else if (slot_id >= 3000 && slot_id <= 3007) { // Trade window slots + else if (slot_id >= EmuConstants::TRADE_BEGIN && slot_id <= EmuConstants::TRADE_END) { m_trade[slot_id] = inst; result = slot_id; } @@ -1026,9 +1034,9 @@ int16 Inventory::_HasItem(std::map& bucket, uint32 item_id, ui return it->first; } - for (int i = 0; i < EmuConstants::ITEM_COMMON_SIZE; i++) { + for (int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { if (inst->GetAugmentItemID(i) == item_id && quantity <= 1) - return SLOT_AUGMENT; // Only one augment per slot. + return legacy::SLOT_AUGMENT; // Only one augment per slot. } } // Go through bag, if bag @@ -1041,9 +1049,9 @@ int16 Inventory::_HasItem(std::map& bucket, uint32 item_id, ui if (quantity_found >= quantity) return Inventory::CalcSlotId(it->first, itb->first); } - for (int i = 0; i < EmuConstants::ITEM_COMMON_SIZE; i++) { + for (int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { if (baginst->GetAugmentItemID(i) == item_id && quantity <= 1) - return SLOT_AUGMENT; // Only one augment per slot. + return legacy::SLOT_AUGMENT; // Only one augment per slot. } } } @@ -1070,9 +1078,9 @@ int16 Inventory::_HasItem(ItemInstQueue& iqueue, uint32 item_id, uint8 quantity) if (quantity_found >= quantity) return MainCursor; } - for (int i = 0; i < EmuConstants::ITEM_COMMON_SIZE; i++) { + for (int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { if (inst->GetAugmentItemID(i) == item_id && quantity <= 1) - return SLOT_AUGMENT; // Only one augment per slot. + return legacy::SLOT_AUGMENT; // Only one augment per slot. } } // Go through bag, if bag @@ -1085,9 +1093,9 @@ int16 Inventory::_HasItem(ItemInstQueue& iqueue, uint32 item_id, uint8 quantity) if (quantity_found >= quantity) return Inventory::CalcSlotId(MainCursor, itb->first); } - for (int i = 0; i < EmuConstants::ITEM_COMMON_SIZE; i++) { + for (int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { if (baginst->GetAugmentItemID(i) == item_id && quantity <= 1) - return SLOT_AUGMENT; // Only one augment per slot. + return legacy::SLOT_AUGMENT; // Only one augment per slot. } } @@ -1181,10 +1189,10 @@ int16 Inventory::_HasItemByLoreGroup(std::map& bucket, uint32 return it->first; ItemInst* Aug; - for (int i = 0; i < EmuConstants::ITEM_COMMON_SIZE; i++) { + for (int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { Aug = inst->GetAugment(i); if (Aug && Aug->GetItem()->LoreGroup == loregroup) - return SLOT_AUGMENT; // Only one augment per slot. + return legacy::SLOT_AUGMENT; // Only one augment per slot. } } // Go through bag, if bag @@ -1196,10 +1204,10 @@ int16 Inventory::_HasItemByLoreGroup(std::map& bucket, uint32 return Inventory::CalcSlotId(it->first, itb->first); ItemInst* Aug2; - for (int i = 0; i < EmuConstants::ITEM_COMMON_SIZE; i++) { + for (int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { Aug2 = baginst->GetAugment(i); if (Aug2 && Aug2->GetItem()->LoreGroup == loregroup) - return SLOT_AUGMENT; // Only one augment per slot. + return legacy::SLOT_AUGMENT; // Only one augment per slot. } } } @@ -1224,10 +1232,10 @@ int16 Inventory::_HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 loregroup) return MainCursor; ItemInst* Aug; - for (int i = 0; i < EmuConstants::ITEM_COMMON_SIZE; i++) { + for (int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { Aug = inst->GetAugment(i); if (Aug && Aug->GetItem()->LoreGroup == loregroup) - return SLOT_AUGMENT; // Only one augment per slot. + return legacy::SLOT_AUGMENT; // Only one augment per slot. } } // Go through bag, if bag @@ -1240,10 +1248,10 @@ int16 Inventory::_HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 loregroup) ItemInst* Aug2; - for (int i = 0; i < EmuConstants::ITEM_COMMON_SIZE; i++) { + for (int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { Aug2 = baginst->GetAugment(i); if (Aug2 && Aug2->GetItem()->LoreGroup == loregroup) - return SLOT_AUGMENT; // Only one augment per slot. + return legacy::SLOT_AUGMENT; // Only one augment per slot. } } @@ -1419,14 +1427,15 @@ bool ItemInst::IsEquipable(int16 slot_id) const if (!m_item) return false; - if (slot_id == 9999) { - slot_id = 22; + // another "shouldn't do" fix..will be fixed in future updates (requires code and database work) + if (slot_id == MainPowerSource) { + slot_id = MainGeneral1; uint32 slot_mask = (1 << slot_id); if (slot_mask & m_item->Slots) return true; } - if (slot_id < 22) { + if ((uint16)slot_id <= EmuConstants::EQUIPMENT_END) { uint32 slot_mask = (1 << slot_id); if (slot_mask & m_item->Slots) return true; @@ -1435,13 +1444,14 @@ bool ItemInst::IsEquipable(int16 slot_id) const return false; } -bool ItemInst::AvailableWearSlot(uint32 aug_wear_slots) const -{ +bool ItemInst::AvailableWearSlot(uint32 aug_wear_slots) const { + // TODO: check to see if incoming 'aug_wear_slots' "switches" bit assignments like above... + // (if wrong, would only affect MainAmmo and MainPowerSource augments) if (m_item->ItemClass != ItemClassCommon || !m_item) return false; int i; - for (i = 0; i<23; i++) { + for (i = EmuConstants::EQUIPMENT_BEGIN; i <= MainGeneral1; i++) { // MainGeneral1 should be EmuConstants::EQUIPMENT_END if (m_item->Slots & (1 << i)) { if (aug_wear_slots & (1 << i)) break; @@ -1457,7 +1467,7 @@ int8 ItemInst::AvailableAugmentSlot(int32 augtype) const return -1; int i; - for (i = 0; i<5; i++) { + for (i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { if (!GetItem(i)) { if (augtype == -1 || (m_item->AugSlotType[i] && ((1 << (m_item->AugSlotType[i] - 1)) & augtype))) break; @@ -1465,7 +1475,7 @@ int8 ItemInst::AvailableAugmentSlot(int32 augtype) const } - return (i<5) ? i : -1; + return (i < EmuConstants::ITEM_COMMON_SIZE) ? i : INVALID_INDEX; } // Retrieve item inside container @@ -1483,7 +1493,7 @@ ItemInst* ItemInst::GetItem(uint8 index) const uint32 ItemInst::GetItemID(uint8 slot) const { const ItemInst *item; - uint32 id = 0; + uint32 id = NO_ITEM; if ((item = GetItem(slot)) != nullptr) id = item->GetItem()->ID; @@ -1588,12 +1598,12 @@ void ItemInst::ClearByFlags(byFlagSetting is_nodrop, byFlagSetting is_norent) uint8 ItemInst::FirstOpenSlot() const { uint8 slots = m_item->BagSlots, i; - for (i = 0; iItemClass != ItemClassContainer) { return item_count; } - for (int idx = 0; idx < m_item->BagSlots; idx++) { if (GetItem(idx)) { item_count++; } } + for (int idx = SUB_BEGIN; idx < m_item->BagSlots; idx++) { if (GetItem(idx)) { item_count++; } } return item_count; } @@ -1612,7 +1622,7 @@ bool ItemInst::IsNoneEmptyContainer() if (m_item->ItemClass != ItemClassContainer) return false; - for (int i = 0; i < m_item->BagSlots; ++i) + for (int i = SUB_BEGIN; i < m_item->BagSlots; ++i) if (GetItem(i)) return true; @@ -1630,7 +1640,7 @@ ItemInst* ItemInst::GetAugment(uint8 slot) const uint32 ItemInst::GetAugmentItemID(uint8 slot) const { - uint32 id = 0; + uint32 id = NO_ITEM; if (m_item->ItemClass == ItemClassCommon) { return GetItemID(slot); } @@ -1647,7 +1657,7 @@ void ItemInst::PutAugment(uint8 slot, const ItemInst& augment) void ItemInst::PutAugment(SharedDatabase *db, uint8 slot, uint32 item_id) { - if (item_id != 0) { + if (item_id != NO_ITEM) { const ItemInst* aug = db->CreateItem(item_id); if (aug) { @@ -1675,7 +1685,7 @@ ItemInst* ItemInst::RemoveAugment(uint8 index) bool ItemInst::IsAugmented() { - for (int i = 0; i < EmuConstants::ITEM_COMMON_SIZE; ++i) + for (int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; ++i) if (GetAugmentItemID(i)) return true; @@ -1792,8 +1802,8 @@ bool ItemInst::IsSlotAllowed(int16 slot_id) const { if (!m_item) { return false; } else if (Inventory::SupportsContainers(slot_id)) { return true; } else if (m_item->Slots & (1 << slot_id)) { return true; } - else if (slot_id == 9999 && (m_item->Slots & (1 << 22))) { return true; } - else if (slot_id != 9999 && slot_id > 21) { return true; } + else if (slot_id == MainPowerSource && (m_item->Slots & (1 << 22))) { return true; } // got lazy... + else if (slot_id != MainPowerSource && slot_id > EmuConstants::EQUIPMENT_END) { return true; } else { return false; } } diff --git a/common/Item.h b/common/Item.h index 9dd03e2bb..ef59ddd6f 100644 --- a/common/Item.h +++ b/common/Item.h @@ -365,7 +365,7 @@ public: bool IsActivated() { return m_activated; } void SetActivated(bool activated) { m_activated = activated; } int8 GetEvolveLvl() const { return m_evolveLvl; } - void SetScaling(bool v) { m_scaling = v; } + void SetScaling(bool v) { m_scaling = v; } void Initialize(SharedDatabase *db = nullptr); void ScaleItem(); @@ -413,9 +413,9 @@ protected: // // Items inside of this item (augs or contents); - std::map m_contents; // Zero-based index: min=0, max=9 - std::map m_custom_data; - std::map m_timers; + std::map m_contents; // Zero-based index: min=0, max=9 + std::map m_custom_data; + std::map m_timers; }; class EvolveInfo { diff --git a/common/database.cpp b/common/database.cpp index dda0719ba..6fdf6b1af 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -707,7 +707,7 @@ bool Database::DeleteCharacter(char *name) return true; } -// Store new character information into the character_ and inventory tables +// Store new character information into the character_ and inventory tables (this won't store starting augments) bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, Inventory* inv, ExtendedProfile_Struct *ext) { char errbuf[MYSQL_ERRMSG_SIZE]; @@ -793,7 +793,7 @@ bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, Inven // Doodman: Is this even used? // now the inventory - for (i = EmuConstants::POSSESSIONS_BEGIN; i <= EmuConstants::BANK_BAGS_END;) + for (i = EmuConstants::EQUIPMENT_BEGIN; i <= EmuConstants::BANK_BAGS_END;) { const ItemInst* newinv = inv->GetItem((int16)i); if (newinv) @@ -821,7 +821,7 @@ bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, Inven safe_delete_array(invquery); } - if (i == EmuConstants::CURSOR) { + if (i == MainCursor) { i = EmuConstants::GENERAL_BAGS_BEGIN; continue; } diff --git a/common/eq_constants.h b/common/eq_constants.h index 360fcba95..1868d6c3e 100644 --- a/common/eq_constants.h +++ b/common/eq_constants.h @@ -877,74 +877,6 @@ enum InventoryMainTypes : int16 { _MainCount }; -enum InventorySlot -{ - //////////////////////// - // Equip slots - //////////////////////// - - //SLOT_CHARM = 0, - //SLOT_EAR01 = 1, - //SLOT_HEAD = 2, - //SLOT_FACE = 3, - //SLOT_EAR02 = 4, - //SLOT_NECK = 5, - //SLOT_SHOULDER = 6, - //SLOT_ARMS = 7, - //SLOT_BACK = 8, - //SLOT_BRACER01 = 9, - //SLOT_BRACER02 = 10, - //SLOT_RANGE = 11, - //SLOT_HANDS = 12, - //SLOT_PRIMARY = 13, - //SLOT_SECONDARY = 14, - //SLOT_RING01 = 15, - //SLOT_RING02 = 16, - //SLOT_CHEST = 17, - //SLOT_LEGS = 18, - //SLOT_FEET = 19, - //SLOT_WAIST = 20, - //SLOT_AMMO = 21, - - //////////////////////// - // All other slots - //////////////////////// - //SLOT_PERSONAL_BEGIN = 22, - //SLOT_PERSONAL_END = 29, - - //SLOT_CURSOR = 30, - - SLOT_CURSOR_END = (int16)0xFFFE, // Last item on cursor queue - // Cursor bag slots are 331->340 (10 slots) - - // Personal Inventory Slots - // Slots 1 through 8 are slots 22->29 - // Inventory bag slots are 251->330 (10 slots per bag) - - // Tribute slots are 400-404? (upper bound unknown) - // storing these in worn item's map - - // Bank slots - // Bank slots 1 through 16 are slots 2000->2015 - // Bank bag slots are 2031->2190 - - // Shared bank slots - // Shared bank slots 1 through 2 are slots 2500->2501 - // Shared bank bag slots are 2531->2550 - - // Trade session slots - // Trade slots 1 through 8 are slots 3000->3007 - // Trade bag slots are technically 0->79 when passed to client, - // but in our code, we treat them as slots 3100->3179 - - // Slot used in OP_TradeSkillCombine for world tradeskill containers - SLOT_TRADESKILL = 1000, - SLOT_AUGMENT = 1001//, - //SLOT_POWER_SOURCE = 9999//, - // Value recognized by client for destroying an item - //SLOT_INVALID = (int16)0xFFFF -}; - #define INVALID_INDEX -1 #define NOT_USED 0 #define NO_ITEM 0 @@ -956,4 +888,84 @@ enum InventorySlot #define SUB_BEGIN 0 #define AUG_BEGIN 0 +namespace legacy { + // this is for perl and other legacy systems + + typedef enum { + SLOT_CHARM = 0, + SLOT_EAR01 = 1, + SLOT_HEAD = 2, + SLOT_FACE = 3, + SLOT_EAR02 = 4, + SLOT_NECK = 5, + SLOT_SHOULDER = 6, + SLOT_ARMS = 7, + SLOT_BACK = 8, + SLOT_BRACER01 = 9, + SLOT_BRACER02 = 10, + SLOT_RANGE = 11, + SLOT_HANDS = 12, + SLOT_PRIMARY = 13, + SLOT_SECONDARY = 14, + SLOT_RING01 = 15, + SLOT_RING02 = 16, + SLOT_CHEST = 17, + SLOT_LEGS = 18, + SLOT_FEET = 19, + SLOT_WAIST = 20, + SLOT_POWER_SOURCE = 9999, + SLOT_AMMO = 21, + SLOT_GENERAL_1 = 22, + SLOT_GENERAL_2 = 23, + SLOT_GENERAL_3 = 24, + SLOT_GENERAL_4 = 25, + SLOT_GENERAL_5 = 26, + SLOT_GENERAL_6 = 27, + SLOT_GENERAL_7 = 28, + SLOT_GENERAL_8 = 29, + //SLOT_GENERAL_9 = not supported + //SLOT_GENERAL_10 = not supported + SLOT_CURSOR = 30, + SLOT_CURSOR_END = (int16)0xFFFE, // I hope no one is using this... + SLOT_TRADESKILL = 1000, + SLOT_AUGMENT = 1001, + SLOT_INVALID = (int16)0xFFFF, + + SLOT_POSSESSIONS_BEGIN = 0, + SLOT_POSSESSIONS_END = 30, + + SLOT_EQUIPMENT_BEGIN = 0, + SLOT_EQUIPMENT_END = 21, + + SLOT_PERSONAL_BEGIN = 22, + SLOT_PERSONAL_END = 29, + SLOT_PERSONAL_BAGS_BEGIN = 251, + SLOT_PERSONAL_BAGS_END = 330, + + SLOT_CURSOR_BAG_BEGIN = 331, + SLOT_CURSOR_BAG_END = 340, + + SLOT_TRIBUTE_BEGIN = 400, + SLOT_TRIBUTE_END = 404, + + SLOT_BANK_BEGIN = 2000, + SLOT_BANK_END = 2023, + SLOT_BANK_BAGS_BEGIN = 2031, + SLOT_BANK_BAGS_END = 2270, + + SLOT_SHARED_BANK_BEGIN = 2500, + SLOT_SHARED_BANK_END = 2501, + SLOT_SHARED_BANK_BAGS_BEGIN = 2531, + SLOT_SHARED_BANK_BAGS_END = 2550, + + SLOT_TRADE_BEGIN = 3000, + SLOT_TRADE_END = 3007, + SLOT_TRADE_BAGS_BEGIN = 3031, + SLOT_TRADE_BAGS_END = 3110, + + SLOT_WORLD_BEGIN = 4000, + SLOT_WORLD_END = 4009 + } InventorySlot; +} + #endif diff --git a/common/eq_dictionary.cpp b/common/eq_dictionary.cpp index 7ef36d8a7..a1fa5e3e1 100644 --- a/common/eq_dictionary.cpp +++ b/common/eq_dictionary.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StringUtil.h" // -// class ServerConstants +// class EmuConstants // uint16 EmuConstants::InventoryMapSize(int16 map) { switch (map) { @@ -255,8 +255,193 @@ std::string EmuConstants::InventoryAugName(int16 aug) { return ret_str; } +// legacy-related functions +// +// these should work for the first-stage coversions..but, once the new system is up and going..conversions will be incompatible +// without limiting server functions and other aspects, such as augment control, bag size, etc. A complete remapping will be +// required when bag sizes over 10 and direct manipulation of augments are implemented, due to the massive increase in range usage. +// +// (current personal/cursor bag range {251..340}, or 90 slots ... conversion translated range would be {10000..12804}, or 2805 slots... +// these would have to be hard-coded into all perl code to allow access to full range of the new system - actual limits would be +// less, based on bag size..but, the range must be full and consistent to avoid translation issues -- similar changes to other ranges +// (240 versus 6120 slots for bank bags, for example...)) +/* +int EmuConstants::ServerToPerlSlot(int server_slot) { // set r/s + switch (server_slot) { + case legacy::SLOT_CURSOR_END: + return legacy::SLOT_CURSOR_END; + case INVALID_INDEX: + return legacy::SLOT_INVALID; + case MainPowerSource: + return legacy::SLOT_POWER_SOURCE; + case MainAmmo: + return legacy::SLOT_AMMO; + case MainCursor: + return legacy::SLOT_CURSOR; + case legacy::SLOT_TRADESKILL: + return legacy::SLOT_TRADESKILL; + case legacy::SLOT_AUGMENT: + return legacy::SLOT_AUGMENT; + default: + int perl_slot = legacy::SLOT_INVALID; + + // activate the internal checks as needed + if (server_slot >= EmuConstants::EQUIPMENT_BEGIN && server_slot <= MainWaist) { + perl_slot = server_slot; + } + else if (server_slot >= EmuConstants::GENERAL_BEGIN && server_slot <= EmuConstants::GENERAL_END) { + perl_slot = server_slot;// + legacy::SLOT_PERSONAL_BEGIN - EmuConstants::GENERAL_BEGIN; + //if (perl_slot < legacy::SLOT_PERSONAL_BEGIN || perl_slot > legacy::SLOT_PERSONAL_END) + // perl_slot = legacy::SLOT_INVALID; + } + else if (server_slot >= EmuConstants::GENERAL_BAGS_BEGIN && server_slot <= EmuConstants::GENERAL_BAGS_END) { + perl_slot = server_slot;// + legacy::SLOT_PERSONAL_BAGS_BEGIN - EmuConstants::GENERAL_BAGS_BEGIN; + //if (perl_slot < legacy::SLOT_PERSONAL_BAGS_BEGIN || perl_slot > legacy::SLOT_PERSONAL_BAGS_END) + // perl_slot = legacy::SLOT_INVALID; + } + else if (server_slot >= EmuConstants::CURSOR_BAG_BEGIN && server_slot <= EmuConstants::CURSOR_BAG_END) { + perl_slot = server_slot;// + legacy::SLOT_CURSOR_BAG_BEGIN - EmuConstants::CURSOR_BAG_BEGIN; + //if (perl_slot < legacy::SLOT_CURSOR_BAG_BEGIN || perl_slot > legacy::SLOT_CURSOR_BAG_END) + // perl_slot = legacy::SLOT_INVALID; + } + else if (server_slot >= EmuConstants::TRIBUTE_BEGIN && server_slot <= EmuConstants::TRIBUTE_END) { + perl_slot = server_slot;// + legacy::SLOT_TRIBUTE_BEGIN - EmuConstants::TRADE_BEGIN; + //if (perl_slot < legacy::SLOT_TRIBUTE_BEGIN || perl_slot > legacy::SLOT_TRIBUTE_END) + // perl_slot = legacy::SLOT_INVALID; + } + else if (server_slot >= EmuConstants::BANK_BEGIN && server_slot <= EmuConstants::BANK_END) { + perl_slot = server_slot;// + legacy::SLOT_BANK_BEGIN - EmuConstants::BANK_BEGIN; + //if (perl_slot < legacy::SLOT_BANK_BEGIN || perl_slot > legacy::SLOT_BANK_END) + // perl_slot = legacy::SLOT_INVALID; + } + else if (server_slot >= EmuConstants::BANK_BAGS_BEGIN && server_slot <= EmuConstants::BANK_BAGS_END) { + perl_slot = server_slot;// + legacy::SLOT_BANK_BAGS_BEGIN - EmuConstants::BANK_BAGS_BEGIN; + //if (perl_slot < legacy::SLOT_BANK_BAGS_BEGIN || perl_slot > legacy::SLOT_BANK_BAGS_END) + // perl_slot = legacy::SLOT_INVALID; + } + else if (server_slot >= EmuConstants::SHARED_BANK_BEGIN && server_slot <= EmuConstants::SHARED_BANK_END) { + perl_slot = server_slot;// + legacy::SLOT_SHARED_BANK_BEGIN - EmuConstants::SHARED_BANK_BEGIN; + //if (perl_slot < legacy::SLOT_SHARED_BANK_BEGIN || perl_slot > legacy::SLOT_SHARED_BANK_END) + // perl_slot = legacy::SLOT_INVALID; + } + else if (server_slot >= EmuConstants::SHARED_BANK_BAGS_BEGIN && server_slot <= EmuConstants::SHARED_BANK_BAGS_END) { + perl_slot = server_slot;// + legacy::SLOT_SHARED_BANK_BAGS_BEGIN - EmuConstants::SHARED_BANK_BAGS_BEGIN; + //if (perl_slot < legacy::SLOT_SHARED_BANK_BAGS_BEGIN || perl_slot > legacy::SLOT_SHARED_BANK_BAGS_END) + // perl_slot = legacy::SLOT_INVALID; + } + else if (server_slot >= EmuConstants::TRADE_BEGIN && server_slot <= EmuConstants::TRADE_END) { + perl_slot = server_slot;// + legacy::SLOT_TRADE_BEGIN - EmuConstants::TRADE_BEGIN; + //if (perl_slot < legacy::SLOT_TRADE_BEGIN || perl_slot > legacy::SLOT_TRADE_END) + // perl_slot = legacy::SLOT_INVALID; + } + else if (server_slot >= EmuConstants::TRADE_BAGS_BEGIN && server_slot <= EmuConstants::TRADE_BAGS_END) { + perl_slot = server_slot;// + legacy::SLOT_TRADE_BAGS_BEGIN - EmuConstants::TRADE_BAGS_BEGIN; + //if (perl_slot < legacy::SLOT_TRADE_BAGS_BEGIN || perl_slot > legacy::SLOT_TRADE_BAGS_END) + // perl_slot = legacy::SLOT_INVALID; + } + else if (server_slot >= EmuConstants::WORLD_BEGIN && server_slot <= EmuConstants::WORLD_END) { + perl_slot = server_slot;// + legacy::SLOT_WORLD_BEGIN - EmuConstants::WORLD_BEGIN; + //if (perl_slot < legacy::SLOT_WORLD_BEGIN || perl_slot > legacy::SLOT_WORLD_END) + // perl_slot = legacy::SLOT_INVALID; + } + else if (server_slot >= 8000 && server_slot <= 8999) { // this range may be limited to 36 in the future (client size) + perl_slot = server_slot; + } + + return perl_slot; + } +} +*/ +/* +int EmuConstants::PerlToServerSlot(int perl_slot) { // set r/s + switch (perl_slot) { + case legacy::SLOT_CURSOR_END: + return legacy::SLOT_CURSOR_END; + case legacy::SLOT_INVALID: + return INVALID_INDEX; + case legacy::SLOT_POWER_SOURCE: + return MainPowerSource; + case legacy::SLOT_AMMO: + return MainAmmo; + case legacy::SLOT_CURSOR: + return MainCursor; + case legacy::SLOT_TRADESKILL: + return legacy::SLOT_TRADESKILL; + case legacy::SLOT_AUGMENT: + return legacy::SLOT_AUGMENT; + default: + int server_slot = INVALID_INDEX; + + // activate the internal checks as needed + if (perl_slot >= legacy::SLOT_EQUIPMENT_BEGIN && perl_slot <= legacy::SLOT_WAIST) { + server_slot = perl_slot; + } + else if (perl_slot >= legacy::SLOT_PERSONAL_BEGIN && perl_slot <= legacy::SLOT_PERSONAL_END) { + server_slot = perl_slot;// + EmuConstants::GENERAL_BEGIN - legacy::SLOT_PERSONAL_BEGIN; + //if (server_slot < EmuConstants::GENERAL_BEGIN || server_slot > EmuConstants::GENERAL_END) + // server_slot = INVALID_INDEX; + } + else if (perl_slot >= legacy::SLOT_PERSONAL_BAGS_BEGIN && perl_slot <= legacy::SLOT_PERSONAL_BAGS_END) { + server_slot = perl_slot;// + EmuConstants::GENERAL_BAGS_BEGIN - legacy::SLOT_PERSONAL_BAGS_BEGIN; + //if (server_slot < EmuConstants::GENERAL_BAGS_BEGIN || server_slot > EmuConstants::GENERAL_BAGS_END) + // server_slot = INVALID_INDEX; + } + else if (perl_slot >= legacy::SLOT_CURSOR_BAG_BEGIN && perl_slot <= legacy::SLOT_CURSOR_BAG_END) { + server_slot = perl_slot;// + EmuConstants::CURSOR_BAG_BEGIN - legacy::SLOT_CURSOR_BAG_BEGIN; + //if (server_slot < EmuConstants::CURSOR_BAG_BEGIN || server_slot > EmuConstants::CURSOR_BAG_END) + // server_slot = INVALID_INDEX; + } + else if (perl_slot >= legacy::SLOT_TRIBUTE_BEGIN && perl_slot <= legacy::SLOT_TRIBUTE_END) { + server_slot = perl_slot;// + EmuConstants::TRIBUTE_BEGIN - legacy::SLOT_TRIBUTE_BEGIN; + //if (server_slot < EmuConstants::TRIBUTE_BEGIN || server_slot > EmuConstants::TRIBUTE_END) + // server_slot = INVALID_INDEX; + } + else if (perl_slot >= legacy::SLOT_BANK_BEGIN && perl_slot <= legacy::SLOT_BANK_END) { + server_slot = perl_slot;// + EmuConstants::BANK_BEGIN - legacy::SLOT_BANK_BEGIN; + //if (server_slot < EmuConstants::BANK_BEGIN || server_slot > EmuConstants::BANK_END) + // server_slot = INVALID_INDEX; + } + else if (perl_slot >= legacy::SLOT_BANK_BAGS_BEGIN && perl_slot <= legacy::SLOT_BANK_BAGS_END) { + server_slot = perl_slot;// + EmuConstants::BANK_BAGS_BEGIN - legacy::SLOT_BANK_BAGS_BEGIN; + //if (server_slot < EmuConstants::BANK_BAGS_BEGIN || server_slot > EmuConstants::BANK_BAGS_END) + // server_slot = INVALID_INDEX; + } + else if (perl_slot >= legacy::SLOT_SHARED_BANK_BEGIN && perl_slot <= legacy::SLOT_SHARED_BANK_END) { + server_slot = perl_slot;// + EmuConstants::SHARED_BANK_BEGIN - legacy::SLOT_SHARED_BANK_BEGIN; + //if (server_slot < EmuConstants::SHARED_BANK_BEGIN || server_slot > EmuConstants::SHARED_BANK_END) + // server_slot = INVALID_INDEX; + } + else if (perl_slot >= legacy::SLOT_SHARED_BANK_BAGS_BEGIN && perl_slot <= legacy::SLOT_SHARED_BANK_BAGS_END) { + server_slot = perl_slot;// + EmuConstants::SHARED_BANK_BAGS_BEGIN - legacy::SLOT_SHARED_BANK_BAGS_END; + //if (server_slot < EmuConstants::SHARED_BANK_BAGS_BEGIN || server_slot > EmuConstants::SHARED_BANK_BAGS_END) + // server_slot = INVALID_INDEX; + } + else if (perl_slot >= legacy::SLOT_TRADE_BEGIN && perl_slot <= legacy::SLOT_TRADE_END) { + server_slot = perl_slot;// + EmuConstants::TRADE_BEGIN - legacy::SLOT_TRADE_BEGIN; + //if (server_slot < EmuConstants::TRADE_BEGIN || server_slot > EmuConstants::TRADE_END) + // server_slot = INVALID_INDEX; + } + else if (perl_slot >= legacy::SLOT_TRADE_BAGS_BEGIN && perl_slot <= legacy::SLOT_TRADE_BAGS_END) { + server_slot = perl_slot;// + EmuConstants::TRADE_BAGS_BEGIN - legacy::SLOT_TRADE_BAGS_BEGIN; + //if (server_slot < EmuConstants::TRADE_BAGS_BEGIN || server_slot > EmuConstants::TRADE_BAGS_END) + // server_slot = INVALID_INDEX; + } + else if (perl_slot >= legacy::SLOT_WORLD_BEGIN && perl_slot <= legacy::SLOT_WORLD_END) { + server_slot = perl_slot;// + EmuConstants::WORLD_BEGIN - legacy::SLOT_WORLD_BEGIN; + //if (server_slot < EmuConstants::WORLD_BEGIN || server_slot > EmuConstants::WORLD_END) + // server_slot = INVALID_INDEX; + } + else if (perl_slot >= 8000 && perl_slot <= 8999) { // this range may be limited to 36 in the future (client size) + server_slot = perl_slot; + } + + return server_slot; + } +} +*/ + // -// class ClientLimits +// class EQLimits // // client validation bool EQLimits::IsValidClientVersion(uint32 version) { diff --git a/common/eq_dictionary.h b/common/eq_dictionary.h index e5e0f86b8..eb35f5127 100644 --- a/common/eq_dictionary.h +++ b/common/eq_dictionary.h @@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //#include "../common/patches/RoF2_constants.h" // *** DO NOT CHANGE without a full understanding of the consequences..the server is set up to use these settings explicitly!! *** -// *** You will cause compilation failures and corrupt your database if partial or incorrect attempts to them change are made!! *** +// *** You will cause compilation failures and corrupt your database if partial or incorrect attempts to change them are made!! *** // Hard-coded values usually indicate that further research is needed and the values given are from the old (known) system @@ -86,15 +86,10 @@ public: // most of these definitions will go away with the structure-based system..this maintains compatibility for now // (these are mainly to assign specific values to constants used in conversions and to identify per-client ranges/offsets) - static const int16 POSSESSIONS_BEGIN = MainCharm; - static const int16 POSSESSIONS_END = MainCursor; - static const int16 EQUIPMENT_BEGIN = MainCharm; static const int16 EQUIPMENT_END = MainAmmo; static const uint16 EQUIPMENT_SIZE = 22; // does not account for 'Power Source' - used mainly for npc equipment arrays - static const int16 POWER_SOURCE = MainPowerSource; // temp - static const int16 GENERAL_BEGIN = MainGeneral1; static const int16 GENERAL_END = MainGeneral8; static const uint16 GENERAL_SIZE = 8; @@ -102,7 +97,6 @@ public: static const int16 GENERAL_BAGS_END_OFFSET = 79; static const int16 GENERAL_BAGS_END = GENERAL_BAGS_BEGIN + GENERAL_BAGS_END_OFFSET; - static const int16 CURSOR = MainCursor; static const int16 CURSOR_BAG_BEGIN = 331; static const int16 CURSOR_BAG_END_OFFSET = 9; static const int16 CURSOR_BAG_END = CURSOR_BAG_BEGIN + CURSOR_BAG_END_OFFSET; @@ -128,23 +122,20 @@ public: static const int16 WORLD_BEGIN = 4000; static const int16 WORLD_END = 4009; - static const int16 WORLD_SIZE = 10; + static const int16 WORLD_SIZE = MAP_WORLD_SIZE; static const int16 TRIBUTE_BEGIN = 400; static const int16 TRIBUTE_END = 404; - static const int16 TRIBUTE_SIZE = 5; + static const int16 TRIBUTE_SIZE = MAP_TRIBUTE_SIZE; static const int16 CORPSE_BEGIN = 22; //static const int16 CORPSE_END = RoF::consts::CORPSE_END; // not ready for use static const int16 MATERIAL_BEGIN = MaterialHead; static const int16 MATERIAL_END = MaterialSecondary; + static const int16 MATERIAL_TINT_END = MaterialFeet; static const int16 MATERIAL_SIZE = _MaterialCount; - static const int16 TINTABLE_BEGIN = MaterialHead; - static const int16 TINTABLE_END = MaterialFeet; - static const int16 TINTABLE_SIZE = 7; - // items // common and container sizes will not increase until the new 'location' struct is implemented static const uint16 ITEM_COMMON_SIZE = Underfoot::consts::ITEM_COMMON_SIZE; @@ -158,6 +149,10 @@ public: static const uint32 BANDOLIERS_COUNT = Titanium::consts::BANDOLIERS_COUNT; // count = number of bandolier instances static const uint32 BANDOLIER_SIZE = Titanium::consts::BANDOLIER_SIZE; // size = number of equipment slots in bandolier instance static const uint32 POTION_BELT_SIZE = Titanium::consts::POTION_BELT_SIZE; + + // legacy-related functions + //static int ServerToPerlSlot(int slot); // encode + //static int PerlToServerSlot(int slot); // decode }; class EQLimits { @@ -204,3 +199,12 @@ public: }; #endif /* EQ_LIMITS_H */ + +/* +Working Notes: +-------------- + +- full review of client_packet.cpp and client translators needed + + +*/ diff --git a/common/patches/Client62.cpp b/common/patches/Client62.cpp index ae8eb7e42..8e45217e5 100644 --- a/common/patches/Client62.cpp +++ b/common/patches/Client62.cpp @@ -103,6 +103,52 @@ const EQClientVersion Strategy::ClientVersion() const #include "SSDefine.h" +/* +// Converts Server Slot IDs to Client62 Slot IDs for use in Encodes +static inline uint32 ServerToClient62Slot(uint32 ServerSlot) { + uint32 Client62Slot; + // reserved +} +*/ +/* +// Converts Client62 Slot IDs to Server Slot IDs for use in Decodes +static inline uint32 Client62ToServerSlot(uint32 Client62Slot) { + uint32 ServerSlot; + // reserved +} +*/ +/* +// Converts Server Corpse Slot IDs to Client62 Corpse Slot IDs for use in Encodes +static inline uint32 ServerToClient62CorpseSlot(uint32 ServerCorpse) { + uint32 Client62Corpse; + // reserved +} +*/ +/* +// Converts Client62 Corpse Slot IDs to Server Corpse Slot IDs for use in Decodes +static inline uint32 Client62ToServerCorpseSlot(uint32 Client62Corpse) { + uint32 ServerCorpse; + // reserved +} +*/ +/* +static inline uint32 RemovePowerSourceBit(uint32 slots) { // shouldn't need to add one..just grab the actual server reference, if so... + static const uint32 BIT21 = 1 << 21; + static const uint32 BIT22 = 1 << 22; + static const uint32 KEEPBITS = ~(BIT21 | BIT22); + + bool wearammo = slots & BIT22; + + slots &= KEEPBITS; + + if (wearammo) + slots |= BIT21; + + return slots; +} +*/ + + EAT_ENCODE(OP_ZoneServerReady) EAT_ENCODE(OP_GuildMemberLevelUpdate) diff --git a/common/patches/Client62_constants.h b/common/patches/Client62_constants.h index 6655bcd0c..e8eb38faa 100644 --- a/common/patches/Client62_constants.h +++ b/common/patches/Client62_constants.h @@ -126,9 +126,6 @@ namespace Client62 { static const uint16 MAP_KRONO_SIZE = NOT_USED; static const uint16 MAP_OTHER_SIZE = 0; - static const int16 POSSESSIONS_BEGIN = slots::MainCharm; - static const int16 POSSESSIONS_END = slots::MainCursor; - static const int16 EQUIPMENT_BEGIN = slots::MainCharm; static const int16 EQUIPMENT_END = slots::MainAmmo; static const uint16 EQUIPMENT_SIZE = slots::_MainEquipmentCount; @@ -159,7 +156,7 @@ namespace Client62 { static const int16 TRADE_BEGIN = 3000; static const int16 TRADE_END = 3007; - static const int16 TRADE_END_NPC = 3003; + static const int16 TRADE_NPC_END = 3003; static const int16 TRADE_BAGS_BEGIN = 3031; static const int16 TRADE_BAGS_END_OFFSET = 79; static const int16 TRADE_BAGS_END = TRADE_BAGS_BEGIN + TRADE_BAGS_END_OFFSET; diff --git a/common/patches/RoF.cpp b/common/patches/RoF.cpp index d51a0cea6..7fcce53b2 100644 --- a/common/patches/RoF.cpp +++ b/common/patches/RoF.cpp @@ -107,125 +107,123 @@ const EQClientVersion Strategy::ClientVersion() const #include "SSDefine.h" -// Converts Titanium Slot IDs to RoF Slot IDs for use in Encodes -static inline structs::ItemSlotStruct TitaniumToRoFSlot(uint32 TitaniumSlot) -{ + +// Converts Server Slot IDs to RoF Slot IDs for use in Encodes +static inline structs::ItemSlotStruct ServerToRoFSlot(uint32 ServerSlot) { structs::ItemSlotStruct RoFSlot; - RoFSlot.SlotType = 0xffff; - RoFSlot.Unknown02 = 0; - RoFSlot.MainSlot = 0xffff; - RoFSlot.SubSlot = 0xffff; - RoFSlot.AugSlot = 0xffff; - RoFSlot.Unknown01 = 0; + RoFSlot.SlotType = INVALID_INDEX; + RoFSlot.Unknown02 = NOT_USED; + RoFSlot.MainSlot = INVALID_INDEX; + RoFSlot.SubSlot = INVALID_INDEX; + RoFSlot.AugSlot = INVALID_INDEX; + RoFSlot.Unknown01 = NOT_USED; + uint32 TempSlot = 0; - if (TitaniumSlot < 56 || TitaniumSlot == 9999) // Main Inventory and Cursor - { - RoFSlot.SlotType = 0; - RoFSlot.MainSlot = TitaniumSlot; - if (TitaniumSlot == 9999) - { - RoFSlot.MainSlot = 21; - } - else if (TitaniumSlot >= 30) // Cursor and Extended Corpse Inventory - { + if (ServerSlot < 56 || ServerSlot == MainPowerSource) { // Main Inventory and Cursor + RoFSlot.SlotType = maps::MapPossessions; + RoFSlot.MainSlot = ServerSlot; + + if (ServerSlot == MainPowerSource) + RoFSlot.MainSlot = slots::MainPowerSource; + + else if (ServerSlot >= MainCursor) // Cursor and Extended Corpse Inventory RoFSlot.MainSlot += 3; - } - else if (TitaniumSlot > 20) - { + + else if (ServerSlot >= MainAmmo) // (> 20) RoFSlot.MainSlot += 1; + } + + /*else if (ServerSlot < 51) { // Cursor Buffer + RoFSlot.SlotType = maps::MapLimbo; + RoFSlot.MainSlot = ServerSlot - 31; + }*/ + + else if (ServerSlot >= EmuConstants::GENERAL_BAGS_BEGIN && ServerSlot <= EmuConstants::CURSOR_BAG_END) { // (> 250 && < 341) + RoFSlot.SlotType = maps::MapPossessions; + TempSlot = ServerSlot - 1; + RoFSlot.MainSlot = int(TempSlot / EmuConstants::ITEM_CONTAINER_SIZE) - 2; + RoFSlot.SubSlot = TempSlot - ((RoFSlot.MainSlot + 2) * EmuConstants::ITEM_CONTAINER_SIZE); + + if (RoFSlot.MainSlot >= slots::MainGeneral9) // (> 30) + RoFSlot.MainSlot = slots::MainCursor; + } + + else if (ServerSlot >= EmuConstants::TRIBUTE_BEGIN && ServerSlot <= EmuConstants::TRIBUTE_END) { // Tribute + RoFSlot.SlotType = maps::MapTribute; + RoFSlot.MainSlot = ServerSlot - EmuConstants::TRIBUTE_BEGIN; + } + + else if (ServerSlot >= EmuConstants::BANK_BEGIN && ServerSlot <= EmuConstants::BANK_BAGS_END) { + RoFSlot.SlotType = maps::MapBank; + TempSlot = ServerSlot - EmuConstants::BANK_BEGIN; + RoFSlot.MainSlot = TempSlot; + + if (TempSlot > 30) { // (> 30) + RoFSlot.MainSlot = int(TempSlot / EmuConstants::ITEM_CONTAINER_SIZE) - 3; + RoFSlot.SubSlot = TempSlot - ((RoFSlot.MainSlot + 3) * EmuConstants::ITEM_CONTAINER_SIZE); + } + } + + else if (ServerSlot >= EmuConstants::SHARED_BANK_BEGIN && ServerSlot <= EmuConstants::SHARED_BANK_BAGS_END) { + RoFSlot.SlotType = maps::MapSharedBank; + TempSlot = ServerSlot - EmuConstants::SHARED_BANK_BEGIN; + RoFSlot.MainSlot = TempSlot; + + if (TempSlot > 30) { // (> 30) + RoFSlot.MainSlot = int(TempSlot / EmuConstants::ITEM_CONTAINER_SIZE) - 3; + RoFSlot.SubSlot = TempSlot - ((RoFSlot.MainSlot + 3) * EmuConstants::ITEM_CONTAINER_SIZE); + } + } + + else if (ServerSlot >= EmuConstants::TRADE_BEGIN && ServerSlot <= EmuConstants::TRADE_BAGS_END) { + RoFSlot.SlotType = maps::MapTrade; + TempSlot = ServerSlot - EmuConstants::TRADE_BEGIN; + RoFSlot.MainSlot = TempSlot; + + if (TempSlot > 30) { + RoFSlot.MainSlot = int(TempSlot / EmuConstants::ITEM_CONTAINER_SIZE) - 3; + RoFSlot.SubSlot = TempSlot - ((RoFSlot.MainSlot + 3) * EmuConstants::ITEM_CONTAINER_SIZE); } - } - /*else if (TitaniumSlot < 51) // Cursor Buffer - { - RoFSlot.SlotType = 5; - RoFSlot.MainSlot = TitaniumSlot - 31; - }*/ - else if (TitaniumSlot > 250 && TitaniumSlot < 341) - { - RoFSlot.SlotType = 0; - TempSlot = TitaniumSlot - 1; - RoFSlot.MainSlot = int(TempSlot / 10) - 2; - RoFSlot.SubSlot = TempSlot - ((RoFSlot.MainSlot + 2) * 10); - if (RoFSlot.MainSlot > 30) - { - RoFSlot.MainSlot = 33; - } - } - else if (TitaniumSlot > 399 && TitaniumSlot < 405) // Tribute - { - RoFSlot.SlotType = 6; - RoFSlot.MainSlot = TitaniumSlot - 400; - } - else if (TitaniumSlot > 1999 && TitaniumSlot < 2271) - { - RoFSlot.SlotType = 1; - TempSlot = TitaniumSlot - 2000; - RoFSlot.MainSlot = TempSlot; - if (TempSlot > 30) - { - RoFSlot.MainSlot = int(TempSlot / 10) - 3; - RoFSlot.SubSlot = TempSlot - ((RoFSlot.MainSlot + 3) * 10); - } - } - else if (TitaniumSlot > 2499 && TitaniumSlot < 2551) - { - RoFSlot.SlotType = 2; - TempSlot = TitaniumSlot - 2500; - RoFSlot.MainSlot = TempSlot; - if (TempSlot > 30) - { - RoFSlot.MainSlot = int(TempSlot / 10) - 3; - RoFSlot.SubSlot = TempSlot - ((RoFSlot.MainSlot + 3) * 10); - } - } - else if (TitaniumSlot > 2999 && TitaniumSlot < 3180) - { - RoFSlot.SlotType = 3; - TempSlot = TitaniumSlot - 3000; - RoFSlot.MainSlot = TempSlot; - if (TempSlot > 99) - { + /* + // OLD CODE: + if (TempSlot > 99) { if (TempSlot > 100) - { RoFSlot.MainSlot = int((TempSlot - 100) / 10); - } + else - { RoFSlot.MainSlot = 0; - } + RoFSlot.SubSlot = TempSlot - (100 + RoFSlot.MainSlot); } + */ } - else if (TitaniumSlot > 3999 && TitaniumSlot < 4009) - { - RoFSlot.SlotType = 4; - TempSlot = TitaniumSlot - 4000; + + else if (ServerSlot >= EmuConstants::WORLD_BEGIN && ServerSlot <= EmuConstants::WORLD_END) { + RoFSlot.SlotType = maps::MapWorld; + TempSlot = ServerSlot - EmuConstants::WORLD_BEGIN; RoFSlot.MainSlot = TempSlot; } - _log(NET__ERROR, "Convert Titanium Slot %i to RoF Slots: Type %i, Unk2 %i, Main %i, Sub %i, Aug %i, Unk1 %i", TitaniumSlot, RoFSlot.SlotType, RoFSlot.Unknown02, RoFSlot.MainSlot, RoFSlot.SubSlot, RoFSlot.AugSlot, RoFSlot.Unknown01); + _log(NET__ERROR, "Convert Server Slot %i to RoF Slots: Type %i, Unk2 %i, Main %i, Sub %i, Aug %i, Unk1 %i", ServerSlot, RoFSlot.SlotType, RoFSlot.Unknown02, RoFSlot.MainSlot, RoFSlot.SubSlot, RoFSlot.AugSlot, RoFSlot.Unknown01); return RoFSlot; } -static inline uint32 RoFToTitaniumSlot(structs::ItemSlotStruct RoFSlot) -{ - uint32 TitaniumSlot = 0xffffffff; +// Converts RoF Slot IDs to Server Slot IDs for use in Decodes +static inline uint32 RoFToServerSlot(structs::ItemSlotStruct RoFSlot) { + uint32 ServerSlot = INVALID_INDEX; uint32 TempSlot = 0; - if (RoFSlot.SlotType == 0 && RoFSlot.MainSlot < 57) // Worn/Personal Inventory and Cursor (Originally 51) - { - if (RoFSlot.MainSlot == 21) // Power Source - { - TempSlot = 9999; - } - else if (RoFSlot.MainSlot >= 33) // Cursor and Extended Corpse Inventory - { + if (RoFSlot.SlotType == maps::MapPossessions && RoFSlot.MainSlot < 57) { // Worn/Personal Inventory and Cursor (< 51) + if (RoFSlot.MainSlot == slots::MainPowerSource) + TempSlot = MainPowerSource; + + else if (RoFSlot.MainSlot >= slots::MainCursor) // Cursor and Extended Corpse Inventory TempSlot = RoFSlot.MainSlot - 3; - } - /*else if (RoFSlot.MainSlot == 31 || RoFSlot.MainSlot == 32) { // 9th and 10th RoF inventory/corpse slots + + /*else if (RoFSlot.MainSlot == slots::MainGeneral9 || RoFSlot.MainSlot == slots::MainGeneral10) { // 9th and 10th RoF inventory/corpse slots // Need to figure out what to do when we get these // The slot range of 0 - client_max is cross-utilized between player inventory and corpse inventory. @@ -235,171 +233,171 @@ static inline uint32 RoFToTitaniumSlot(structs::ItemSlotStruct RoFSlot) // For now, it's probably best to leave as-is and let this work itself out in the inventory rework. }*/ - else if (RoFSlot.MainSlot >= 22) // Ammo and Main Inventory - { + + else if (RoFSlot.MainSlot >= slots::MainAmmo) // Ammo and Main Inventory TempSlot = RoFSlot.MainSlot - 1; - } - else // Worn Slots - { + + else // Worn Slots TempSlot = RoFSlot.MainSlot; - } - if (RoFSlot.SubSlot >= 0) // Bag Slots - { - TempSlot = ((TempSlot + 3) * 10) + RoFSlot.SubSlot + 1; - } + if (RoFSlot.SubSlot >= SUB_BEGIN) // Bag Slots + TempSlot = ((TempSlot + 3) * EmuConstants::ITEM_CONTAINER_SIZE) + RoFSlot.SubSlot + 1; - TitaniumSlot = TempSlot; + ServerSlot = TempSlot; } - else if (RoFSlot.SlotType == 1) // Bank Slots - { - TempSlot = 2000; - if (RoFSlot.SubSlot >= 0) - { - TempSlot += ((RoFSlot.MainSlot + 3) * 10) + RoFSlot.SubSlot + 1; - } + + else if (RoFSlot.SlotType == maps::MapBank) { + TempSlot = EmuConstants::BANK_BEGIN; + + if (RoFSlot.SubSlot >= SUB_BEGIN) + TempSlot += ((RoFSlot.MainSlot + 3) * EmuConstants::ITEM_CONTAINER_SIZE) + RoFSlot.SubSlot + 1; + else - { TempSlot += RoFSlot.MainSlot; - } - TitaniumSlot = TempSlot; + + ServerSlot = TempSlot; } - else if (RoFSlot.SlotType == 2) // Shared Bank Slots - { - TempSlot = 2500; - if (RoFSlot.SubSlot >= 0) - { - TempSlot += ((RoFSlot.MainSlot + 3) * 10) + RoFSlot.SubSlot + 1; - } + + else if (RoFSlot.SlotType == maps::MapSharedBank) { + TempSlot = EmuConstants::SHARED_BANK_BEGIN; + + if (RoFSlot.SubSlot >= SUB_BEGIN) + TempSlot += ((RoFSlot.MainSlot + 3) * EmuConstants::ITEM_CONTAINER_SIZE) + RoFSlot.SubSlot + 1; + else - { TempSlot += RoFSlot.MainSlot; - } - TitaniumSlot = TempSlot; + + ServerSlot = TempSlot; } - else if (RoFSlot.SlotType == 3) // Trade Slots - { - TempSlot = 3000; - if (RoFSlot.SubSlot >= 0) - { - TempSlot += 100 + (RoFSlot.MainSlot * 10) + RoFSlot.SubSlot; - } + + else if (RoFSlot.SlotType == maps::MapTrade) { + TempSlot = EmuConstants::TRADE_BEGIN; + + if (RoFSlot.SubSlot >= SUB_BEGIN) + TempSlot += ((RoFSlot.MainSlot + 3) * EmuConstants::ITEM_CONTAINER_SIZE) + RoFSlot.SubSlot + 1; + // OLD CODE: + //TempSlot += 100 + (RoFSlot.MainSlot * EmuConstants::ITEM_CONTAINER_SIZE) + RoFSlot.SubSlot; + else - { TempSlot += RoFSlot.MainSlot; - } - TitaniumSlot = TempSlot; + + ServerSlot = TempSlot; } - else if (RoFSlot.SlotType == 4) // Tradeskill Container Slots - { - TempSlot = 4000; - if (RoFSlot.MainSlot >= 0) - { + + else if (RoFSlot.SlotType == maps::MapWorld) { + TempSlot = EmuConstants::WORLD_BEGIN; + + if (RoFSlot.MainSlot >= SUB_BEGIN) TempSlot += RoFSlot.MainSlot; - } - TitaniumSlot = TempSlot; + + ServerSlot = TempSlot; } - /*else if (RoFSlot.SlotType == 5) // Cursor Buffer - { + + /*else if (RoFSlot.SlotType == maps::MapLimbo) { // Cursor Buffer TempSlot = 31; - if (RoFSlot.MainSlot >= 0) - { - TempSlot += RoFSlot.MainSlot; - } - TitaniumSlot = TempSlot; - }*/ - _log(NET__ERROR, "Convert RoF Slots: Type %i, Unk2 %i, Main %i, Sub %i, Aug %i, Unk1 %i to Titanium Slot %i", RoFSlot.SlotType, RoFSlot.Unknown02, RoFSlot.MainSlot, RoFSlot.SubSlot, RoFSlot.AugSlot, RoFSlot.Unknown01, TitaniumSlot); - return TitaniumSlot; + if (RoFSlot.MainSlot >= 0) + TempSlot += RoFSlot.MainSlot; + + ServerSlot = TempSlot; + }*/ + + _log(NET__ERROR, "Convert RoF Slots: Type %i, Unk2 %i, Main %i, Sub %i, Aug %i, Unk1 %i to Server Slot %i", RoFSlot.SlotType, RoFSlot.Unknown02, RoFSlot.MainSlot, RoFSlot.SubSlot, RoFSlot.AugSlot, RoFSlot.Unknown01, ServerSlot); + + return ServerSlot; } -static inline uint32 MainInvRoFToTitaniumSlot(structs::MainInvItemSlotStruct RoFSlot) -{ - uint32 TitaniumSlot = 0xffffffff; +// Converts Server MainInv Slot IDs to RoF MainInv Slot IDs for use in Encodes +static inline structs::MainInvItemSlotStruct ServerToRoFMainInvSlot(uint32 ServerSlot) { + structs::MainInvItemSlotStruct RoFSlot; + RoFSlot.MainSlot = INVALID_INDEX; + RoFSlot.SubSlot = INVALID_INDEX; + RoFSlot.AugSlot = INVALID_INDEX; + RoFSlot.Unknown01 = NOT_USED; + uint32 TempSlot = 0; - if (RoFSlot.MainSlot < 57) // Worn/Personal Inventory and Cursor (Originally 33) - { - if (RoFSlot.MainSlot == 21) - { - TempSlot = 9999; - } - else if (RoFSlot.MainSlot >= 33) // Cursor and Extended Corpse Inventory - { + if (ServerSlot < 56 || ServerSlot == MainPowerSource) { // (< 52) + RoFSlot.MainSlot = ServerSlot; + + if (ServerSlot == MainPowerSource) + RoFSlot.MainSlot = slots::MainPowerSource; + + else if (ServerSlot >= MainCursor) // Cursor and Extended Corpse Inventory + RoFSlot.MainSlot += 3; + + else if (ServerSlot >= MainAmmo) // Ammo and Personl Inventory + RoFSlot.MainSlot += 1; + + /*else if (ServerSlot >= MainCursor) { // Cursor + RoFSlot.MainSlot = slots::MainCursor; + + if (ServerSlot > 30) + RoFSlot.SubSlot = (ServerSlot + 3) - 33; + }*/ + } + + else if (ServerSlot >= EmuConstants::GENERAL_BAGS_BEGIN && ServerSlot <= EmuConstants::CURSOR_BAG_END) { + TempSlot = ServerSlot - 1; + RoFSlot.MainSlot = int(TempSlot / EmuConstants::ITEM_CONTAINER_SIZE) - 2; + RoFSlot.SubSlot = TempSlot - ((RoFSlot.MainSlot + 2) * EmuConstants::ITEM_CONTAINER_SIZE); + } + + _log(NET__ERROR, "Convert Server Slot %i to RoF Slots: Main %i, Sub %i, Aug %i, Unk1 %i", ServerSlot, RoFSlot.MainSlot, RoFSlot.SubSlot, RoFSlot.AugSlot, RoFSlot.Unknown01); + + return RoFSlot; +} + +// Converts RoF MainInv Slot IDs to Server MainInv Slot IDs for use in Decodes +static inline uint32 RoFToServerMainInvSlot(structs::MainInvItemSlotStruct RoFSlot) { + uint32 ServerSlot = INVALID_INDEX; + uint32 TempSlot = 0; + + if (RoFSlot.MainSlot < 57) { // Worn/Personal Inventory and Cursor (< 33) + if (RoFSlot.MainSlot == slots::MainPowerSource) + TempSlot = MainPowerSource; + + else if (RoFSlot.MainSlot >= slots::MainCursor) // Cursor and Extended Corpse Inventory TempSlot = RoFSlot.MainSlot - 3; - } - /*else if (RoFSlot.MainSlot == 31 || RoFSlot.MainSlot == 32) { // 9th and 10th RoF inventory slots + + /*else if (RoFSlot.MainSlot == slots::MainGeneral9 || RoFSlot.MainSlot == slots::MainGeneral10) { // 9th and 10th RoF inventory slots // Need to figure out what to do when we get these // Same as above }*/ - else if (RoFSlot.MainSlot >= 22) // Main Inventory and Ammo Slots - { + + else if (RoFSlot.MainSlot >= slots::MainAmmo) // Main Inventory and Ammo Slots TempSlot = RoFSlot.MainSlot - 1; - } + else - { TempSlot = RoFSlot.MainSlot; - } - if (RoFSlot.SubSlot >= 0) // Bag Slots - { - TempSlot = ((TempSlot + 3) * 10) + RoFSlot.SubSlot + 1; - } + if (RoFSlot.SubSlot >= SUB_BEGIN) // Bag Slots + TempSlot = ((TempSlot + 3) * EmuConstants::ITEM_CONTAINER_SIZE) + RoFSlot.SubSlot + 1; - TitaniumSlot = TempSlot; + ServerSlot = TempSlot; } - _log(NET__ERROR, "Convert RoF Slots: Main %i, Sub %i, Aug %i, Unk1 %i to Titanium Slot %i", RoFSlot.MainSlot, RoFSlot.SubSlot, RoFSlot.AugSlot, RoFSlot.Unknown01, TitaniumSlot); + _log(NET__ERROR, "Convert RoF Slots: Main %i, Sub %i, Aug %i, Unk1 %i to Server Slot %i", RoFSlot.MainSlot, RoFSlot.SubSlot, RoFSlot.AugSlot, RoFSlot.Unknown01, ServerSlot); - return TitaniumSlot; + return ServerSlot; } -// Converts Titanium Slot IDs to RoF Slot IDs for use in Encodes -static inline structs::MainInvItemSlotStruct MainInvTitaniumToRoFSlot(uint32 TitaniumSlot) -{ - structs::MainInvItemSlotStruct RoFSlot; - RoFSlot.MainSlot = 0xffff; - RoFSlot.SubSlot = 0xffff; - RoFSlot.AugSlot = 0xffff; - RoFSlot.Unknown01 = 0; - uint32 TempSlot = 0; - - if (TitaniumSlot < 56 || TitaniumSlot == 9999) // (Originally 52) - { - RoFSlot.MainSlot = TitaniumSlot; - if (TitaniumSlot == 9999) - { - RoFSlot.MainSlot = 21; - } - else if (TitaniumSlot > 29) // Cursor and Extended Corpse Inventory - { - RoFSlot.MainSlot += 3; - } - else if(TitaniumSlot > 20) // Ammo and Personl Inventory - { - RoFSlot.MainSlot += 1; - } - /*else if (TitaniumSlot > 29) // Cursor - { - RoFSlot.MainSlot = 33; - if (TitaniumSlot > 30) - { - RoFSlot.SubSlot = (TitaniumSlot + 3) - 33; - } - }*/ - } - else if (TitaniumSlot > 250 && TitaniumSlot < 341) - { - TempSlot = TitaniumSlot - 1; - RoFSlot.MainSlot = int(TempSlot / 10) - 2; - RoFSlot.SubSlot = TempSlot - ((RoFSlot.MainSlot + 2) * 10); - } - - _log(NET__ERROR, "Convert Titanium Slot %i to RoF Slots: Main %i, Sub %i, Aug %i, Unk1 %i", TitaniumSlot, RoFSlot.MainSlot, RoFSlot.SubSlot, RoFSlot.AugSlot, RoFSlot.Unknown01); - - return RoFSlot; +/* +// Converts Server Corpse Slot IDs to RoF Corpse Slot IDs for use in Encodes +static inline uint32 ServerToRoFCorpseSlot(uint32 ServerCorpse) { + uint32 RoFCorpse; + // reserved } +*/ +/* +// Converts RoF Corpse Slot IDs to Server Corpse Slot IDs for use in Decodes +static inline uint32 RoFToServerCorpseSlot(uint32 RoFCorpse) { + uint32 ServerCorpse; + // reserved +} +*/ + ENCODE(OP_TaskHistoryReply) { @@ -2839,7 +2837,7 @@ ENCODE(OP_ShopPlayerSell) { ENCODE_LENGTH_EXACT(Merchant_Purchase_Struct); SETUP_DIRECT_ENCODE(Merchant_Purchase_Struct, structs::Merchant_Purchase_Struct); OUT(npcid); - eq->itemslot = MainInvTitaniumToRoFSlot(emu->itemslot); + eq->itemslot = ServerToRoFMainInvSlot(emu->itemslot); //OUT(itemslot); OUT(quantity); OUT(price); @@ -2849,7 +2847,7 @@ ENCODE(OP_ShopPlayerSell) { ENCODE(OP_ApplyPoison) { ENCODE_LENGTH_EXACT(ApplyPoison_Struct); SETUP_DIRECT_ENCODE(ApplyPoison_Struct, structs::ApplyPoison_Struct); - eq->inventorySlot = MainInvTitaniumToRoFSlot(emu->inventorySlot); + eq->inventorySlot = ServerToRoFMainInvSlot(emu->inventorySlot); OUT(success); FINISH_ENCODE(); } @@ -2859,7 +2857,7 @@ ENCODE(OP_RecipeAutoCombine) { SETUP_DIRECT_ENCODE(RecipeAutoCombine_Struct, structs::RecipeAutoCombine_Struct); OUT(object_type); OUT(some_id); - eq->container_slot = TitaniumToRoFSlot(emu->unknown1); + eq->container_slot = ServerToRoFSlot(emu->unknown1); structs::ItemSlotStruct RoFSlot; RoFSlot.SlotType = 8; // Observed RoFSlot.Unknown02 = 0; @@ -2877,8 +2875,8 @@ ENCODE(OP_DeleteItem) { ENCODE_LENGTH_EXACT(DeleteItem_Struct); SETUP_DIRECT_ENCODE(DeleteItem_Struct, structs::DeleteItem_Struct); - eq->from_slot = TitaniumToRoFSlot(emu->from_slot); - eq->to_slot = TitaniumToRoFSlot(emu->to_slot); + eq->from_slot = ServerToRoFSlot(emu->from_slot); + eq->to_slot = ServerToRoFSlot(emu->to_slot); OUT(number_in_stack); FINISH_ENCODE(); @@ -2889,8 +2887,8 @@ ENCODE(OP_MoveItem) { ENCODE_LENGTH_EXACT(MoveItem_Struct); SETUP_DIRECT_ENCODE(MoveItem_Struct, structs::MoveItem_Struct); - eq->from_slot = TitaniumToRoFSlot(emu->from_slot); - eq->to_slot = TitaniumToRoFSlot(emu->to_slot); + eq->from_slot = ServerToRoFSlot(emu->from_slot); + eq->to_slot = ServerToRoFSlot(emu->to_slot); OUT(number_in_stack); FINISH_ENCODE(); } @@ -2899,7 +2897,7 @@ ENCODE(OP_ItemVerifyReply) { ENCODE_LENGTH_EXACT(ItemVerifyReply_Struct); SETUP_DIRECT_ENCODE(ItemVerifyReply_Struct, structs::ItemVerifyReply_Struct); - eq->slot = TitaniumToRoFSlot(emu->slot); + eq->slot = ServerToRoFSlot(emu->slot); OUT(spell); OUT(target); @@ -2983,7 +2981,7 @@ ENCODE(OP_TributeItem) { ENCODE_LENGTH_EXACT(TributeItem_Struct); SETUP_DIRECT_ENCODE(TributeItem_Struct, structs::TributeItem_Struct); - eq->slot = TitaniumToRoFSlot(emu->slot); + eq->slot = ServerToRoFSlot(emu->slot); OUT(quantity); OUT(tribute_master_id); OUT(tribute_points); @@ -3091,7 +3089,7 @@ ENCODE(OP_AdventureMerchantSell) { eq->unknown000 = 1; OUT(npcid); - eq->slot = MainInvTitaniumToRoFSlot(emu->slot); + eq->slot = ServerToRoFMainInvSlot(emu->slot); OUT(charges); OUT(sell_price); @@ -3822,7 +3820,7 @@ ENCODE(OP_CastSpell) OUT(slot); } OUT(spell_id); - eq->inventoryslot = TitaniumToRoFSlot(emu->inventoryslot); + eq->inventoryslot = ServerToRoFSlot(emu->inventoryslot); //OUT(inventoryslot); OUT(target_id); FINISH_ENCODE(); @@ -3878,7 +3876,7 @@ ENCODE(OP_AltCurrencySell) SETUP_DIRECT_ENCODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); OUT(merchant_entity_id); - eq->slot_id = TitaniumToRoFSlot(emu->slot_id); + eq->slot_id = ServerToRoFSlot(emu->slot_id); OUT(charges); OUT(cost); FINISH_ENCODE(); @@ -4090,7 +4088,7 @@ DECODE(OP_AltCurrencySellSelection) DECODE_LENGTH_EXACT(structs::AltCurrencySelectItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySelectItem_Struct, structs::AltCurrencySelectItem_Struct); IN(merchant_entity_id); - emu->slot_id = RoFToTitaniumSlot(eq->slot_id); + emu->slot_id = RoFToServerSlot(eq->slot_id); FINISH_DIRECT_DECODE(); } @@ -4099,7 +4097,7 @@ DECODE(OP_AltCurrencySell) DECODE_LENGTH_EXACT(structs::AltCurrencySellItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); IN(merchant_entity_id); - emu->slot_id = RoFToTitaniumSlot(eq->slot_id); + emu->slot_id = RoFToServerSlot(eq->slot_id); IN(charges); IN(cost); FINISH_DIRECT_DECODE(); @@ -4209,7 +4207,7 @@ DECODE(OP_AdventureMerchantSell) { SETUP_DIRECT_DECODE(Adventure_Sell_Struct, structs::Adventure_Sell_Struct); IN(npcid); - emu->slot = MainInvRoFToTitaniumSlot(eq->slot); + emu->slot = RoFToServerMainInvSlot(eq->slot); IN(charges); IN(sell_price); @@ -4221,7 +4219,7 @@ DECODE(OP_ApplyPoison) { DECODE_LENGTH_EXACT(structs::ApplyPoison_Struct); SETUP_DIRECT_DECODE(ApplyPoison_Struct, structs::ApplyPoison_Struct); - emu->inventorySlot = MainInvRoFToTitaniumSlot(eq->inventorySlot); + emu->inventorySlot = RoFToServerMainInvSlot(eq->inventorySlot); IN(success); FINISH_DIRECT_DECODE(); @@ -4231,7 +4229,7 @@ DECODE(OP_ItemVerifyRequest) { DECODE_LENGTH_EXACT(structs::ItemVerifyRequest_Struct); SETUP_DIRECT_DECODE(ItemVerifyRequest_Struct, structs::ItemVerifyRequest_Struct); - emu->slot = RoFToTitaniumSlot(eq->slot); + emu->slot = RoFToServerSlot(eq->slot); IN(target); FINISH_DIRECT_DECODE(); @@ -4241,7 +4239,7 @@ DECODE(OP_Consume) { DECODE_LENGTH_EXACT(structs::Consume_Struct); SETUP_DIRECT_DECODE(Consume_Struct, structs::Consume_Struct); - emu->slot = RoFToTitaniumSlot(eq->slot); + emu->slot = RoFToServerSlot(eq->slot); IN(auto_consumed); IN(type); @@ -4261,7 +4259,7 @@ DECODE(OP_CastSpell) { IN(slot); } IN(spell_id); - emu->inventoryslot = RoFToTitaniumSlot(eq->inventoryslot); + emu->inventoryslot = RoFToServerSlot(eq->inventoryslot); //IN(inventoryslot); IN(target_id); @@ -4273,8 +4271,8 @@ DECODE(OP_DeleteItem) DECODE_LENGTH_EXACT(structs::DeleteItem_Struct); SETUP_DIRECT_DECODE(DeleteItem_Struct, structs::DeleteItem_Struct); - emu->from_slot = RoFToTitaniumSlot(eq->from_slot); - emu->to_slot = RoFToTitaniumSlot(eq->to_slot); + emu->from_slot = RoFToServerSlot(eq->from_slot); + emu->to_slot = RoFToServerSlot(eq->to_slot); IN(number_in_stack); FINISH_DIRECT_DECODE(); @@ -4287,8 +4285,8 @@ DECODE(OP_MoveItem) //_log(NET__ERROR, "Moved item from %u to %u", eq->from_slot.MainSlot, eq->to_slot.MainSlot); _log(NET__ERROR, "MoveItem SlotType from %i to %i, MainSlot from %i to %i, SubSlot from %i to %i, AugSlot from %i to %i, Unknown01 from %i to %i, Number %u", eq->from_slot.SlotType, eq->to_slot.SlotType, eq->from_slot.MainSlot, eq->to_slot.MainSlot, eq->from_slot.SubSlot, eq->to_slot.SubSlot, eq->from_slot.AugSlot, eq->to_slot.AugSlot, eq->from_slot.Unknown01, eq->to_slot.Unknown01, eq->number_in_stack); - emu->from_slot = RoFToTitaniumSlot(eq->from_slot); - emu->to_slot = RoFToTitaniumSlot(eq->to_slot); + emu->from_slot = RoFToServerSlot(eq->from_slot); + emu->to_slot = RoFToServerSlot(eq->to_slot); IN(number_in_stack); _hex(NET__ERROR, eq, sizeof(structs::MoveItem_Struct)); @@ -4514,7 +4512,7 @@ DECODE(OP_ShopPlayerSell) { SETUP_DIRECT_DECODE(Merchant_Purchase_Struct, structs::Merchant_Purchase_Struct); IN(npcid); - emu->itemslot = MainInvRoFToTitaniumSlot(eq->itemslot); + emu->itemslot = RoFToServerMainInvSlot(eq->itemslot); //IN(itemslot); IN(quantity); IN(price); @@ -4611,7 +4609,7 @@ DECODE(OP_TributeItem) { DECODE_LENGTH_EXACT(structs::TributeItem_Struct); SETUP_DIRECT_DECODE(TributeItem_Struct, structs::TributeItem_Struct); - emu->slot = RoFToTitaniumSlot(eq->slot); + emu->slot = RoFToServerSlot(eq->slot); IN(quantity); IN(tribute_master_id); IN(tribute_points); @@ -4635,9 +4633,9 @@ DECODE(OP_TradeSkillCombine) { DECODE_LENGTH_EXACT(structs::NewCombine_Struct); SETUP_DIRECT_DECODE(NewCombine_Struct, structs::NewCombine_Struct); - int16 slot_id = RoFToTitaniumSlot(eq->container_slot); + int16 slot_id = RoFToServerSlot(eq->container_slot); if (slot_id == 4000) { - slot_id = SLOT_TRADESKILL; // 1000 + slot_id = legacy::SLOT_TRADESKILL; // 1000 } emu->container_slot = slot_id; @@ -4650,7 +4648,7 @@ DECODE(OP_RecipeAutoCombine) { IN(object_type); IN(some_id); - emu->unknown1 = RoFToTitaniumSlot(eq->container_slot); + emu->unknown1 = RoFToServerSlot(eq->container_slot); IN(recipe_id); IN(reply_code); @@ -4661,7 +4659,7 @@ DECODE(OP_AugmentItem) { DECODE_LENGTH_EXACT(structs::AugmentItem_Struct); SETUP_DIRECT_DECODE(AugmentItem_Struct, structs::AugmentItem_Struct); - emu->container_slot = RoFToTitaniumSlot(eq->container_slot); + emu->container_slot = RoFToServerSlot(eq->container_slot); //emu->augment_slot = eq->augment_slot; FINISH_DIRECT_DECODE(); @@ -4872,7 +4870,7 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint hdr.stacksize = stackable ? charges : 1; hdr.unknown004 = 0; - structs::ItemSlotStruct slot_id = TitaniumToRoFSlot(slot_id_in); + structs::ItemSlotStruct slot_id = ServerToRoFSlot(slot_id_in); hdr.slot_type = (merchant_slot == 0) ? slot_id.SlotType : 9; // 9 is merchant 20 is reclaim items? hdr.main_slot = (merchant_slot == 0) ? slot_id.MainSlot : merchant_slot; @@ -5074,7 +5072,7 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint isbs.augrestrict = item->AugRestrict; - for(int x = 0; x < 5; ++x) + for(int x = AUG_BEGIN; x < EmuConstants::ITEM_COMMON_SIZE; ++x) { isbs.augslots[x].type = item->AugSlotType[x]; isbs.augslots[x].visible = item->AugSlotVisible[x]; @@ -5326,11 +5324,11 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint iqbs.subitem_count = 0; - char *SubSerializations[10]; + char *SubSerializations[10]; // uint32 SubLengths[10]; - for(int x = 0; x < 10; ++x) { + for(int x = SUB_BEGIN; x < EmuConstants::ITEM_CONTAINER_SIZE; ++x) { SubSerializations[x] = nullptr; @@ -5342,22 +5340,30 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint iqbs.subitem_count++; - if(slot_id_in >= 22 && slot_id_in < 30) - SubSlotNumber = (((slot_id_in + 3) * 10) + x + 1); - else if(slot_id_in >= 2000 && slot_id_in <= 2023) - SubSlotNumber = (((slot_id_in - 2000) * 10) + 2030 + x + 1); - else if(slot_id_in >= 2500 && slot_id_in <= 2501) - SubSlotNumber = (((slot_id_in - 2500) * 10) + 2530 + x + 1); + if(slot_id_in >= EmuConstants::GENERAL_BEGIN && slot_id_in <= EmuConstants::GENERAL_END) // (< 30) - no cursor? + //SubSlotNumber = (((slot_id_in + 3) * 10) + x + 1); + SubSlotNumber = (((slot_id_in + 3) * EmuConstants::ITEM_CONTAINER_SIZE) + x + 1); + else if(slot_id_in >= EmuConstants::BANK_BEGIN && slot_id_in <= EmuConstants::BANK_END) + //SubSlotNumber = (((slot_id_in - 2000) * 10) + 2030 + x + 1); + SubSlotNumber = (((slot_id_in - EmuConstants::BANK_BEGIN) * EmuConstants::ITEM_CONTAINER_SIZE) + EmuConstants::BANK_BAGS_BEGIN + x); + else if(slot_id_in >= EmuConstants::SHARED_BANK_BEGIN && slot_id_in <= EmuConstants::SHARED_BANK_END) + //SubSlotNumber = (((slot_id_in - 2500) * 10) + 2530 + x + 1); + SubSlotNumber = (((slot_id_in - EmuConstants::SHARED_BANK_BEGIN) * EmuConstants::ITEM_CONTAINER_SIZE) + EmuConstants::SHARED_BANK_BAGS_BEGIN + x); else SubSlotNumber = slot_id_in; // ??????? + /* + // TEST CODE: + SubSlotNumber = Inventory::CalcSlotID(slot_id_in, x); + */ + SubSerializations[x] = SerializeItem(subitem, SubSlotNumber, &SubLengths[x], depth + 1); } } ss.write((const char*)&iqbs, sizeof(RoF::structs::ItemQuaternaryBodyStruct)); - for(int x = 0; x < 10; ++x) { + for(int x = SUB_BEGIN; x < EmuConstants::ITEM_CONTAINER_SIZE; ++x) { if(SubSerializations[x]) { diff --git a/common/patches/RoF_constants.h b/common/patches/RoF_constants.h index 075ca3b0d..7be8baf72 100644 --- a/common/patches/RoF_constants.h +++ b/common/patches/RoF_constants.h @@ -130,9 +130,6 @@ namespace RoF { // most of these definitions will go away with the structure-based system..this maintains compatibility for now // (bag slots and main slots beyond Possessions are assigned for compatibility with current server coding) - static const int16 POSSESSIONS_BEGIN = slots::MainCharm; - static const int16 POSSESSIONS_END = slots::MainCursor; - static const int16 EQUIPMENT_BEGIN = slots::MainCharm; static const int16 EQUIPMENT_END = slots::MainAmmo; static const uint16 EQUIPMENT_SIZE = slots::_MainEquipmentCount; @@ -163,7 +160,7 @@ namespace RoF { static const int16 TRADE_BEGIN = 3000; static const int16 TRADE_END = 3007; - static const int16 TRADE_END_NPC = 3003; + static const int16 TRADE_NPC_END = 3003; static const int16 TRADE_BAGS_BEGIN = 3031; static const int16 TRADE_BAGS_END_OFFSET = 79; static const int16 TRADE_BAGS_END = TRADE_BAGS_BEGIN + TRADE_BAGS_END_OFFSET; diff --git a/common/patches/SoD.cpp b/common/patches/SoD.cpp index 08a3401ad..dcc95ec75 100644 --- a/common/patches/SoD.cpp +++ b/common/patches/SoD.cpp @@ -108,70 +108,71 @@ const EQClientVersion Strategy::ClientVersion() const #include "SSDefine.h" -// Converts Titanium Slot IDs to SoD Slot IDs for use in Encodes -static inline uint32 TitaniumToSoDSlot(uint32 TitaniumSlot) { +// Converts Server Slot IDs to SoD Slot IDs for use in Encodes +static inline uint32 ServerToSoDSlot(uint32 ServerSlot) { uint32 SoDSlot = 0; - if(TitaniumSlot >= 21 && TitaniumSlot <= 53) // Cursor/Ammo/Power Source and Normal Inventory Slots - { - SoDSlot = TitaniumSlot + 1; - } - else if(TitaniumSlot >= 251 && TitaniumSlot <= 340) // Bag Slots for Normal Inventory and Cursor - { - SoDSlot = TitaniumSlot + 11; - } - else if(TitaniumSlot >= 2031 && TitaniumSlot <= 2270) // Bank Bag Slots - { - SoDSlot = TitaniumSlot + 1; - } - else if(TitaniumSlot >= 2531 && TitaniumSlot <= 2550) // Shared Bank Bag Slots - { - SoDSlot = TitaniumSlot + 1; - } - else if(TitaniumSlot == 9999) //Unused slot ID to give a place to save Power Slot - { - SoDSlot = 21; - } + if (ServerSlot >= MainAmmo && ServerSlot <= 53) // Cursor/Ammo/Power Source and Normal Inventory Slots + SoDSlot = ServerSlot + 1; + + else if (ServerSlot >= EmuConstants::GENERAL_BAGS_BEGIN && ServerSlot <= EmuConstants::CURSOR_BAG_END) + SoDSlot = ServerSlot + 11; + + else if (ServerSlot >= EmuConstants::BANK_BAGS_BEGIN && ServerSlot <= EmuConstants::BANK_BAGS_END) + SoDSlot = ServerSlot + 1; + + else if (ServerSlot >= EmuConstants::SHARED_BANK_BAGS_BEGIN && ServerSlot <= EmuConstants::SHARED_BANK_BAGS_END) + SoDSlot = ServerSlot + 1; + + else if (ServerSlot == MainPowerSource) + SoDSlot = slots::MainPowerSource; + else - { - SoDSlot = TitaniumSlot; - } + SoDSlot = ServerSlot; return SoDSlot; } -// Converts SoD Slot IDs to Titanium Slot IDs for use in Decodes -static inline uint32 SoDToTitaniumSlot(uint32 SoDSlot) { - uint32 TitaniumSlot = 0; +// Converts SoD Slot IDs to Server Slot IDs for use in Decodes +static inline uint32 SoDToServerSlot(uint32 SoDSlot) { + uint32 ServerSlot = 0; - if(SoDSlot >= 22 && SoDSlot <= 54) // Cursor/Ammo/Power Source and Normal Inventory Slots - { - TitaniumSlot = SoDSlot - 1; - } - else if(SoDSlot >= 262 && SoDSlot <= 351) // Bag Slots for Normal Inventory and Cursor - { - TitaniumSlot = SoDSlot - 11; - } - else if(SoDSlot >= 2032 && SoDSlot <= 2271) // Bank Bag Slots - { - TitaniumSlot = SoDSlot - 1; - } - else if(SoDSlot >= 2532 && SoDSlot <= 2551) // Shared Bank Bag Slots - { - TitaniumSlot = SoDSlot - 1; - } - else if(SoDSlot == 21) - { - TitaniumSlot = 9999; //Unused slot ID to give a place to save Power Slot - } + if(SoDSlot >= slots::MainAmmo && SoDSlot <= consts::CORPSE_END) // Cursor/Ammo/Power Source and Normal Inventory Slots + ServerSlot = SoDSlot - 1; + + else if(SoDSlot >= consts::GENERAL_BAGS_BEGIN && SoDSlot <= consts::CURSOR_BAG_END) + ServerSlot = SoDSlot - 11; + + else if(SoDSlot >= consts::BANK_BAGS_BEGIN && SoDSlot <= consts::BANK_BAGS_END) + ServerSlot = SoDSlot - 1; + + else if(SoDSlot >= consts::SHARED_BANK_BAGS_BEGIN && SoDSlot <= consts::SHARED_BANK_BAGS_END) + ServerSlot = SoDSlot - 1; + + else if(SoDSlot == slots::MainPowerSource) + ServerSlot = MainPowerSource; + else - { - TitaniumSlot = SoDSlot; - } + ServerSlot = SoDSlot; - return TitaniumSlot; + return ServerSlot; } +/* +// Converts Server Corpse Slot IDs to SoD Corpse Slot IDs for use in Encodes +static inline uint32 ServerToSoDCorpseSlot(uint32 ServerCorpse) { + uint32 SoDCorpse; + // reserved +} +*/ +/* +// Converts SoD Corpse Slot IDs to Server Corpse Slot IDs for use in Decodes +static inline uint32 SoDToServerCorpseSlot(uint32 SoDCorpse) { + uint32 ServerCorpse; + // reserved +} +*/ + ENCODE(OP_OpenNewTasksWindow) { @@ -1838,7 +1839,7 @@ ENCODE(OP_ShopPlayerSell) { ENCODE_LENGTH_EXACT(Merchant_Purchase_Struct); SETUP_DIRECT_ENCODE(Merchant_Purchase_Struct, structs::Merchant_Purchase_Struct); OUT(npcid); - eq->itemslot = TitaniumToSoDSlot(emu->itemslot); + eq->itemslot = ServerToSoDSlot(emu->itemslot); OUT(quantity); OUT(price); FINISH_ENCODE(); @@ -1847,7 +1848,7 @@ ENCODE(OP_ShopPlayerSell) { ENCODE(OP_ApplyPoison) { ENCODE_LENGTH_EXACT(ApplyPoison_Struct); SETUP_DIRECT_ENCODE(ApplyPoison_Struct, structs::ApplyPoison_Struct); - eq->inventorySlot = TitaniumToSoDSlot(emu->inventorySlot); + eq->inventorySlot = ServerToSoDSlot(emu->inventorySlot); OUT(success); FINISH_ENCODE(); } @@ -1856,8 +1857,8 @@ ENCODE(OP_DeleteItem) { ENCODE_LENGTH_EXACT(DeleteItem_Struct); SETUP_DIRECT_ENCODE(DeleteItem_Struct, structs::DeleteItem_Struct); - eq->from_slot = TitaniumToSoDSlot(emu->from_slot); - eq->to_slot = TitaniumToSoDSlot(emu->to_slot); + eq->from_slot = ServerToSoDSlot(emu->from_slot); + eq->to_slot = ServerToSoDSlot(emu->to_slot); OUT(number_in_stack); FINISH_ENCODE(); @@ -1868,8 +1869,8 @@ ENCODE(OP_MoveItem) { ENCODE_LENGTH_EXACT(MoveItem_Struct); SETUP_DIRECT_ENCODE(MoveItem_Struct, structs::MoveItem_Struct); - eq->from_slot = TitaniumToSoDSlot(emu->from_slot); - eq->to_slot = TitaniumToSoDSlot(emu->to_slot); + eq->from_slot = ServerToSoDSlot(emu->from_slot); + eq->to_slot = ServerToSoDSlot(emu->to_slot); OUT(number_in_stack); FINISH_ENCODE(); @@ -1879,7 +1880,7 @@ ENCODE(OP_ItemVerifyReply) { ENCODE_LENGTH_EXACT(ItemVerifyReply_Struct); SETUP_DIRECT_ENCODE(ItemVerifyReply_Struct, structs::ItemVerifyReply_Struct); - eq->slot = TitaniumToSoDSlot(emu->slot); + eq->slot = ServerToSoDSlot(emu->slot); OUT(spell); OUT(target); @@ -1929,7 +1930,7 @@ ENCODE(OP_TributeItem) { ENCODE_LENGTH_EXACT(TributeItem_Struct); SETUP_DIRECT_ENCODE(TributeItem_Struct, structs::TributeItem_Struct); - eq->slot = TitaniumToSoDSlot(emu->slot); + eq->slot = ServerToSoDSlot(emu->slot); OUT(quantity); OUT(tribute_master_id); OUT(tribute_points); @@ -1976,7 +1977,7 @@ ENCODE(OP_ReadBook) { else eq->window = emu->window; OUT(type); - eq->invslot = TitaniumToSoDSlot(emu->invslot); + eq->invslot = ServerToSoDSlot(emu->invslot); strn0cpy(eq->txtfile, emu->booktext, sizeof(eq->txtfile)); FINISH_ENCODE(); } @@ -2037,7 +2038,7 @@ ENCODE(OP_AdventureMerchantSell) { eq->unknown000 = 1; OUT(npcid); - eq->slot = TitaniumToSoDSlot(emu->slot); + eq->slot = ServerToSoDSlot(emu->slot); OUT(charges); OUT(sell_price); @@ -2568,7 +2569,7 @@ ENCODE(OP_AltCurrencySell) SETUP_DIRECT_ENCODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); OUT(merchant_entity_id); - eq->slot_id = TitaniumToSoDSlot(emu->slot_id); + eq->slot_id = ServerToSoDSlot(emu->slot_id); OUT(charges); OUT(cost); FINISH_ENCODE(); @@ -2622,7 +2623,7 @@ DECODE(OP_AdventureMerchantSell) { SETUP_DIRECT_DECODE(Adventure_Sell_Struct, structs::Adventure_Sell_Struct); IN(npcid); - emu->slot = SoDToTitaniumSlot(eq->slot); + emu->slot = SoDToServerSlot(eq->slot); IN(charges); IN(sell_price); @@ -2634,7 +2635,7 @@ DECODE(OP_ApplyPoison) { DECODE_LENGTH_EXACT(structs::ApplyPoison_Struct); SETUP_DIRECT_DECODE(ApplyPoison_Struct, structs::ApplyPoison_Struct); - emu->inventorySlot = SoDToTitaniumSlot(eq->inventorySlot); + emu->inventorySlot = SoDToServerSlot(eq->inventorySlot); IN(success); FINISH_DIRECT_DECODE(); @@ -2644,7 +2645,7 @@ DECODE(OP_ItemVerifyRequest) { DECODE_LENGTH_EXACT(structs::ItemVerifyRequest_Struct); SETUP_DIRECT_DECODE(ItemVerifyRequest_Struct, structs::ItemVerifyRequest_Struct); - emu->slot = SoDToTitaniumSlot(eq->slot); + emu->slot = SoDToServerSlot(eq->slot); IN(target); FINISH_DIRECT_DECODE(); @@ -2654,7 +2655,7 @@ DECODE(OP_Consume) { DECODE_LENGTH_EXACT(structs::Consume_Struct); SETUP_DIRECT_DECODE(Consume_Struct, structs::Consume_Struct); - emu->slot = SoDToTitaniumSlot(eq->slot); + emu->slot = SoDToServerSlot(eq->slot); IN(auto_consumed); IN(type); @@ -2667,7 +2668,7 @@ DECODE(OP_CastSpell) { IN(slot); IN(spell_id); - emu->inventoryslot = SoDToTitaniumSlot(eq->inventoryslot); + emu->inventoryslot = SoDToServerSlot(eq->inventoryslot); IN(target_id); FINISH_DIRECT_DECODE(); @@ -2678,8 +2679,8 @@ DECODE(OP_DeleteItem) DECODE_LENGTH_EXACT(structs::DeleteItem_Struct); SETUP_DIRECT_DECODE(DeleteItem_Struct, structs::DeleteItem_Struct); - emu->from_slot = SoDToTitaniumSlot(eq->from_slot); - emu->to_slot = SoDToTitaniumSlot(eq->to_slot); + emu->from_slot = SoDToServerSlot(eq->from_slot); + emu->to_slot = SoDToServerSlot(eq->to_slot); IN(number_in_stack); FINISH_DIRECT_DECODE(); @@ -2692,8 +2693,8 @@ DECODE(OP_MoveItem) _log(NET__ERROR, "Moved item from %u to %u", eq->from_slot, eq->to_slot); - emu->from_slot = SoDToTitaniumSlot(eq->from_slot); - emu->to_slot = SoDToTitaniumSlot(eq->to_slot); + emu->from_slot = SoDToServerSlot(eq->from_slot); + emu->to_slot = SoDToServerSlot(eq->to_slot); IN(number_in_stack); FINISH_DIRECT_DECODE(); @@ -2900,7 +2901,7 @@ DECODE(OP_ShopPlayerSell) { SETUP_DIRECT_DECODE(Merchant_Purchase_Struct, structs::Merchant_Purchase_Struct); IN(npcid); - emu->itemslot = SoDToTitaniumSlot(eq->itemslot); + emu->itemslot = SoDToServerSlot(eq->itemslot); IN(quantity); IN(price); @@ -2969,7 +2970,7 @@ DECODE(OP_TributeItem) { DECODE_LENGTH_EXACT(structs::TributeItem_Struct); SETUP_DIRECT_DECODE(TributeItem_Struct, structs::TributeItem_Struct); - emu->slot = SoDToTitaniumSlot(eq->slot); + emu->slot = SoDToServerSlot(eq->slot); IN(quantity); IN(tribute_master_id); IN(tribute_points); @@ -2982,7 +2983,7 @@ DECODE(OP_ReadBook) { SETUP_DIRECT_DECODE(BookRequest_Struct, structs::BookRequest_Struct); IN(type); - emu->invslot = SoDToTitaniumSlot(eq->invslot); + emu->invslot = SoDToServerSlot(eq->invslot); emu->window = (uint8) eq->window; strn0cpy(emu->txtfile, eq->txtfile, sizeof(emu->txtfile)); @@ -2993,7 +2994,7 @@ DECODE(OP_TradeSkillCombine) { DECODE_LENGTH_EXACT(structs::NewCombine_Struct); SETUP_DIRECT_DECODE(NewCombine_Struct, structs::NewCombine_Struct); - emu->container_slot = SoDToTitaniumSlot(eq->container_slot); + emu->container_slot = SoDToServerSlot(eq->container_slot); FINISH_DIRECT_DECODE(); } @@ -3002,7 +3003,7 @@ DECODE(OP_AugmentItem) { DECODE_LENGTH_EXACT(structs::AugmentItem_Struct); SETUP_DIRECT_DECODE(AugmentItem_Struct, structs::AugmentItem_Struct); - emu->container_slot = SoDToTitaniumSlot(eq->container_slot); + emu->container_slot = SoDToServerSlot(eq->container_slot); emu->augment_slot = eq->augment_slot; FINISH_DIRECT_DECODE(); @@ -3077,7 +3078,7 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint hdr.stacksize = stackable ? charges : 1; hdr.unknown004 = 0; - int32 slot_id = TitaniumToSoDSlot(slot_id_in); + int32 slot_id = ServerToSoDSlot(slot_id_in); hdr.slot = (merchant_slot == 0) ? slot_id : merchant_slot; hdr.price = inst->GetPrice(); @@ -3460,11 +3461,11 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint iqbs.subitem_count = 0; - char *SubSerializations[10]; + char *SubSerializations[10]; // uint32 SubLengths[10]; - for(int x = 0; x < 10; ++x) { + for(int x = SUB_BEGIN; x < EmuConstants::ITEM_CONTAINER_SIZE; ++x) { SubSerializations[x] = nullptr; @@ -3476,15 +3477,23 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint iqbs.subitem_count++; - if(slot_id_in >= 22 && slot_id_in < 30) - SubSlotNumber = (((slot_id_in + 3) * 10) + x + 1); - else if(slot_id_in >= 2000 && slot_id_in <= 2023) - SubSlotNumber = (((slot_id_in - 2000) * 10) + 2030 + x + 1); - else if(slot_id_in >= 2500 && slot_id_in <= 2501) - SubSlotNumber = (((slot_id_in - 2500) * 10) + 2530 + x + 1); + if (slot_id_in >= EmuConstants::GENERAL_BEGIN && slot_id_in <= EmuConstants::GENERAL_END) // (< 30) - no cursor? + //SubSlotNumber = (((slot_id_in + 3) * 10) + x + 1); + SubSlotNumber = (((slot_id_in + 3) * EmuConstants::ITEM_CONTAINER_SIZE) + x + 1); + else if (slot_id_in >= EmuConstants::BANK_BEGIN && slot_id_in <= EmuConstants::BANK_END) + //SubSlotNumber = (((slot_id_in - 2000) * 10) + 2030 + x + 1); + SubSlotNumber = (((slot_id_in - EmuConstants::BANK_BEGIN) * EmuConstants::ITEM_CONTAINER_SIZE) + EmuConstants::BANK_BAGS_BEGIN + x); + else if (slot_id_in >= EmuConstants::SHARED_BANK_BEGIN && slot_id_in <= EmuConstants::SHARED_BANK_END) + //SubSlotNumber = (((slot_id_in - 2500) * 10) + 2530 + x + 1); + SubSlotNumber = (((slot_id_in - EmuConstants::SHARED_BANK_BEGIN) * EmuConstants::ITEM_CONTAINER_SIZE) + EmuConstants::SHARED_BANK_BAGS_BEGIN + x); else SubSlotNumber = slot_id_in; // ??????? + /* + // TEST CODE: + SubSlotNumber = Inventory::CalcSlotID(slot_id_in, x); + */ + SubSerializations[x] = SerializeItem(subitem, SubSlotNumber, &SubLengths[x], depth + 1); } } @@ -3534,7 +3543,7 @@ DECODE(OP_AltCurrencySellSelection) DECODE_LENGTH_EXACT(structs::AltCurrencySelectItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySelectItem_Struct, structs::AltCurrencySelectItem_Struct); IN(merchant_entity_id); - emu->slot_id = SoDToTitaniumSlot(eq->slot_id); + emu->slot_id = SoDToServerSlot(eq->slot_id); FINISH_DIRECT_DECODE(); } @@ -3543,7 +3552,7 @@ DECODE(OP_AltCurrencySell) DECODE_LENGTH_EXACT(structs::AltCurrencySellItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); IN(merchant_entity_id); - emu->slot_id = SoDToTitaniumSlot(eq->slot_id); + emu->slot_id = SoDToServerSlot(eq->slot_id); IN(charges); IN(cost); FINISH_DIRECT_DECODE(); diff --git a/common/patches/SoD_constants.h b/common/patches/SoD_constants.h index 0b0120cd8..76427d55e 100644 --- a/common/patches/SoD_constants.h +++ b/common/patches/SoD_constants.h @@ -127,9 +127,6 @@ namespace SoD { static const uint16 MAP_KRONO_SIZE = NOT_USED; static const uint16 MAP_OTHER_SIZE = 0; - static const int16 POSSESSIONS_BEGIN = slots::MainCharm; - static const int16 POSSESSIONS_END = slots::MainCursor; - static const int16 EQUIPMENT_BEGIN = slots::MainCharm; static const int16 EQUIPMENT_END = slots::MainAmmo; static const uint16 EQUIPMENT_SIZE = slots::_MainEquipmentCount; @@ -160,8 +157,8 @@ namespace SoD { static const int16 TRADE_BEGIN = 3000; static const int16 TRADE_END = 3007; - static const int16 TRADE_END_NPC = 3003; - static const int16 TRADE_BAGS_BEGIN = 3031; // no change from Ti? + static const int16 TRADE_NPC_END = 3003; + static const int16 TRADE_BAGS_BEGIN = 3031; static const int16 TRADE_BAGS_END_OFFSET = 79; static const int16 TRADE_BAGS_END = TRADE_BAGS_BEGIN + TRADE_BAGS_END_OFFSET; diff --git a/common/patches/SoF.cpp b/common/patches/SoF.cpp index 96b1f223e..d607ff472 100644 --- a/common/patches/SoF.cpp +++ b/common/patches/SoF.cpp @@ -107,70 +107,72 @@ const EQClientVersion Strategy::ClientVersion() const #include "SSDefine.h" -// Converts Titanium Slot IDs to SoF Slot IDs for use in Encodes -static inline uint32 TitaniumToSoFSlot(uint32 TitaniumSlot) { +// Converts Server Slot IDs to SoF Slot IDs for use in Encodes +static inline uint32 ServerToSoFSlot(uint32 ServerSlot) { uint32 SoFSlot = 0; - if(TitaniumSlot >= 21 && TitaniumSlot <= 53) // Cursor/Ammo/Power Source and Normal Inventory Slots - { - SoFSlot = TitaniumSlot + 1; - } - else if(TitaniumSlot >= 251 && TitaniumSlot <= 340) // Bag Slots for Normal Inventory and Cursor - { - SoFSlot = TitaniumSlot + 11; - } - else if(TitaniumSlot >= 2031 && TitaniumSlot <= 2270) // Bank Bag Slots - { - SoFSlot = TitaniumSlot + 1; - } - else if(TitaniumSlot >= 2531 && TitaniumSlot <= 2550) // Shared Bank Bag Slots - { - SoFSlot = TitaniumSlot + 1; - } - else if(TitaniumSlot == 9999) //Unused slot ID to give a place to save Power Slot - { - SoFSlot = 21; - } + if (ServerSlot >= MainAmmo && ServerSlot <= 53) // Cursor/Ammo/Power Source and Normal Inventory Slots + SoFSlot = ServerSlot + 1; + + else if (ServerSlot >= EmuConstants::GENERAL_BAGS_BEGIN && ServerSlot <= EmuConstants::CURSOR_BAG_END) + SoFSlot = ServerSlot + 11; + + else if (ServerSlot >= EmuConstants::BANK_BAGS_BEGIN && ServerSlot <= EmuConstants::BANK_BAGS_END) + SoFSlot = ServerSlot + 1; + + else if (ServerSlot >= EmuConstants::SHARED_BANK_BAGS_BEGIN && ServerSlot <= EmuConstants::SHARED_BANK_BAGS_END) + SoFSlot = ServerSlot + 1; + + else if (ServerSlot == MainPowerSource) + SoFSlot = slots::MainPowerSource; + else - { - SoFSlot = TitaniumSlot; - } + SoFSlot = ServerSlot; return SoFSlot; } -// Converts Sof Slot IDs to Titanium Slot IDs for use in Decodes -static inline uint32 SoFToTitaniumSlot(uint32 SoFSlot) { - uint32 TitaniumSlot = 0; +// Converts SoF Slot IDs to Server Slot IDs for use in Decodes +static inline uint32 SoFToServerSlot(uint32 SoFSlot) { + uint32 ServerSlot = 0; - if(SoFSlot >= 22 && SoFSlot <= 54) // Cursor/Ammo/Power Source and Normal Inventory Slots - { - TitaniumSlot = SoFSlot - 1; - } - else if(SoFSlot >= 262 && SoFSlot <= 351) // Bag Slots for Normal Inventory and Cursor - { - TitaniumSlot = SoFSlot - 11; - } - else if(SoFSlot >= 2032 && SoFSlot <= 2271) // Bank Bag Slots - { - TitaniumSlot = SoFSlot - 1; - } - else if(SoFSlot >= 2532 && SoFSlot <= 2551) // Shared Bank Bag Slots - { - TitaniumSlot = SoFSlot - 1; - } - else if(SoFSlot == 21) - { - TitaniumSlot = 9999; //Unused slot ID to give a place to save Power Slot - } + if(SoFSlot >= slots::MainAmmo && SoFSlot <= consts::CORPSE_END) // Cursor/Ammo/Power Source and Normal Inventory Slots + ServerSlot = SoFSlot - 1; + + else if(SoFSlot >= consts::GENERAL_BAGS_BEGIN && SoFSlot <= consts::CURSOR_BAG_END) + ServerSlot = SoFSlot - 11; + + else if(SoFSlot >= consts::BANK_BAGS_BEGIN && SoFSlot <= consts::BANK_BAGS_END) + ServerSlot = SoFSlot - 1; + + else if(SoFSlot >= consts::SHARED_BANK_BAGS_BEGIN && SoFSlot <= consts::SHARED_BANK_BAGS_END) + ServerSlot = SoFSlot - 1; + + else if(SoFSlot == slots::MainPowerSource) + ServerSlot = MainPowerSource; + else - { - TitaniumSlot = SoFSlot; - } + ServerSlot = SoFSlot; + - return TitaniumSlot; + return ServerSlot; } +/* +// Converts Server Corpse Slot IDs to SoF Corpse Slot IDs for use in Encodes +static inline uint32 ServerToSoFCorpseSlot(uint32 ServerCorpse) { + uint32 SoFCorpse; + // reserved +} +*/ +/* +// Converts SoF Corpse Slot IDs to Server Corpse Slot IDs for use in Decodes +static inline uint32 SoFToServerCorpseSlot(uint32 SoFCorpse) { + uint32 ServerCorpse; + // reserved +} +*/ + ENCODE(OP_OpenNewTasksWindow) { @@ -1421,7 +1423,7 @@ ENCODE(OP_ShopPlayerSell) { ENCODE_LENGTH_EXACT(Merchant_Purchase_Struct); SETUP_DIRECT_ENCODE(Merchant_Purchase_Struct, structs::Merchant_Purchase_Struct); OUT(npcid); - eq->itemslot = TitaniumToSoFSlot(emu->itemslot); + eq->itemslot = ServerToSoFSlot(emu->itemslot); OUT(quantity); OUT(price); FINISH_ENCODE(); @@ -1430,7 +1432,7 @@ ENCODE(OP_ShopPlayerSell) { ENCODE(OP_ApplyPoison) { ENCODE_LENGTH_EXACT(ApplyPoison_Struct); SETUP_DIRECT_ENCODE(ApplyPoison_Struct, structs::ApplyPoison_Struct); - eq->inventorySlot = TitaniumToSoFSlot(emu->inventorySlot); + eq->inventorySlot = ServerToSoFSlot(emu->inventorySlot); OUT(success); FINISH_ENCODE(); } @@ -1439,8 +1441,8 @@ ENCODE(OP_DeleteItem) { ENCODE_LENGTH_EXACT(DeleteItem_Struct); SETUP_DIRECT_ENCODE(DeleteItem_Struct, structs::DeleteItem_Struct); - eq->from_slot = TitaniumToSoFSlot(emu->from_slot); - eq->to_slot = TitaniumToSoFSlot(emu->to_slot); + eq->from_slot = ServerToSoFSlot(emu->from_slot); + eq->to_slot = ServerToSoFSlot(emu->to_slot); OUT(number_in_stack); FINISH_ENCODE(); @@ -1451,8 +1453,8 @@ ENCODE(OP_MoveItem) { ENCODE_LENGTH_EXACT(MoveItem_Struct); SETUP_DIRECT_ENCODE(MoveItem_Struct, structs::MoveItem_Struct); - eq->from_slot = TitaniumToSoFSlot(emu->from_slot); - eq->to_slot = TitaniumToSoFSlot(emu->to_slot); + eq->from_slot = ServerToSoFSlot(emu->from_slot); + eq->to_slot = ServerToSoFSlot(emu->to_slot); OUT(number_in_stack); FINISH_ENCODE(); @@ -1462,7 +1464,7 @@ ENCODE(OP_ItemVerifyReply) { ENCODE_LENGTH_EXACT(ItemVerifyReply_Struct); SETUP_DIRECT_ENCODE(ItemVerifyReply_Struct, structs::ItemVerifyReply_Struct); - eq->slot = TitaniumToSoFSlot(emu->slot); + eq->slot = ServerToSoFSlot(emu->slot); OUT(spell); OUT(target); @@ -1566,7 +1568,7 @@ ENCODE(OP_TributeItem) { ENCODE_LENGTH_EXACT(TributeItem_Struct); SETUP_DIRECT_ENCODE(TributeItem_Struct, structs::TributeItem_Struct); - eq->slot = TitaniumToSoFSlot(emu->slot); + eq->slot = ServerToSoFSlot(emu->slot); OUT(quantity); OUT(tribute_master_id); OUT(tribute_points); @@ -1613,7 +1615,7 @@ ENCODE(OP_ReadBook) { else eq->window = emu->window; OUT(type); - eq->invslot = TitaniumToSoFSlot(emu->invslot); + eq->invslot = ServerToSoFSlot(emu->invslot); strn0cpy(eq->txtfile, emu->booktext, sizeof(eq->txtfile)); FINISH_ENCODE(); } @@ -1674,7 +1676,7 @@ ENCODE(OP_AdventureMerchantSell) { eq->unknown000 = 1; OUT(npcid); - eq->slot = TitaniumToSoFSlot(emu->slot); + eq->slot = ServerToSoFSlot(emu->slot); OUT(charges); OUT(sell_price); @@ -1959,7 +1961,7 @@ ENCODE(OP_AltCurrencySell) SETUP_DIRECT_ENCODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); OUT(merchant_entity_id); - eq->slot_id = TitaniumToSoFSlot(emu->slot_id); + eq->slot_id = ServerToSoFSlot(emu->slot_id); OUT(charges); OUT(cost); FINISH_ENCODE(); @@ -2011,7 +2013,7 @@ DECODE(OP_AdventureMerchantSell) { SETUP_DIRECT_DECODE(Adventure_Sell_Struct, structs::Adventure_Sell_Struct); IN(npcid); - emu->slot = SoFToTitaniumSlot(eq->slot); + emu->slot = SoFToServerSlot(eq->slot); IN(charges); IN(sell_price); @@ -2022,7 +2024,7 @@ DECODE(OP_ApplyPoison) { DECODE_LENGTH_EXACT(structs::ApplyPoison_Struct); SETUP_DIRECT_DECODE(ApplyPoison_Struct, structs::ApplyPoison_Struct); - emu->inventorySlot = SoFToTitaniumSlot(eq->inventorySlot); + emu->inventorySlot = SoFToServerSlot(eq->inventorySlot); IN(success); FINISH_DIRECT_DECODE(); @@ -2032,7 +2034,7 @@ DECODE(OP_ItemVerifyRequest) { DECODE_LENGTH_EXACT(structs::ItemVerifyRequest_Struct); SETUP_DIRECT_DECODE(ItemVerifyRequest_Struct, structs::ItemVerifyRequest_Struct); - emu->slot = SoFToTitaniumSlot(eq->slot); + emu->slot = SoFToServerSlot(eq->slot); IN(target); FINISH_DIRECT_DECODE(); @@ -2042,7 +2044,7 @@ DECODE(OP_Consume) { DECODE_LENGTH_EXACT(structs::Consume_Struct); SETUP_DIRECT_DECODE(Consume_Struct, structs::Consume_Struct); - emu->slot = SoFToTitaniumSlot(eq->slot); + emu->slot = SoFToServerSlot(eq->slot); IN(auto_consumed); IN(type); @@ -2055,7 +2057,7 @@ DECODE(OP_CastSpell) { IN(slot); IN(spell_id); - emu->inventoryslot = SoFToTitaniumSlot(eq->inventoryslot); + emu->inventoryslot = SoFToServerSlot(eq->inventoryslot); IN(target_id); FINISH_DIRECT_DECODE(); @@ -2066,8 +2068,8 @@ DECODE(OP_DeleteItem) DECODE_LENGTH_EXACT(structs::DeleteItem_Struct); SETUP_DIRECT_DECODE(DeleteItem_Struct, structs::DeleteItem_Struct); - emu->from_slot = SoFToTitaniumSlot(eq->from_slot); - emu->to_slot = SoFToTitaniumSlot(eq->to_slot); + emu->from_slot = SoFToServerSlot(eq->from_slot); + emu->to_slot = SoFToServerSlot(eq->to_slot); IN(number_in_stack); FINISH_DIRECT_DECODE(); @@ -2080,8 +2082,8 @@ DECODE(OP_MoveItem) _log(NET__ERROR, "Moved item from %u to %u", eq->from_slot, eq->to_slot); - emu->from_slot = SoFToTitaniumSlot(eq->from_slot); - emu->to_slot = SoFToTitaniumSlot(eq->to_slot); + emu->from_slot = SoFToServerSlot(eq->from_slot); + emu->to_slot = SoFToServerSlot(eq->to_slot); IN(number_in_stack); FINISH_DIRECT_DECODE(); @@ -2230,7 +2232,7 @@ DECODE(OP_ShopPlayerSell) { SETUP_DIRECT_DECODE(Merchant_Purchase_Struct, structs::Merchant_Purchase_Struct); IN(npcid); - emu->itemslot = SoFToTitaniumSlot(eq->itemslot); + emu->itemslot = SoFToServerSlot(eq->itemslot); IN(quantity); IN(price); @@ -2298,7 +2300,7 @@ DECODE(OP_TributeItem) { DECODE_LENGTH_EXACT(structs::TributeItem_Struct); SETUP_DIRECT_DECODE(TributeItem_Struct, structs::TributeItem_Struct); - emu->slot = SoFToTitaniumSlot(eq->slot); + emu->slot = SoFToServerSlot(eq->slot); IN(quantity); IN(tribute_master_id); IN(tribute_points); @@ -2311,7 +2313,7 @@ DECODE(OP_ReadBook) { SETUP_DIRECT_DECODE(BookRequest_Struct, structs::BookRequest_Struct); IN(type); - emu->invslot = SoFToTitaniumSlot(eq->invslot); + emu->invslot = SoFToServerSlot(eq->invslot); emu->window = (uint8) eq->window; strn0cpy(emu->txtfile, eq->txtfile, sizeof(emu->txtfile)); @@ -2322,7 +2324,7 @@ DECODE(OP_TradeSkillCombine) { DECODE_LENGTH_EXACT(structs::NewCombine_Struct); SETUP_DIRECT_DECODE(NewCombine_Struct, structs::NewCombine_Struct); - emu->container_slot = SoFToTitaniumSlot(eq->container_slot); + emu->container_slot = SoFToServerSlot(eq->container_slot); FINISH_DIRECT_DECODE(); } @@ -2331,7 +2333,7 @@ DECODE(OP_AugmentItem) { DECODE_LENGTH_EXACT(structs::AugmentItem_Struct); SETUP_DIRECT_DECODE(AugmentItem_Struct, structs::AugmentItem_Struct); - emu->container_slot = SoFToTitaniumSlot(eq->container_slot); + emu->container_slot = SoFToServerSlot(eq->container_slot); emu->augment_slot = eq->augment_slot; FINISH_DIRECT_DECODE(); @@ -2396,7 +2398,7 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint hdr.stacksize = stackable ? charges : 1; hdr.unknown004 = 0; - int32 slot_id = TitaniumToSoFSlot(slot_id_in); + int32 slot_id = ServerToSoFSlot(slot_id_in); hdr.slot = (merchant_slot == 0) ? slot_id : merchant_slot; hdr.price = inst->GetPrice(); @@ -2778,11 +2780,11 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint iqbs.subitem_count = 0; - char *SubSerializations[10]; + char *SubSerializations[10]; // uint32 SubLengths[10]; - for(int x = 0; x < 10; ++x) { + for(int x = SUB_BEGIN; x < EmuConstants::ITEM_CONTAINER_SIZE; ++x) { SubSerializations[x] = nullptr; @@ -2794,15 +2796,23 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint iqbs.subitem_count++; - if(slot_id_in >= 22 && slot_id_in < 30) - SubSlotNumber = (((slot_id_in + 3) * 10) + x + 1); - else if(slot_id_in >= 2000 && slot_id_in <= 2023) - SubSlotNumber = (((slot_id_in - 2000) * 10) + 2030 + x + 1); - else if(slot_id_in >= 2500 && slot_id_in <= 2501) - SubSlotNumber = (((slot_id_in - 2500) * 10) + 2530 + x + 1); + if(slot_id_in >= EmuConstants::GENERAL_BEGIN && slot_id_in <= EmuConstants::GENERAL_END) // (< 30) - no cursor? + //SubSlotNumber = (((slot_id_in + 3) * 10) + x + 1); + SubSlotNumber = (((slot_id_in + 3) * EmuConstants::ITEM_CONTAINER_SIZE) + x + 1); + else if(slot_id_in >= EmuConstants::BANK_BEGIN && slot_id_in <= EmuConstants::BANK_END) + //SubSlotNumber = (((slot_id_in - 2000) * 10) + 2030 + x + 1); + SubSlotNumber = (((slot_id_in - EmuConstants::BANK_BEGIN) * EmuConstants::ITEM_CONTAINER_SIZE) + EmuConstants::BANK_BAGS_BEGIN + x); + else if(slot_id_in >= EmuConstants::SHARED_BANK_BEGIN && slot_id_in <= EmuConstants::SHARED_BANK_END) + //SubSlotNumber = (((slot_id_in - 2500) * 10) + 2530 + x + 1); + SubSlotNumber = (((slot_id_in - EmuConstants::SHARED_BANK_BEGIN) * EmuConstants::ITEM_CONTAINER_SIZE) + EmuConstants::SHARED_BANK_BAGS_BEGIN + x); else SubSlotNumber = slot_id_in; // ??????? + /* + // TEST CODE: + SubSlotNumber = Inventory::CalcSlotID(slot_id_in, x); + */ + SubSerializations[x] = SerializeItem(subitem, SubSlotNumber, &SubLengths[x], depth + 1); } } @@ -2834,7 +2844,7 @@ DECODE(OP_AltCurrencySellSelection) DECODE_LENGTH_EXACT(structs::AltCurrencySelectItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySelectItem_Struct, structs::AltCurrencySelectItem_Struct); IN(merchant_entity_id); - emu->slot_id = SoFToTitaniumSlot(eq->slot_id); + emu->slot_id = SoFToServerSlot(eq->slot_id); FINISH_DIRECT_DECODE(); } @@ -2843,7 +2853,7 @@ DECODE(OP_AltCurrencySell) DECODE_LENGTH_EXACT(structs::AltCurrencySellItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); IN(merchant_entity_id); - emu->slot_id = SoFToTitaniumSlot(eq->slot_id); + emu->slot_id = SoFToServerSlot(eq->slot_id); IN(charges); IN(cost); FINISH_DIRECT_DECODE(); diff --git a/common/patches/SoF_constants.h b/common/patches/SoF_constants.h index c8eb1df86..0ae0d728d 100644 --- a/common/patches/SoF_constants.h +++ b/common/patches/SoF_constants.h @@ -127,9 +127,6 @@ namespace SoF { static const uint16 MAP_KRONO_SIZE = NOT_USED; static const uint16 MAP_OTHER_SIZE = 0; - static const int16 POSSESSIONS_BEGIN = slots::MainCharm; - static const int16 POSSESSIONS_END = slots::MainCursor; - static const int16 EQUIPMENT_BEGIN = slots::MainCharm; static const int16 EQUIPMENT_END = slots::MainAmmo; static const uint16 EQUIPMENT_SIZE = slots::_MainEquipmentCount; @@ -160,8 +157,8 @@ namespace SoF { static const int16 TRADE_BEGIN = 3000; static const int16 TRADE_END = 3007; - static const int16 TRADE_END_NPC = 3003; - static const int16 TRADE_BAGS_BEGIN = 3031; // no change from Ti? + static const int16 TRADE_NPC_END = 3003; + static const int16 TRADE_BAGS_BEGIN = 3031; static const int16 TRADE_BAGS_END_OFFSET = 79; static const int16 TRADE_BAGS_END = TRADE_BAGS_BEGIN + TRADE_BAGS_END_OFFSET; diff --git a/common/patches/Titanium.cpp b/common/patches/Titanium.cpp index 2f0e6a607..ea44c3c38 100644 --- a/common/patches/Titanium.cpp +++ b/common/patches/Titanium.cpp @@ -104,6 +104,53 @@ const EQClientVersion Strategy::ClientVersion() const #include "SSDefine.h" + +/* +// Converts Server Slot IDs to Titanium Slot IDs for use in Encodes +static inline uint32 ServerToTitaniumSlot(uint32 ServerSlot) { + uint32 TitaniumSlot; + // reserved +} +*/ +/* +// Converts Titanium Slot IDs to Server Slot IDs for use in Decodes +static inline uint32 TitaniumToServerSlot(uint32 TitaniumSlot) { + uint32 ServerSlot; + // reserved +} +*/ +/* +// Converts Server Corpse Slot IDs to Titanium Corpse Slot IDs for use in Encodes +static inline uint32 ServerToTitaniumCorpseSlot(uint32 ServerCorpse) { + uint32 TitaniumCorpse; + // reserved +} +*/ +/* +// Converts Titanium Corpse Slot IDs to Server Corpse Slot IDs for use in Decodes +static inline uint32 TitaniumToServerCorpseSlot(uint32 TitaniumCorpse) { + uint32 ServerCorpse; + // reserved +} +*/ +/* +static inline uint32 RemovePowerSourceBit(uint32 slots) { // shouldn't need to add one..just grab the actual server reference, if so... + static const uint32 BIT21 = 1 << 21; + static const uint32 BIT22 = 1 << 22; + static const uint32 KEEPBITS = ~(BIT21 | BIT22); + + bool wearammo = slots & BIT22; + + slots &= KEEPBITS; + + if (wearammo) + slots |= BIT21; + + return slots; +} +*/ + + EAT_ENCODE(OP_ZoneServerReady) EAT_ENCODE(OP_GuildMemberLevelUpdate) diff --git a/common/patches/Titanium_constants.h b/common/patches/Titanium_constants.h index 4d95d3355..c07244f2d 100644 --- a/common/patches/Titanium_constants.h +++ b/common/patches/Titanium_constants.h @@ -126,9 +126,6 @@ namespace Titanium { static const uint16 MAP_KRONO_SIZE = NOT_USED; static const uint16 MAP_OTHER_SIZE = 0; - static const int16 POSSESSIONS_BEGIN = slots::MainCharm; - static const int16 POSSESSIONS_END = slots::MainCursor; - static const int16 EQUIPMENT_BEGIN = slots::MainCharm; static const int16 EQUIPMENT_END = slots::MainAmmo; static const uint16 EQUIPMENT_SIZE = slots::_MainEquipmentCount; @@ -159,7 +156,7 @@ namespace Titanium { static const int16 TRADE_BEGIN = 3000; static const int16 TRADE_END = 3007; - static const int16 TRADE_END_NPC = 3003; + static const int16 TRADE_NPC_END = 3003; static const int16 TRADE_BAGS_BEGIN = 3031; static const int16 TRADE_BAGS_END_OFFSET = 79; static const int16 TRADE_BAGS_END = TRADE_BAGS_BEGIN + TRADE_BAGS_END_OFFSET; diff --git a/common/patches/Underfoot.cpp b/common/patches/Underfoot.cpp index f15a94bde..b56d3f511 100644 --- a/common/patches/Underfoot.cpp +++ b/common/patches/Underfoot.cpp @@ -109,70 +109,71 @@ const EQClientVersion Strategy::ClientVersion() const #include "SSDefine.h" -// Converts Titanium Slot IDs to Underfoot Slot IDs for use in Encodes -static inline uint32 TitaniumToUnderfootSlot(uint32 TitaniumSlot) { +// Converts Server Slot IDs to Underfoot Slot IDs for use in Encodes +static inline uint32 ServerToUnderfootSlot(uint32 ServerSlot) { uint32 UnderfootSlot = 0; - if(TitaniumSlot >= 21 && TitaniumSlot <= 53) // Cursor/Ammo/Power Source and Normal Inventory Slots - { - UnderfootSlot = TitaniumSlot + 1; - } - else if(TitaniumSlot >= 251 && TitaniumSlot <= 340) // Bag Slots for Normal Inventory and Cursor - { - UnderfootSlot = TitaniumSlot + 11; - } - else if(TitaniumSlot >= 2031 && TitaniumSlot <= 2270) // Bank Bag Slots - { - UnderfootSlot = TitaniumSlot + 1; - } - else if(TitaniumSlot >= 2531 && TitaniumSlot <= 2550) // Shared Bank Bag Slots - { - UnderfootSlot = TitaniumSlot + 1; - } - else if(TitaniumSlot == 9999) //Unused slot ID to give a place to save Power Slot - { - UnderfootSlot = 21; - } + if (ServerSlot >= MainAmmo && ServerSlot <= 53) // Cursor/Ammo/Power Source and Normal Inventory Slots + UnderfootSlot = ServerSlot + 1; + + else if (ServerSlot >= EmuConstants::GENERAL_BAGS_BEGIN && ServerSlot <= EmuConstants::CURSOR_BAG_END) + UnderfootSlot = ServerSlot + 11; + + else if (ServerSlot >= EmuConstants::BANK_BAGS_BEGIN && ServerSlot <= EmuConstants::BANK_BAGS_END) + UnderfootSlot = ServerSlot + 1; + + else if (ServerSlot >= EmuConstants::SHARED_BANK_BAGS_BEGIN && ServerSlot <= EmuConstants::SHARED_BANK_BAGS_END) + UnderfootSlot = ServerSlot + 1; + + else if (ServerSlot == MainPowerSource) + UnderfootSlot = slots::MainPowerSource; + else - { - UnderfootSlot = TitaniumSlot; - } + UnderfootSlot = ServerSlot; return UnderfootSlot; } -// Converts Underfoot Slot IDs to Titanium Slot IDs for use in Decodes -static inline uint32 UnderfootToTitaniumSlot(uint32 UnderfootSlot) { - uint32 TitaniumSlot = 0; +// Converts Underfoot Slot IDs to Server Slot IDs for use in Decodes +static inline uint32 UnderfootToServerSlot(uint32 UnderfootSlot) { + uint32 ServerSlot = 0; - if(UnderfootSlot >= 22 && UnderfootSlot <= 54) // Cursor/Ammo/Power Source and Normal Inventory Slots - { - TitaniumSlot = UnderfootSlot - 1; - } - else if(UnderfootSlot >= 262 && UnderfootSlot <= 351) // Bag Slots for Normal Inventory and Cursor - { - TitaniumSlot = UnderfootSlot - 11; - } - else if(UnderfootSlot >= 2032 && UnderfootSlot <= 2271) // Bank Bag Slots - { - TitaniumSlot = UnderfootSlot - 1; - } - else if(UnderfootSlot >= 2532 && UnderfootSlot <= 2551) // Shared Bank Bag Slots - { - TitaniumSlot = UnderfootSlot - 1; - } - else if(UnderfootSlot == 21) - { - TitaniumSlot = 9999; //Unused slot ID to give a place to save Power Slot - } + if(UnderfootSlot >= slots::MainAmmo && UnderfootSlot <= consts::CORPSE_END) // Cursor/Ammo/Power Source and Normal Inventory Slots + ServerSlot = UnderfootSlot - 1; + + else if(UnderfootSlot >= consts::GENERAL_BAGS_BEGIN && UnderfootSlot <= consts::CURSOR_BAG_END) + ServerSlot = UnderfootSlot - 11; + + else if(UnderfootSlot >= consts::BANK_BAGS_BEGIN && UnderfootSlot <= consts::BANK_BAGS_END) + ServerSlot = UnderfootSlot - 1; + + else if(UnderfootSlot >= consts::SHARED_BANK_BAGS_BEGIN && UnderfootSlot <= consts::SHARED_BANK_BAGS_END) + ServerSlot = UnderfootSlot - 1; + + else if(UnderfootSlot == slots::MainPowerSource) + ServerSlot = MainPowerSource; + else - { - TitaniumSlot = UnderfootSlot; - } + ServerSlot = UnderfootSlot; - return TitaniumSlot; + return ServerSlot; } +/* +// Converts Server Corpse Slot IDs to Underfoot Corpse Slot IDs for use in Encodes +static inline uint32 ServerToUnderFootCorpseSlot(uint32 ServerCorpse) { + uint32 UnderfootCorpse; + // reserved +} +*/ +/* +// Converts Underfoot Corpse Slot IDs to Server Corpse Slot IDs for use in Decodes +static inline uint32 UnderfootToServerCorpseSlot(uint32 UnderfootCorpse) { + uint32 ServerCorpse; + // reserved +} +*/ + ENCODE(OP_OpenNewTasksWindow) { @@ -1898,7 +1899,7 @@ ENCODE(OP_ShopPlayerSell) { ENCODE_LENGTH_EXACT(Merchant_Purchase_Struct); SETUP_DIRECT_ENCODE(Merchant_Purchase_Struct, structs::Merchant_Purchase_Struct); OUT(npcid); - eq->itemslot = TitaniumToUnderfootSlot(emu->itemslot); + eq->itemslot = ServerToUnderfootSlot(emu->itemslot); OUT(quantity); OUT(price); FINISH_ENCODE(); @@ -1907,7 +1908,7 @@ ENCODE(OP_ShopPlayerSell) { ENCODE(OP_ApplyPoison) { ENCODE_LENGTH_EXACT(ApplyPoison_Struct); SETUP_DIRECT_ENCODE(ApplyPoison_Struct, structs::ApplyPoison_Struct); - eq->inventorySlot = TitaniumToUnderfootSlot(emu->inventorySlot); + eq->inventorySlot = ServerToUnderfootSlot(emu->inventorySlot); OUT(success); FINISH_ENCODE(); } @@ -1916,8 +1917,8 @@ ENCODE(OP_DeleteItem) { ENCODE_LENGTH_EXACT(DeleteItem_Struct); SETUP_DIRECT_ENCODE(DeleteItem_Struct, structs::DeleteItem_Struct); - eq->from_slot = TitaniumToUnderfootSlot(emu->from_slot); - eq->to_slot = TitaniumToUnderfootSlot(emu->to_slot); + eq->from_slot = ServerToUnderfootSlot(emu->from_slot); + eq->to_slot = ServerToUnderfootSlot(emu->to_slot); OUT(number_in_stack); FINISH_ENCODE(); @@ -1928,8 +1929,8 @@ ENCODE(OP_MoveItem) { ENCODE_LENGTH_EXACT(MoveItem_Struct); SETUP_DIRECT_ENCODE(MoveItem_Struct, structs::MoveItem_Struct); - eq->from_slot = TitaniumToUnderfootSlot(emu->from_slot); - eq->to_slot = TitaniumToUnderfootSlot(emu->to_slot); + eq->from_slot = ServerToUnderfootSlot(emu->from_slot); + eq->to_slot = ServerToUnderfootSlot(emu->to_slot); OUT(number_in_stack); FINISH_ENCODE(); @@ -1939,7 +1940,7 @@ ENCODE(OP_ItemVerifyReply) { ENCODE_LENGTH_EXACT(ItemVerifyReply_Struct); SETUP_DIRECT_ENCODE(ItemVerifyReply_Struct, structs::ItemVerifyReply_Struct); - eq->slot = TitaniumToUnderfootSlot(emu->slot); + eq->slot = ServerToUnderfootSlot(emu->slot); OUT(spell); OUT(target); @@ -1989,7 +1990,7 @@ ENCODE(OP_TributeItem) { ENCODE_LENGTH_EXACT(TributeItem_Struct); SETUP_DIRECT_ENCODE(TributeItem_Struct, structs::TributeItem_Struct); - eq->slot = TitaniumToUnderfootSlot(emu->slot); + eq->slot = ServerToUnderfootSlot(emu->slot); OUT(quantity); OUT(tribute_master_id); OUT(tribute_points); @@ -2036,7 +2037,7 @@ ENCODE(OP_ReadBook) { else eq->window = emu->window; OUT(type); - eq->invslot = TitaniumToUnderfootSlot(emu->invslot); + eq->invslot = ServerToUnderfootSlot(emu->invslot); strn0cpy(eq->txtfile, emu->booktext, sizeof(eq->txtfile)); FINISH_ENCODE(); } @@ -2097,7 +2098,7 @@ ENCODE(OP_AdventureMerchantSell) { eq->unknown000 = 1; OUT(npcid); - eq->slot = TitaniumToUnderfootSlot(emu->slot); + eq->slot = ServerToUnderfootSlot(emu->slot); OUT(charges); OUT(sell_price); @@ -2798,7 +2799,7 @@ ENCODE(OP_AltCurrencySell) SETUP_DIRECT_ENCODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); OUT(merchant_entity_id); - eq->slot_id = TitaniumToUnderfootSlot(emu->slot_id); + eq->slot_id = ServerToUnderfootSlot(emu->slot_id); OUT(charges); OUT(cost); FINISH_ENCODE(); @@ -2892,7 +2893,7 @@ DECODE(OP_AdventureMerchantSell) { SETUP_DIRECT_DECODE(Adventure_Sell_Struct, structs::Adventure_Sell_Struct); IN(npcid); - emu->slot = UnderfootToTitaniumSlot(eq->slot); + emu->slot = UnderfootToServerSlot(eq->slot); IN(charges); IN(sell_price); @@ -2904,7 +2905,7 @@ DECODE(OP_ApplyPoison) { DECODE_LENGTH_EXACT(structs::ApplyPoison_Struct); SETUP_DIRECT_DECODE(ApplyPoison_Struct, structs::ApplyPoison_Struct); - emu->inventorySlot = UnderfootToTitaniumSlot(eq->inventorySlot); + emu->inventorySlot = UnderfootToServerSlot(eq->inventorySlot); IN(success); FINISH_DIRECT_DECODE(); @@ -2914,7 +2915,7 @@ DECODE(OP_ItemVerifyRequest) { DECODE_LENGTH_EXACT(structs::ItemVerifyRequest_Struct); SETUP_DIRECT_DECODE(ItemVerifyRequest_Struct, structs::ItemVerifyRequest_Struct); - emu->slot = UnderfootToTitaniumSlot(eq->slot); + emu->slot = UnderfootToServerSlot(eq->slot); IN(target); FINISH_DIRECT_DECODE(); @@ -2924,7 +2925,7 @@ DECODE(OP_Consume) { DECODE_LENGTH_EXACT(structs::Consume_Struct); SETUP_DIRECT_DECODE(Consume_Struct, structs::Consume_Struct); - emu->slot = UnderfootToTitaniumSlot(eq->slot); + emu->slot = UnderfootToServerSlot(eq->slot); IN(auto_consumed); IN(type); @@ -2944,7 +2945,7 @@ DECODE(OP_CastSpell) { IN(slot); } IN(spell_id); - emu->inventoryslot = UnderfootToTitaniumSlot(eq->inventoryslot); + emu->inventoryslot = UnderfootToServerSlot(eq->inventoryslot); IN(target_id); FINISH_DIRECT_DECODE(); @@ -2955,8 +2956,8 @@ DECODE(OP_DeleteItem) DECODE_LENGTH_EXACT(structs::DeleteItem_Struct); SETUP_DIRECT_DECODE(DeleteItem_Struct, structs::DeleteItem_Struct); - emu->from_slot = UnderfootToTitaniumSlot(eq->from_slot); - emu->to_slot = UnderfootToTitaniumSlot(eq->to_slot); + emu->from_slot = UnderfootToServerSlot(eq->from_slot); + emu->to_slot = UnderfootToServerSlot(eq->to_slot); IN(number_in_stack); FINISH_DIRECT_DECODE(); @@ -2969,8 +2970,8 @@ DECODE(OP_MoveItem) _log(NET__ERROR, "Moved item from %u to %u", eq->from_slot, eq->to_slot); - emu->from_slot = UnderfootToTitaniumSlot(eq->from_slot); - emu->to_slot = UnderfootToTitaniumSlot(eq->to_slot); + emu->from_slot = UnderfootToServerSlot(eq->from_slot); + emu->to_slot = UnderfootToServerSlot(eq->to_slot); IN(number_in_stack); FINISH_DIRECT_DECODE(); @@ -3177,7 +3178,7 @@ DECODE(OP_ShopPlayerSell) { SETUP_DIRECT_DECODE(Merchant_Purchase_Struct, structs::Merchant_Purchase_Struct); IN(npcid); - emu->itemslot = UnderfootToTitaniumSlot(eq->itemslot); + emu->itemslot = UnderfootToServerSlot(eq->itemslot); IN(quantity); IN(price); @@ -3246,7 +3247,7 @@ DECODE(OP_TributeItem) { DECODE_LENGTH_EXACT(structs::TributeItem_Struct); SETUP_DIRECT_DECODE(TributeItem_Struct, structs::TributeItem_Struct); - emu->slot = UnderfootToTitaniumSlot(eq->slot); + emu->slot = UnderfootToServerSlot(eq->slot); IN(quantity); IN(tribute_master_id); IN(tribute_points); @@ -3259,7 +3260,7 @@ DECODE(OP_ReadBook) { SETUP_DIRECT_DECODE(BookRequest_Struct, structs::BookRequest_Struct); IN(type); - emu->invslot = UnderfootToTitaniumSlot(eq->invslot); + emu->invslot = UnderfootToServerSlot(eq->invslot); emu->window = (uint8) eq->window; strn0cpy(emu->txtfile, eq->txtfile, sizeof(emu->txtfile)); @@ -3270,7 +3271,7 @@ DECODE(OP_TradeSkillCombine) { DECODE_LENGTH_EXACT(structs::NewCombine_Struct); SETUP_DIRECT_DECODE(NewCombine_Struct, structs::NewCombine_Struct); - emu->container_slot = UnderfootToTitaniumSlot(eq->container_slot); + emu->container_slot = UnderfootToServerSlot(eq->container_slot); FINISH_DIRECT_DECODE(); } @@ -3279,7 +3280,7 @@ DECODE(OP_AugmentItem) { DECODE_LENGTH_EXACT(structs::AugmentItem_Struct); SETUP_DIRECT_DECODE(AugmentItem_Struct, structs::AugmentItem_Struct); - emu->container_slot = UnderfootToTitaniumSlot(eq->container_slot); + emu->container_slot = UnderfootToServerSlot(eq->container_slot); emu->augment_slot = eq->augment_slot; FINISH_DIRECT_DECODE(); @@ -3488,7 +3489,7 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint hdr.stacksize = stackable ? charges : 1; hdr.unknown004 = 0; - int32 slot_id = TitaniumToUnderfootSlot(slot_id_in); + int32 slot_id = ServerToUnderfootSlot(slot_id_in); hdr.slot = (merchant_slot == 0) ? slot_id : merchant_slot; hdr.price = inst->GetPrice(); @@ -3894,11 +3895,11 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint iqbs.subitem_count = 0; - char *SubSerializations[10]; + char *SubSerializations[10]; // uint32 SubLengths[10]; - for(int x = 0; x < 10; ++x) { + for(int x = SUB_BEGIN; x < EmuConstants::ITEM_CONTAINER_SIZE; ++x) { SubSerializations[x] = nullptr; @@ -3910,15 +3911,23 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint iqbs.subitem_count++; - if(slot_id_in >= 22 && slot_id_in < 30) - SubSlotNumber = (((slot_id_in + 3) * 10) + x + 1); - else if(slot_id_in >= 2000 && slot_id_in <= 2023) - SubSlotNumber = (((slot_id_in - 2000) * 10) + 2030 + x + 1); - else if(slot_id_in >= 2500 && slot_id_in <= 2501) - SubSlotNumber = (((slot_id_in - 2500) * 10) + 2530 + x + 1); + if (slot_id_in >= EmuConstants::GENERAL_BEGIN && slot_id_in <= EmuConstants::GENERAL_END) // (< 30) - no cursor? + //SubSlotNumber = (((slot_id_in + 3) * 10) + x + 1); + SubSlotNumber = (((slot_id_in + 3) * EmuConstants::ITEM_CONTAINER_SIZE) + x + 1); + else if (slot_id_in >= EmuConstants::BANK_BEGIN && slot_id_in <= EmuConstants::BANK_END) + //SubSlotNumber = (((slot_id_in - 2000) * 10) + 2030 + x + 1); + SubSlotNumber = (((slot_id_in - EmuConstants::BANK_BEGIN) * EmuConstants::ITEM_CONTAINER_SIZE) + EmuConstants::BANK_BAGS_BEGIN + x); + else if (slot_id_in >= EmuConstants::SHARED_BANK_BEGIN && slot_id_in <= EmuConstants::SHARED_BANK_END) + //SubSlotNumber = (((slot_id_in - 2500) * 10) + 2530 + x + 1); + SubSlotNumber = (((slot_id_in - EmuConstants::SHARED_BANK_BEGIN) * EmuConstants::ITEM_CONTAINER_SIZE) + EmuConstants::SHARED_BANK_BAGS_BEGIN + x); else SubSlotNumber = slot_id_in; // ??????? + /* + // TEST CODE: + SubSlotNumber = Inventory::CalcSlotID(slot_id_in, x); + */ + SubSerializations[x] = SerializeItem(subitem, SubSlotNumber, &SubLengths[x], depth + 1); } } @@ -3950,7 +3959,7 @@ DECODE(OP_AltCurrencySellSelection) DECODE_LENGTH_EXACT(structs::AltCurrencySelectItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySelectItem_Struct, structs::AltCurrencySelectItem_Struct); IN(merchant_entity_id); - emu->slot_id = UnderfootToTitaniumSlot(eq->slot_id); + emu->slot_id = UnderfootToServerSlot(eq->slot_id); FINISH_DIRECT_DECODE(); } @@ -3959,7 +3968,7 @@ DECODE(OP_AltCurrencySell) DECODE_LENGTH_EXACT(structs::AltCurrencySellItem_Struct); SETUP_DIRECT_DECODE(AltCurrencySellItem_Struct, structs::AltCurrencySellItem_Struct); IN(merchant_entity_id); - emu->slot_id = UnderfootToTitaniumSlot(eq->slot_id); + emu->slot_id = UnderfootToServerSlot(eq->slot_id); IN(charges); IN(cost); FINISH_DIRECT_DECODE(); diff --git a/common/patches/Underfoot_constants.h b/common/patches/Underfoot_constants.h index fd84226ee..d34eaeb5b 100644 --- a/common/patches/Underfoot_constants.h +++ b/common/patches/Underfoot_constants.h @@ -127,9 +127,6 @@ namespace Underfoot { static const uint16 MAP_KRONO_SIZE = NOT_USED; static const uint16 MAP_OTHER_SIZE = 0; - static const int16 POSSESSIONS_BEGIN = slots::MainCharm; - static const int16 POSSESSIONS_END = slots::MainCursor; - static const int16 EQUIPMENT_BEGIN = slots::MainCharm; static const int16 EQUIPMENT_END = slots::MainAmmo; static const uint16 EQUIPMENT_SIZE = slots::_MainEquipmentCount; @@ -160,8 +157,8 @@ namespace Underfoot { static const int16 TRADE_BEGIN = 3000; static const int16 TRADE_END = 3007; - static const int16 TRADE_END_NPC = 3003; - static const int16 TRADE_BAGS_BEGIN = 3031; // no change from Ti? + static const int16 TRADE_NPC_END = 3003; + static const int16 TRADE_BAGS_BEGIN = 3031; static const int16 TRADE_BAGS_END_OFFSET = 79; static const int16 TRADE_BAGS_END = TRADE_BAGS_BEGIN + TRADE_BAGS_END_OFFSET; diff --git a/common/shareddb.cpp b/common/shareddb.cpp index cff3f545c..7dd4a6fa7 100644 --- a/common/shareddb.cpp +++ b/common/shareddb.cpp @@ -149,10 +149,10 @@ bool ret=true; char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; // Delete cursor items - if ((ret = RunQuery(query, MakeAnyLenString(&query, "DELETE FROM inventory WHERE charid=%i AND ( (slotid >=8000 and slotid<=8999) or slotid=30 or (slotid>=331 and slotid<=340))", char_id), errbuf))) { + if ((ret = RunQuery(query, MakeAnyLenString(&query, "DELETE FROM inventory WHERE charid=%i AND ( (slotid >=8000 and slotid<=8999) or slotid=%i or (slotid>=%i and slotid<=%i))", char_id, MainCursor,EmuConstants::CURSOR_BAG_BEGIN,EmuConstants::CURSOR_BAG_END), errbuf))) { for(it=start,i=8000;it!=end;++it,i++) { ItemInst *inst=*it; - if (!(ret=SaveInventory(char_id,inst,(i==8000) ? 30 : i))) + if (!(ret=SaveInventory(char_id,inst,(i==8000) ? MainCursor : i))) break; } } else { @@ -204,20 +204,20 @@ bool SharedDatabase::SaveInventory(uint32 char_id, const ItemInst* inst, int16 s char errbuf[MYSQL_ERRMSG_SIZE]; char* query = 0; bool ret = false; - uint32 augslot[5] = { 0, 0, 0, 0, 0 }; + uint32 augslot[EmuConstants::ITEM_COMMON_SIZE] = { NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM }; //never save tribute slots: - if(slot_id >= 400 && slot_id <= 404) + if(slot_id >= EmuConstants::TRIBUTE_BEGIN && slot_id <= EmuConstants::TRIBUTE_END) return(true); if (inst && inst->IsType(ItemClassCommon)) { - for(int i=0;i<5;i++) { + for(int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { ItemInst *auginst=inst->GetItem(i); - augslot[i]=(auginst && auginst->GetItem()) ? auginst->GetItem()->ID : 0; + augslot[i]=(auginst && auginst->GetItem()) ? auginst->GetItem()->ID : NO_ITEM; } } - if (slot_id>=2500 && slot_id<=2600) { // Shared bank inventory + if (slot_id >= EmuConstants::SHARED_BANK_BEGIN && slot_id <= EmuConstants::SHARED_BANK_BAGS_END) { // Shared bank inventory if (!inst) { // Delete item uint32 account_id = GetAccountIDByChar(char_id); @@ -229,7 +229,7 @@ bool SharedDatabase::SaveInventory(uint32 char_id, const ItemInst* inst, int16 s // Delete bag slots, if need be if (ret && Inventory::SupportsContainers(slot_id)) { safe_delete_array(query); - int16 base_slot_id = Inventory::CalcSlotId(slot_id, 0); + int16 base_slot_id = Inventory::CalcSlotId(slot_id, SUB_BEGIN); ret = RunQuery(query, MakeAnyLenString(&query, "DELETE FROM sharedbank WHERE acctid=%i AND slotid>=%i AND slotid<%i", account_id, base_slot_id, (base_slot_id+10)), errbuf); } @@ -268,7 +268,7 @@ bool SharedDatabase::SaveInventory(uint32 char_id, const ItemInst* inst, int16 s // Delete bag slots, if need be if (ret && Inventory::SupportsContainers(slot_id)) { safe_delete_array(query); - int16 base_slot_id = Inventory::CalcSlotId(slot_id, 0); + int16 base_slot_id = Inventory::CalcSlotId(slot_id, SUB_BEGIN); ret = RunQuery(query, MakeAnyLenString(&query, "DELETE FROM inventory WHERE charid=%i AND slotid>=%i AND slotid<%i", char_id, base_slot_id, (base_slot_id+10)), errbuf); } @@ -302,7 +302,7 @@ bool SharedDatabase::SaveInventory(uint32 char_id, const ItemInst* inst, int16 s // Save bag contents, if slot supports bag contents if (inst && inst->IsType(ItemClassContainer) && Inventory::SupportsContainers(slot_id)) { - for (uint8 idx=0; idx<10; idx++) { + for (uint8 idx = SUB_BEGIN; idx < EmuConstants::ITEM_CONTAINER_SIZE; idx++) { const ItemInst* baginst = inst->GetItem(idx); SaveInventory(char_id, baginst, Inventory::CalcSlotId(slot_id, idx)); } @@ -430,7 +430,7 @@ bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) { int16 slot_id = (int16)atoi(row[0]); uint32 item_id = (uint32)atoi(row[1]); int8 charges = (int8)atoi(row[2]); - uint32 aug[5]; + uint32 aug[EmuConstants::ITEM_COMMON_SIZE]; aug[0] = (uint32)atoi(row[3]); aug[1] = (uint32)atoi(row[4]); aug[2] = (uint32)atoi(row[5]); @@ -443,7 +443,7 @@ bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) { ItemInst* inst = CreateBaseItem(item, charges); if (item->ItemClass == ItemClassCommon) { - for(int i=0;i<5;i++) { + for(int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { if (aug[i]) { inst->PutAugment(this, i, aug[i]); } @@ -484,8 +484,8 @@ bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) { "Warning: Invalid slot_id for item in shared bank inventory: %s=%i, item_id=%i, slot_id=%i", ((is_charid==true) ? "charid" : "acctid"), id, item_id, slot_id); - if(is_charid) - SaveInventory(id,nullptr,slot_id); + if (is_charid) + SaveInventory(id, nullptr, slot_id); } } else { @@ -524,7 +524,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, Inventory* inv) { uint32 item_id = atoi(row[1]); uint16 charges = atoi(row[2]); uint32 color = atoul(row[3]); - uint32 aug[5]; + uint32 aug[EmuConstants::ITEM_COMMON_SIZE]; aug[0] = (uint32)atoul(row[4]); aug[1] = (uint32)atoul(row[5]); aug[2] = (uint32)atoul(row[6]); @@ -565,7 +565,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, Inventory* inv) { } } - if (instnodrop || (slot_id >= 0 && slot_id <= 21 && inst->GetItem()->Attuneable)) + if (instnodrop || (((slot_id >= EmuConstants::EQUIPMENT_BEGIN && slot_id <= EmuConstants::EQUIPMENT_END) || slot_id == MainPowerSource) && inst->GetItem()->Attuneable)) inst->SetInstNoDrop(true); if (color > 0) inst->SetColor(color); @@ -575,17 +575,27 @@ bool SharedDatabase::GetInventory(uint32 char_id, Inventory* inv) { inst->SetCharges(charges); if (item->ItemClass == ItemClassCommon) { - for(int i=0;i<5;i++) { + for(int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { if (aug[i]) { inst->PutAugment(this, i, aug[i]); } } } - if (slot_id>=8000 && slot_id <= 8999) + if (slot_id >= 8000 && slot_id <= 8999) { put_slot_id = inv->PushCursor(*inst); - else + } + // Admins: please report any occurrences of this error + else if (slot_id >= 3111 && slot_id <= 3179) { + LogFile->write(EQEMuLog::Error, + "Warning: Defunct location for item in inventory: charid=%i, item_id=%i, slot_id=%i .. pushing to cursor...", + char_id, item_id, slot_id); + put_slot_id = inv->PushCursor(*inst); + } + else { put_slot_id = inv->PutItem(slot_id, *inst); + } + safe_delete(inst); // Save ptr to item in inventory @@ -633,7 +643,7 @@ bool SharedDatabase::GetInventory(uint32 account_id, char* name, Inventory* inv) uint32 item_id = atoi(row[1]); int8 charges = atoi(row[2]); uint32 color = atoul(row[3]); - uint32 aug[5]; + uint32 aug[EmuConstants::ITEM_COMMON_SIZE]; aug[0] = (uint32)atoi(row[4]); aug[1] = (uint32)atoi(row[5]); aug[2] = (uint32)atoi(row[6]); @@ -679,7 +689,7 @@ bool SharedDatabase::GetInventory(uint32 account_id, char* name, Inventory* inv) inst->SetCharges(charges); if (item->ItemClass == ItemClassCommon) { - for(int i=0;i<5;i++) { + for(int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { if (aug[i]) { inst->PutAugment(this, i, aug[i]); } diff --git a/zone/AA.cpp b/zone/AA.cpp index 6e5569c3c..de3704fcd 100644 --- a/zone/AA.cpp +++ b/zone/AA.cpp @@ -912,7 +912,7 @@ void Mob::WakeTheDead(uint16 spell_id, Mob *target, uint32 duration) //gear stuff, need to make sure there's //no situation where this stuff can be duped - for(int x = 0; x < 21; x++) + for(int x = EmuConstants::EQUIPMENT_BEGIN; x <= EmuConstants::EQUIPMENT_END; x++) // (< 21) added MainAmmo { uint32 sitem = 0; sitem = CorpseToUse->GetWornItem(x); @@ -1318,6 +1318,8 @@ void Client::SendAA(uint32 id, int seq) { //Prevent removal of previous AA from window if next AA belongs to a higher client version. SendAA_Struct* saa_next = nullptr; saa_next = zone->FindAA(saa->sof_next_id); + + // hard-coding values like this is dangerous and makes adding/updating clients a nightmare... if (saa_next && (((GetClientVersionBit() == 4) && (saa_next->clientver > 4)) || ((GetClientVersionBit() == 8) && (saa_next->clientver > 5)) @@ -1895,7 +1897,7 @@ SendAA_Struct* ZoneDatabase::GetAASkillVars(uint32 skill_id) row = mysql_fetch_row(result); - //ATOI IS NOT UNISGNED LONG-SAFE!!! + //ATOI IS NOT UNSIGNED LONG-SAFE!!! sendaa->cost = atoul(row[0]); sendaa->cost2 = sendaa->cost; diff --git a/zone/Object.cpp b/zone/Object.cpp index 216afbbf9..44459bab0 100644 --- a/zone/Object.cpp +++ b/zone/Object.cpp @@ -544,7 +544,7 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) EQApplicationPacket* outapp=new EQApplicationPacket(OP_ClientReady,0); sender->QueuePacket(outapp); safe_delete(outapp); - for (uint8 i=0; i<10; i++) { + for (uint8 i = SUB_BEGIN; i < EmuConstants::ITEM_CONTAINER_SIZE; i++) { const ItemInst* inst = m_inst->GetItem(i); if (inst) { //sender->GetInv().PutItem(i+4000,inst); diff --git a/zone/attack.cpp b/zone/attack.cpp index d1536a978..2403293e6 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -1248,7 +1248,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b if( Hand == MainPrimary && GetLevel() >= 28 && IsWarriorClass() ) { - // Damage bonuses apply only to hits from the main hand (Hand == 13) by characters level 28 and above + // Damage bonuses apply only to hits from the main hand (Hand == MainPrimary) by characters level 28 and above // who belong to a melee class. If we're here, then all of these conditions apply. ucDamageBonus = GetWeaponDamageBonus( weapon ? weapon->GetItem() : (const Item_Struct*) nullptr ); @@ -2629,7 +2629,7 @@ uint8 Mob::GetWeaponDamageBonus( const Item_Struct *Weapon ) // Assert: This function should only be called for hits by the mainhand, as damage bonuses apply only to the - // weapon in the primary slot. Be sure to check that Hand == 13 before calling. + // weapon in the primary slot. Be sure to check that Hand == MainPrimary before calling. // Assert: The caller should ensure that Weapon is actually a weapon before calling this function. // The ItemInst::IsWeapon() method can be used to quickly determine this. @@ -3906,7 +3906,7 @@ void Mob::TryDefensiveProc(const ItemInst* weapon, Mob *on, uint16 hand) { float ProcChance, ProcBonus; on->GetDefensiveProcChances(ProcBonus, ProcChance, hand , this); - if(hand != 13) + if(hand != MainPrimary) ProcChance /= 2; if (bDefensiveProc){ @@ -3965,7 +3965,7 @@ void Mob::TryWeaponProc(const ItemInst *inst, const Item_Struct *weapon, Mob *on ProcBonus += static_cast(itembonuses.ProcChance) / 10.0f; // Combat Effects float ProcChance = GetProcChances(ProcBonus, hand); - if (hand != 13) //Is Archery intened to proc at 50% rate? + if (hand != MainPrimary) //Is Archery intened to proc at 50% rate? ProcChance /= 2; // Try innate proc on weapon @@ -4632,7 +4632,7 @@ float Mob::GetSkillProcChances(uint16 ReuseTime, uint16 hand) { ProcChance = static_cast(weapon_speed) * (RuleR(Combat, AvgProcsPerMinute) / 60000.0f); - if (hand != 13) + if (hand != MainPrimary) ProcChance /= 2; } diff --git a/zone/bonuses.cpp b/zone/bonuses.cpp index 9829e3d4e..a0b8d819c 100644 --- a/zone/bonuses.cpp +++ b/zone/bonuses.cpp @@ -3049,26 +3049,28 @@ void NPC::CalcItemBonuses(StatBonuses *newbon) } } -void Client::CalcItemScale() -{ +void Client::CalcItemScale() { bool changed = false; - if(CalcItemScale(0, 21)) + // MainAmmo excluded in helper function below + if(CalcItemScale(EmuConstants::EQUIPMENT_BEGIN, EmuConstants::EQUIPMENT_END)) // original coding excluded MainAmmo (< 21) changed = true; - if(CalcItemScale(22, 30)) + if(CalcItemScale(EmuConstants::GENERAL_BEGIN, EmuConstants::GENERAL_END)) // original coding excluded MainCursor (< 30) changed = true; - if(CalcItemScale(251, 341)) + // I excluded cursor bag slots here because cursor was excluded above..if this is incorrect, change 'slot_y' here to CURSOR_BAG_END + // and 'slot_y' above to CURSOR from GENERAL_END above - or however it is supposed to be... + if(CalcItemScale(EmuConstants::GENERAL_BAGS_BEGIN, EmuConstants::GENERAL_BAGS_END)) // (< 341) changed = true; - if(CalcItemScale(400, 405)) + if(CalcItemScale(EmuConstants::TRIBUTE_BEGIN, EmuConstants::TRIBUTE_END)) // (< 405) changed = true; //Power Source Slot if (GetClientVersion() >= EQClientSoF) { - if(CalcItemScale(9999, 10000)) + if(CalcItemScale(MainPowerSource, MainPowerSource)) changed = true; } @@ -3078,13 +3080,15 @@ void Client::CalcItemScale() } } -bool Client::CalcItemScale(uint32 slot_x, uint32 slot_y) -{ +bool Client::CalcItemScale(uint32 slot_x, uint32 slot_y) { + // behavior change: 'slot_y' is now [RANGE]_END and not [RANGE]_END + 1 bool changed = false; int i; - for (i = slot_x; i < slot_y; i++) { + for (i = slot_x; i <= slot_y; i++) { + if (i == MainAmmo) // moved here from calling procedure to facilitate future range changes where MainAmmo may not be the last slot + continue; ItemInst* inst = m_inv.GetItem(i); - if(inst == 0) + if(inst == nullptr) continue; bool update_slot = false; @@ -3101,7 +3105,7 @@ bool Client::CalcItemScale(uint32 slot_x, uint32 slot_y) } //iterate all augments - for (int x = 0; x < EmuConstants::ITEM_COMMON_SIZE; ++x) + for (int x = AUG_BEGIN; x < EmuConstants::ITEM_COMMON_SIZE; ++x) { ItemInst * a_inst = inst->GetAugment(x); if(!a_inst) @@ -3132,22 +3136,25 @@ bool Client::CalcItemScale(uint32 slot_x, uint32 slot_y) void Client::DoItemEnterZone() { bool changed = false; - if(DoItemEnterZone(0, 21)) + // MainAmmo excluded in helper function below + if(DoItemEnterZone(EmuConstants::EQUIPMENT_BEGIN, EmuConstants::EQUIPMENT_END)) // original coding excluded MainAmmo (< 21) changed = true; - if(DoItemEnterZone(22, 30)) + if(DoItemEnterZone(EmuConstants::GENERAL_BEGIN, EmuConstants::GENERAL_END)) // original coding excluded MainCursor (< 30) changed = true; - if(DoItemEnterZone(251, 341)) + // I excluded cursor bag slots here because cursor was excluded above..if this is incorrect, change 'slot_y' here to CURSOR_BAG_END + // and 'slot_y' above to CURSOR from GENERAL_END above - or however it is supposed to be... + if(DoItemEnterZone(EmuConstants::GENERAL_BAGS_BEGIN, EmuConstants::GENERAL_BAGS_END)) // (< 341) changed = true; - if(DoItemEnterZone(400, 405)) + if(DoItemEnterZone(EmuConstants::TRIBUTE_BEGIN, EmuConstants::TRIBUTE_END)) // (< 405) changed = true; //Power Source Slot if (GetClientVersion() >= EQClientSoF) { - if(DoItemEnterZone(9999, 10000)) + if(DoItemEnterZone(MainPowerSource, MainPowerSource)) changed = true; } @@ -3158,8 +3165,11 @@ void Client::DoItemEnterZone() { } bool Client::DoItemEnterZone(uint32 slot_x, uint32 slot_y) { + // behavior change: 'slot_y' is now [RANGE]_END and not [RANGE]_END + 1 bool changed = false; - for(int i = slot_x; i < slot_y; i++) { + for(int i = slot_x; i <= slot_y; i++) { + if (i == MainAmmo) // moved here from calling procedure to facilitate future range changes where MainAmmo may not be the last slot + continue; ItemInst* inst = m_inv.GetItem(i); if(!inst) continue; @@ -3188,7 +3198,7 @@ bool Client::DoItemEnterZone(uint32 slot_x, uint32 slot_y) { } //iterate all augments - for (int x = 0; x < EmuConstants::ITEM_COMMON_SIZE; ++x) + for (int x = AUG_BEGIN; x < EmuConstants::ITEM_COMMON_SIZE; ++x) { ItemInst *a_inst = inst->GetAugment(x); if(!a_inst) diff --git a/zone/bot.cpp b/zone/bot.cpp index 4bbe8cdb4..eef5f803f 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -475,7 +475,7 @@ void Bot::GenerateBaseStats() { int16 CorruptionResist = _baseCorrup; switch(this->GetClass()) { - case 1: // Warrior + case 1: // Warrior (why not just use 'case WARRIOR:'?) Strength += 10; Stamina += 20; Agility += 10; @@ -3427,7 +3427,7 @@ void Bot::ApplySpecialAttackMod(SkillUseTypes skill, int32 &dmg, int32 &mindmg) break; } - if (item_slot >= 0){ + if (item_slot >= EmuConstants::EQUIPMENT_BEGIN){ const ItemInst* inst = GetBotItem(item_slot); const Item_Struct* botweapon = 0; if(inst) @@ -4332,7 +4332,7 @@ void Bot::Spawn(Client* botCharacterOwner, std::string* errorMessage) { /* // fillspawnstruct now properly handles this -U uint32 itemID = 0; uint8 materialFromSlot = 0xFF; - for(int i=0; i<22; ++i) { + for(int i=EmuConstants::EQUIPMENT_BEGIN; i<=EmuConstants::EQUIPMENT_END; ++i) { itemID = GetBotItemBySlot(i); if(itemID != 0) { materialFromSlot = Inventory::CalcMaterialFromSlot(i); @@ -4348,11 +4348,11 @@ void Bot::Spawn(Client* botCharacterOwner, std::string* errorMessage) { void Bot::SetBotItemInSlot(uint32 slotID, uint32 itemID, const ItemInst* inst, std::string *errorMessage) { char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; - uint32 augslot[5] = { 0, 0, 0, 0, 0 }; + uint32 augslot[EmuConstants::ITEM_COMMON_SIZE] = { NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM }; - if(this->GetBotID() > 0 && slotID >= 0 && itemID > 0) { + if (this->GetBotID() > 0 && slotID >= EmuConstants::EQUIPMENT_BEGIN && itemID > NO_ITEM) { if (inst && inst->IsType(ItemClassCommon)) { - for(int i=0; i<5; ++i) { + for(int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; ++i) { ItemInst* auginst = inst->GetItem(i); augslot[i] = (auginst && auginst->GetItem()) ? auginst->GetItem()->ID : 0; } @@ -4401,7 +4401,7 @@ void Bot::GetBotItems(std::string* errorMessage, Inventory &inv) { uint32 item_id = atoi(DataRow[1]); uint16 charges = atoi(DataRow[2]); uint32 color = atoul(DataRow[3]); - uint32 aug[5]; + uint32 aug[EmuConstants::ITEM_COMMON_SIZE]; aug[0] = (uint32)atoul(DataRow[4]); aug[1] = (uint32)atoul(DataRow[5]); aug[2] = (uint32)atoul(DataRow[6]); @@ -4412,7 +4412,7 @@ void Bot::GetBotItems(std::string* errorMessage, Inventory &inv) { ItemInst* inst = database.CreateItem(item_id, charges, aug[0], aug[1], aug[2], aug[3], aug[4]); if(inst) { int16 put_slot_id = INVALID_INDEX; - if(instnodrop || ((slot_id >= 0) && (slot_id <= 21) && inst->GetItem()->Attuneable)) + if(instnodrop || ((slot_id >= EmuConstants::EQUIPMENT_BEGIN) && (slot_id <= EmuConstants::EQUIPMENT_END) && inst->GetItem()->Attuneable)) inst->SetInstNoDrop(true); if(color > 0) inst->SetColor(color); @@ -4454,7 +4454,7 @@ void Bot::GetBotItems(std::string* errorMessage, Inventory &inv) { uint32 Bot::GetBotItemBySlot(uint32 slotID) { uint32 Result = 0; - if(this->GetBotID() > 0 && slotID >= 0) { + if(this->GetBotID() > 0 && slotID >= EmuConstants::EQUIPMENT_BEGIN) { char* query = 0; MYSQL_RES* DatasetResult; MYSQL_ROW DataRow; @@ -5298,7 +5298,7 @@ void Bot::LevelBotWithClient(Client* client, uint8 level, bool sendlvlapp) { Bot* bot = *biter; if(bot && (bot->GetLevel() != client->GetLevel())) { bot->SetPetChooser(false); // not sure what this does, but was in bot 'update' code - bot->CalcBotStats(false); + bot->CalcBotStats(false); // TODO: look at this and see if 'true' should be passed... if(sendlvlapp) bot->SendLevelAppearance(); // modified from Client::SetLevel() @@ -5456,7 +5456,7 @@ void Bot::BotAddEquipItem(int slot, uint32 id) { if(slot > 0 && id > 0) { uint8 materialFromSlot = Inventory::CalcMaterialFromSlot(slot); - if(materialFromSlot != 0xFF) { + if(materialFromSlot != _MaterialInvalid) { equipment[slot] = id; // npc has more than just material slots. Valid material should mean valid inventory index SendWearChange(materialFromSlot); } @@ -5468,7 +5468,7 @@ void Bot::BotRemoveEquipItem(int slot) { if(slot > 0) { uint8 materialFromSlot = Inventory::CalcMaterialFromSlot(slot); - if(materialFromSlot != 0xFF) { + if(materialFromSlot != _MaterialInvalid) { equipment[slot] = 0; // npc has more than just material slots. Valid material should mean valid inventory index SendWearChange(materialFromSlot); if(materialFromSlot == MaterialChest) @@ -6006,8 +6006,8 @@ void Bot::FinishTrade(Client* client, BotTradeType tradeType) { if(client && !client->GetTradeskillObject() && (client->trade->state != Trading)) { if(tradeType == BotTradeClientNormal) { // Items being traded are found in the normal trade window used to trade between a Client and a Client or NPC - // Items in this mode are found in slot ids 3000 thru 3003 - PerformTradeWithClient(3000, 3007, client); + // Items in this mode are found in slot ids 3000 thru 3003 - thought bots used the full 8-slot window..? + PerformTradeWithClient(EmuConstants::TRADE_BEGIN, EmuConstants::TRADE_END, client); // {3000..3007} } else if(tradeType == BotTradeClientNoDropNoTrade) { // Items being traded are found on the Client's cursor slot, slot id 30. This item can be either a single item or it can be a bag. @@ -6024,7 +6024,7 @@ void Bot::FinishTrade(Client* client, BotTradeType tradeType) { void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* client) { if(client) { // TODO: Figure out what the actual max slot id is - const int MAX_SLOT_ID = 3179; + const int MAX_SLOT_ID = EmuConstants::TRADE_BAGS_END; // was the old incorrect 3179.. uint32 items[MAX_SLOT_ID] = {0}; uint8 charges[MAX_SLOT_ID] = {0}; bool botCanWear[MAX_SLOT_ID] = {0}; @@ -6049,7 +6049,7 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli std::string TempErrorMessage; const Item_Struct* mWeaponItem = inst->GetItem(); bool failedLoreCheck = false; - for (int m = 0; mGetAugment(m); if(itm) { @@ -6069,12 +6069,12 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli botCanWear[i] = BotCanWear; ItemInst* swap_item = nullptr; - const char* equipped[22] = {"Charm", "Left Ear", "Head", "Face", "Right Ear", "Neck", "Shoulders", "Arms", "Back", + const char* equipped[EmuConstants::EQUIPMENT_SIZE] = {"Charm", "Left Ear", "Head", "Face", "Right Ear", "Neck", "Shoulders", "Arms", "Back", "Left Wrist", "Right Wrist", "Range", "Hands", "Primary Hand", "Secondary Hand", "Left Finger", "Right Finger", "Chest", "Legs", "Feet", "Waist", "Ammo" }; bool success = false; int how_many_slots = 0; - for(int j=0; j<22; ++j) { + for(int j = EmuConstants::EQUIPMENT_BEGIN; j <= EmuConstants::EQUIPMENT_END; ++j) { if((mWeaponItem->Slots & (1 << j))) { how_many_slots++; if(!GetBotItem(j)) { @@ -6132,11 +6132,11 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli } } if(!success) { - for(int j=0; j<22; ++j) { + for(int j = EmuConstants::EQUIPMENT_BEGIN; j <= EmuConstants::EQUIPMENT_END; ++j) { if((mWeaponItem->Slots & (1 << j))) { swap_item = GetBotItem(j); failedLoreCheck = false; - for (int k = 0; kGetAugment(k); if(itm) { @@ -6518,7 +6518,7 @@ bool Bot::Attack(Mob* other, int Hand, bool FromRiposte, bool IsStrikethrough, b if( Hand == MainPrimary && GetLevel() >= 28 && IsWarriorClass() ) { - // Damage bonuses apply only to hits from the main hand (Hand == 13) by characters level 28 and above + // Damage bonuses apply only to hits from the main hand (Hand == MainPrimary) by characters level 28 and above // who belong to a melee class. If we're here, then all of these conditions apply. ucDamageBonus = GetWeaponDamageBonus( weapon ? weapon->GetItem() : (const Item_Struct*) nullptr ); @@ -7129,7 +7129,7 @@ int16 Bot::GetBotFocusEffect(BotfocusType bottype, uint16 spell_id) { int16 focus_max_real = 0; //item focus - for(int x=0; x<=21; x++) + for(int x = EmuConstants::EQUIPMENT_BEGIN; x <= EmuConstants::EQUIPMENT_END; x++) { TempItem = nullptr; ItemInst* ins = GetBotItem(x); @@ -7163,7 +7163,7 @@ int16 Bot::GetBotFocusEffect(BotfocusType bottype, uint16 spell_id) { } } - for (int y = 0; y < EmuConstants::ITEM_COMMON_SIZE; ++y) + for (int y = AUG_BEGIN; y < EmuConstants::ITEM_COMMON_SIZE; ++y) { ItemInst *aug = nullptr; aug = ins->GetAugment(y); @@ -8213,7 +8213,7 @@ void Bot::RogueBackstab(Mob* other, bool min_damage, int ReuseTime) if(botweaponInst) { primaryweapondamage = GetWeaponDamage(other, botweaponInst); backstab_dmg = botweaponInst->GetItem()->BackstabDmg; - for (int i = 0; i < EmuConstants::ITEM_COMMON_SIZE; ++i) + for (int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; ++i) { ItemInst *aug = botweaponInst->GetAugment(i); if(aug) @@ -8770,7 +8770,7 @@ void Bot::EquipBot(std::string* errorMessage) { const ItemInst* inst = 0; const Item_Struct* item = 0; - for(int i=0; i<=21; ++i) { + for(int i = EmuConstants::EQUIPMENT_BEGIN; i <= EmuConstants::EQUIPMENT_END; ++i) { inst = GetBotItem(i); if(inst) { item = inst->GetItem(); @@ -11260,7 +11260,7 @@ void Bot::ProcessBotInspectionRequest(Bot* inspectedBot, Client* client) { // Modded to display power source items (will only show up on SoF+ client inspect windows though.) // I don't think bots are currently coded to use them..but, you'll have to use '#bot inventory list' // to see them on a Titanium client when/if they are activated. -U - for(int16 L = 0; L <= 20; L++) { + for(int16 L = EmuConstants::EQUIPMENT_BEGIN; L <= MainWaist; L++) { inst = inspectedBot->GetBotItem(L); if(inst) { @@ -11274,28 +11274,28 @@ void Bot::ProcessBotInspectionRequest(Bot* inspectedBot, Client* client) { } } - inst = inspectedBot->GetBotItem(9999); + inst = inspectedBot->GetBotItem(MainPowerSource); if(inst) { item = inst->GetItem(); if(item) { - strcpy(insr->itemnames[21], item->Name); - insr->itemicons[21] = item->Icon; + strcpy(insr->itemnames[SoF::slots::MainPowerSource], item->Name); + insr->itemicons[SoF::slots::MainPowerSource] = item->Icon; } else - insr->itemicons[21] = 0xFFFFFFFF; + insr->itemicons[SoF::slots::MainPowerSource] = 0xFFFFFFFF; } - inst = inspectedBot->GetBotItem(21); + inst = inspectedBot->GetBotItem(MainAmmo); if(inst) { item = inst->GetItem(); if(item) { - strcpy(insr->itemnames[22], item->Name); - insr->itemicons[22] = item->Icon; + strcpy(insr->itemnames[SoF::slots::MainAmmo], item->Name); + insr->itemicons[SoF::slots::MainAmmo] = item->Icon; } else - insr->itemicons[22] = 0xFFFFFFFF; + insr->itemicons[SoF::slots::MainAmmo] = 0xFFFFFFFF; } strcpy(insr->text, inspectedBot->GetInspectMessage().text); @@ -11309,10 +11309,10 @@ void Bot::CalcItemBonuses() memset(&itembonuses, 0, sizeof(StatBonuses)); const Item_Struct* itemtmp = 0; - for(int i=0; i<=21; ++i) { + for (int i = EmuConstants::EQUIPMENT_BEGIN; i <= EmuConstants::EQUIPMENT_END; ++i) { const ItemInst* item = GetBotItem(i); if(item) { - for(int j=0; j<=4; ++j) { + for(int j = AUG_BEGIN; j < EmuConstants::ITEM_COMMON_SIZE; ++j) { const ItemInst* aug = item->GetAugment(j); if(aug) { itemtmp = aug->GetItem(); @@ -11739,7 +11739,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { if(!strcasecmp(sep->arg[1], "augmentitem")) { AugmentItem_Struct* in_augment = new AugmentItem_Struct[sizeof(AugmentItem_Struct)]; - in_augment->container_slot = 1000; + in_augment->container_slot = 1000; // in_augment->unknown02[0] = 0; in_augment->unknown02[1] = 0; in_augment->augment_slot = -1; @@ -12155,13 +12155,13 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { return; } - const char* equipped[22] = {"Charm", "Left Ear", "Head", "Face", "Right Ear", "Neck", "Shoulders", "Arms", "Back", + const char* equipped[EmuConstants::EQUIPMENT_SIZE] = {"Charm", "Left Ear", "Head", "Face", "Right Ear", "Neck", "Shoulders", "Arms", "Back", "Left Wrist", "Right Wrist", "Range", "Hands", "Primary Hand", "Secondary Hand", "Left Finger", "Right Finger", "Chest", "Legs", "Feet", "Waist", "Ammo" }; const ItemInst* item1 = nullptr; const Item_Struct* item2 = nullptr; bool is2Hweapon = false; - for(int i=0; i<22; ++i) + for(int i = EmuConstants::EQUIPMENT_BEGIN; i <= EmuConstants::EQUIPMENT_END; ++i) { if((i == MainSecondary) && is2Hweapon) { continue; @@ -12282,11 +12282,11 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { return; int slotId = atoi(sep->arg[3]); - if(slotId > 21 || slotId < 0) { + if(slotId > EmuConstants::EQUIPMENT_END || slotId < EmuConstants::EQUIPMENT_BEGIN) { c->Message(15, "A bot has 21 slots in its inventory, please choose a slot between 0 and 21."); return; } - const char* equipped[22] = {"Charm", "Left Ear", "Head", "Face", "Right Ear", "Neck", "Shoulders", "Arms", "Back", + const char* equipped[EmuConstants::EQUIPMENT_SIZE] = {"Charm", "Left Ear", "Head", "Face", "Right Ear", "Neck", "Shoulders", "Arms", "Back", "Left Wrist", "Right Wrist", "Range", "Hands", "Primary Hand", "Secondary Hand", "Left Finger", "Right Finger", "Chest", "Legs", "Feet", "Waist", "Ammo" }; @@ -12303,7 +12303,7 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { // Don't allow the player to remove a lore item they already possess and cause a crash bool failedLoreCheck = false; if(itminst) { - for (int m = 0; mGetAugment(m); if(itma) { @@ -14259,10 +14259,10 @@ void Bot::ProcessBotCommands(Client *c, const Seperator *sep) { Mob *target = c->GetTarget(); if(target && target->IsBot()) { - for(int i=0; i<9; i++) { + for(int i = EmuConstants::MATERIAL_BEGIN; i <= EmuConstants::MATERIAL_END; i++) { c->Message(15,"Equiped slot: %i , item: %i \n", i, target->CastToBot()->GetEquipment(i)); } - if(target->CastToBot()->GetEquipment(8) > 0) + if(target->CastToBot()->GetEquipment(MaterialSecondary) > 0) c->Message(15,"This bot has an item in off-hand."); } return; @@ -16512,7 +16512,7 @@ int Bot::GetRawACNoShield(int &shield_ac) { ac -= inst->GetItem()->AC; shield_ac = inst->GetItem()->AC; - for (uint8 i = 0; i < EmuConstants::ITEM_COMMON_SIZE; i++) + for (uint8 i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { if(inst->GetAugment(i)) { @@ -16531,7 +16531,7 @@ uint32 Bot::CalcCurrentWeight() { ItemInst* inst; uint32 Total = 0; - for(int i=0; i<=21; ++i) { + for(int i = EmuConstants::EQUIPMENT_BEGIN; i <= EmuConstants::EQUIPMENT_END; ++i) { inst = GetBotItem(i); if(inst) { TempItem = inst->GetItem(); diff --git a/zone/client.cpp b/zone/client.cpp index 0d3a8e683..6b7828f1d 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -5333,7 +5333,7 @@ bool Client::TryReward(uint32 claim_id) //save uint32 free_slot = 0xFFFFFFFF; - for(int i = 22; i < 30; ++i) + for(int i = EmuConstants::GENERAL_BEGIN; i <= EmuConstants::GENERAL_END; ++i) { ItemInst *item = GetInv().GetItem(i); if(!item) @@ -7836,7 +7836,7 @@ void Client::TickItemCheck() TryItemTick(i); } //Scan main inventory + cursor - for(i = EmuConstants::GENERAL_BEGIN; i <= EmuConstants::CURSOR; i++) + for(i = EmuConstants::GENERAL_BEGIN; i <= MainCursor; i++) { TryItemTick(i); } @@ -7857,7 +7857,7 @@ void Client::TryItemTick(int slot) if(zone->tick_items.count(iid) > 0) { - if( GetLevel() >= zone->tick_items[iid].level && MakeRandomInt(0, 100) >= (100 - zone->tick_items[iid].chance) && (zone->tick_items[iid].bagslot || slot < 22) ) + if( GetLevel() >= zone->tick_items[iid].level && MakeRandomInt(0, 100) >= (100 - zone->tick_items[iid].chance) && (zone->tick_items[iid].bagslot || slot <= EmuConstants::EQUIPMENT_END) ) { ItemInst* e_inst = (ItemInst*)inst; parse->EventItem(EVENT_ITEM_TICK, this, e_inst, nullptr, "", slot); @@ -7893,7 +7893,7 @@ void Client::ItemTimerCheck() TryItemTimer(i); } - for(i = EmuConstants::GENERAL_BAGS_BEGIN; i <= EmuConstants::CURSOR; i++) + for(i = EmuConstants::GENERAL_BAGS_BEGIN; i <= MainCursor; i++) { TryItemTimer(i); } diff --git a/zone/client.h b/zone/client.h index 9423ac535..cce84673c 100644 --- a/zone/client.h +++ b/zone/client.h @@ -1043,9 +1043,9 @@ public: void MarkSingleCompassLoc(float in_x, float in_y, float in_z, uint8 count=1); void CalcItemScale(); - bool CalcItemScale(uint32 slot_x, uint32 slot_y); + bool CalcItemScale(uint32 slot_x, uint32 slot_y); // behavior change: 'slot_y' is now [RANGE]_END and not [RANGE]_END + 1 void DoItemEnterZone(); - bool DoItemEnterZone(uint32 slot_x, uint32 slot_y); + bool DoItemEnterZone(uint32 slot_x, uint32 slot_y); // behavior change: 'slot_y' is now [RANGE]_END and not [RANGE]_END + 1 void SummonAndRezzAllCorpses(); void SummonAllCorpses(float dest_x, float dest_y, float dest_z, float dest_heading); void DepopAllCorpses(); diff --git a/zone/client_mods.cpp b/zone/client_mods.cpp index f62c6f5c2..66eeb9d11 100644 --- a/zone/client_mods.cpp +++ b/zone/client_mods.cpp @@ -449,7 +449,8 @@ uint32 Client::GetClassHPFactor() { int16 Client::GetRawItemAC() { int16 Total = 0; - for (int16 slot_id=0; slot_id<21; slot_id++) { + // this skips MainAmmo..add an '=' conditional if that slot is required (original behavior) + for (int16 slot_id = EmuConstants::EQUIPMENT_BEGIN; slot_id < EmuConstants::EQUIPMENT_END; slot_id++) { const ItemInst* inst = m_inv[slot_id]; if (inst && inst->IsType(ItemClassCommon)) { Total += inst->GetItem()->AC; @@ -1127,7 +1128,7 @@ uint32 Client::CalcCurrentWeight() { ItemInst* ins; uint32 Total = 0; int x; - for(x = EmuConstants::EQUIPMENT_BEGIN; x <= EmuConstants::CURSOR; x++) // include cursor or not? + for(x = EmuConstants::EQUIPMENT_BEGIN; x <= MainCursor; x++) // include cursor or not? { TempItem = 0; ins = GetInv().GetItem(x); @@ -1147,11 +1148,11 @@ uint32 Client::CalcCurrentWeight() { TmpWeight = TempItem->Weight; if (TmpWeight > 0) { - // this code indicates that weight redux bags canonly be in the first general inventory slot to be effective... + // this code indicates that weight redux bags can only be in the first general inventory slot to be effective... // is this correct? or can we scan for the highest weight redux and use that? (need client verifications) int bagslot = MainGeneral1; int reduction = 0; - for (int m = MainGeneral2; m <= EmuConstants::GENERAL_BAGS_END; m += 10) // include cursor bags or not? + for (int m = EmuConstants::GENERAL_BAGS_BEGIN + 10; m <= EmuConstants::GENERAL_BAGS_END; m += 10) // include cursor bags or not? { if (x >= m) bagslot += 1; @@ -1977,7 +1978,7 @@ int Client::GetRawACNoShield(int &shield_ac) const { ac -= inst->GetItem()->AC; shield_ac = inst->GetItem()->AC; - for (uint8 i = 0; i < EmuConstants::ITEM_COMMON_SIZE; i++) + for (uint8 i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { if(inst->GetAugment(i)) { diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 314e82513..01e768c1f 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -4520,7 +4520,7 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app) } return; } - else if ((castspell->inventoryslot < 30) || (castspell->slot == POTION_BELT_SPELL_SLOT)) // sanity check + else if ((castspell->inventoryslot <= EmuConstants::GENERAL_END) || (castspell->slot == POTION_BELT_SPELL_SLOT)) // sanity check { const ItemInst* inst = m_inv[castspell->inventoryslot]; //slot values are int16, need to check packet on this field //bool cancast = true; @@ -4585,7 +4585,7 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app) } else { - Message(0, "Error: castspell->inventoryslot >= 30 (0x%04x)", castspell->inventoryslot); + Message(0, "Error: castspell->inventoryslot >= %i (0x%04x)", MainCursor, castspell->inventoryslot); InterruptSpell(castspell->spell_id); } } @@ -4886,7 +4886,7 @@ void Client::Handle_OP_TradeAcceptClick(const EQApplicationPacket *app) uint16 trade_count = 0; // Item trade count for packet sizing - for(int16 slot_id=3000; slot_id<=3007; slot_id++) { + for(int16 slot_id = EmuConstants::TRADE_BEGIN; slot_id <= EmuConstants::TRADE_END; slot_id++) { if(other->GetInv().GetItem(slot_id)) { trade_count += other->GetInv().GetItem(slot_id)->GetTotalItemCount(); } if(m_inv[slot_id]) { trade_count += m_inv[slot_id]->GetTotalItemCount(); } } @@ -4926,7 +4926,7 @@ void Client::Handle_OP_TradeAcceptClick(const EQApplicationPacket *app) if(RuleB(QueryServ, PlayerLogHandins)) { uint16 handin_count = 0; - for(int16 slot_id=3000; slot_id<=3003; slot_id++) { + for(int16 slot_id = EmuConstants::TRADE_BEGIN; slot_id <= EmuConstants::TRADE_NPC_END; slot_id++) { if(m_inv[slot_id]) { handin_count += m_inv[slot_id]->GetTotalItemCount(); } } @@ -6781,7 +6781,7 @@ void Client::Handle_OP_InspectAnswer(const EQApplicationPacket *app) { Mob* tmp = entity_list.GetMob(insr->TargetID); const Item_Struct* item = nullptr; - for (int16 L = 0; L <= 20; L++) { + for (int16 L = EmuConstants::EQUIPMENT_BEGIN; L <= MainWaist; L++) { const ItemInst* inst = GetInv().GetItem(L); item = inst ? inst->GetItem() : nullptr; diff --git a/zone/client_process.cpp b/zone/client_process.cpp index 19449dbbf..f500b22ec 100644 --- a/zone/client_process.cpp +++ b/zone/client_process.cpp @@ -816,12 +816,11 @@ void Client::OnDisconnect(bool hard_disconnect) { //#ifdef ITEMCOMBINED void Client::BulkSendInventoryItems() { - // For future reference: Only the parent item needs to be sent..the ItemInst already contains child ItemInst information int16 slot_id = 0; // LINKDEAD TRADE ITEMS // Move trade slot items back into normal inventory..need them there now for the proceeding validity checks -U - for(slot_id = 3000; slot_id <= 3007; slot_id++) { + for(slot_id = EmuConstants::TRADE_BEGIN; slot_id <= EmuConstants::TRADE_END; slot_id++) { ItemInst* inst = m_inv.PopItem(slot_id); if(inst) { bool is_arrow = (inst->GetItem()->ItemType == ItemTypeArrow) ? true : false; @@ -867,7 +866,7 @@ void Client::BulkSendInventoryItems() { std::map::iterator itr; //Inventory items - for(slot_id = 0; slot_id <= 30; slot_id++) { + for(slot_id = MAP_BEGIN; slot_id < EmuConstants::MAP_POSSESSIONS_SIZE; slot_id++) { const ItemInst* inst = m_inv[slot_id]; if(inst) { std::string packet = inst->Serialize(slot_id); @@ -887,7 +886,7 @@ void Client::BulkSendInventoryItems() { } // Bank items - for(slot_id = 2000; slot_id <= 2023; slot_id++) { + for(slot_id = EmuConstants::BANK_BEGIN; slot_id <= EmuConstants::BANK_END; slot_id++) { const ItemInst* inst = m_inv[slot_id]; if(inst) { std::string packet = inst->Serialize(slot_id); @@ -897,7 +896,7 @@ void Client::BulkSendInventoryItems() { } // Shared Bank items - for(slot_id = 2500; slot_id <= 2501; slot_id++) { + for(slot_id = EmuConstants::SHARED_BANK_BEGIN; slot_id <= EmuConstants::SHARED_BANK_END; slot_id++) { const ItemInst* inst = m_inv[slot_id]; if(inst) { std::string packet = inst->Serialize(slot_id); @@ -928,14 +927,14 @@ void Client::BulkSendInventoryItems() if(deletenorent){//client was offline for more than 30 minutes, delete no rent items RemoveNoRent(); } - for (slot_id=0; slot_id<=30; slot_id++) { + for (slot_id=EmuConstants::POSSESSIONS_BEGIN; slot_id<=EmuConstants::POSSESSIONS_END; slot_id++) { const ItemInst* inst = m_inv[slot_id]; if (inst){ SendItemPacket(slot_id, inst, ItemPacketCharInventory); } } // Bank items - for (slot_id=2000; slot_id<=2015; slot_id++) { + for (slot_id=EmuConstants::BANK_BEGIN; slot_id<=EmuConstants::BANK_END; slot_id++) { // 2015... const ItemInst* inst = m_inv[slot_id]; if (inst){ SendItemPacket(slot_id, inst, ItemPacketCharInventory); @@ -943,7 +942,7 @@ void Client::BulkSendInventoryItems() } // Shared Bank items - for (slot_id=2500; slot_id<=2501; slot_id++) { + for (slot_id=EmuConstants::SHARED_BANK_BEGIN; slot_id<=EmuConstants::SHARED_BANK_END; slot_id++) { const ItemInst* inst = m_inv[slot_id]; if (inst){ SendItemPacket(slot_id, inst, ItemPacketCharInventory); @@ -953,7 +952,7 @@ void Client::BulkSendInventoryItems() // LINKDEAD TRADE ITEMS // If player went LD during a trade, they have items in the trade inventory // slots. These items are now being put into their inventory (then queue up on cursor) - for (int16 trade_slot_id=3000; trade_slot_id<=3007; trade_slot_id++) { + for (int16 trade_slot_id=EmuConstants::TRADE_BEGIN; trade_slot_id<=EmuConstants::TRADE_END; trade_slot_id++) { const ItemInst* inst = m_inv[slot_id]; if (inst) { int16 free_slot_id = m_inv.FindFreeSlot(inst->IsType(ItemClassContainer), true, inst->GetItem()->Size); diff --git a/zone/command.cpp b/zone/command.cpp index ad485391a..11f60bfd1 100644 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -2704,14 +2704,14 @@ void command_texture(Client *c, const Seperator *sep) // Player Races Wear Armor, so Wearchange is sent instead int i; if (!c->GetTarget()) - for (i = 0; i < 7; i++) + for (i = EmuConstants::MATERIAL_BEGIN; i <= EmuConstants::MATERIAL_TINT_END; i++) { c->SendTextureWC(i, texture); } else if ((c->GetTarget()->GetRace() > 0 && c->GetTarget()->GetRace() <= 12) || c->GetTarget()->GetRace() == 128 || c->GetTarget()->GetRace() == 130 || c->GetTarget()->GetRace() == 330 || c->GetTarget()->GetRace() == 522) { - for (i = 0; i < 7; i++) + for (i = EmuConstants::MATERIAL_BEGIN; i <= EmuConstants::MATERIAL_TINT_END; i++) { c->GetTarget()->SendTextureWC(i, texture); } @@ -2892,11 +2892,12 @@ void command_peekinv(Client *c, const Seperator *sep) if (bAll || (strcasecmp(sep->arg[1], "worn")==0)) { // Worn items bFound = true; - for (int16 i=0; i<=21; i++) { + for (int16 i = EmuConstants::EQUIPMENT_BEGIN; i <= EmuConstants::EQUIPMENT_END; i++) { const ItemInst* inst = client->GetInv().GetItem(i); item = (inst) ? inst->GetItem() : nullptr; if (c->GetClientVersion() >= EQClientSoF) { + // this kind of stuff needs to be pushed to the client translators c->Message((item==0), "WornSlot: %i, Item: %i (%c%06X00000000000000000000000000000000000000000000%s%c), Charges: %i", i, ((item==0)?0:item->ID),0x12, ((item==0)?0:item->ID), ((item==0)?"null":item->Name), 0x12, @@ -2914,7 +2915,7 @@ void command_peekinv(Client *c, const Seperator *sep) if (bAll || (strcasecmp(sep->arg[1], "inv")==0)) { // Personal inventory items bFound = true; - for (int16 i=22; i<=29; i++) { + for (int16 i = EmuConstants::GENERAL_BEGIN; i <= EmuConstants::GENERAL_END; i++) { const ItemInst* inst = client->GetInv().GetItem(i); item = (inst) ? inst->GetItem() : nullptr; if (c->GetClientVersion() >= EQClientSoF) @@ -2933,7 +2934,7 @@ void command_peekinv(Client *c, const Seperator *sep) } if (inst && inst->IsType(ItemClassContainer)) { - for (uint8 j=0; j<10; j++) { + for (uint8 j = SUB_BEGIN; j < EmuConstants::ITEM_CONTAINER_SIZE; j++) { const ItemInst* instbag = client->GetInv().GetItem(i, j); item = (instbag) ? instbag->GetItem() : nullptr; if (c->GetClientVersion() >= EQClientSoF) @@ -3006,7 +3007,7 @@ void command_peekinv(Client *c, const Seperator *sep) } if (inst && inst->IsType(ItemClassContainer) && i==0) { // 'CSD 1' - only display contents of slot 30[0] container..higher ones don't exist - for (uint8 j=0; j<10; j++) { + for (uint8 j = SUB_BEGIN; j < EmuConstants::ITEM_CONTAINER_SIZE; j++) { const ItemInst* instbag = client->GetInv().GetItem(MainCursor, j); item = (instbag) ? instbag->GetItem() : nullptr; if (c->GetClientVersion() >= EQClientSoF) @@ -3058,7 +3059,7 @@ void command_peekinv(Client *c, const Seperator *sep) // Bank and shared bank items bFound = true; int16 i = 0; - for (i=2000; i<=2023; i++) { + for (i = EmuConstants::BANK_BEGIN; i <= EmuConstants::BANK_END; i++) { const ItemInst* inst = client->GetInv().GetItem(i); item = (inst) ? inst->GetItem() : nullptr; if (c->GetClientVersion() >= EQClientSoF) @@ -3077,7 +3078,7 @@ void command_peekinv(Client *c, const Seperator *sep) } if (inst && inst->IsType(ItemClassContainer)) { - for (uint8 j=0; j<10; j++) { + for (uint8 j = SUB_BEGIN; j < EmuConstants::ITEM_CONTAINER_SIZE; j++) { const ItemInst* instbag = client->GetInv().GetItem(i, j); item = (instbag) ? instbag->GetItem() : nullptr; if (c->GetClientVersion() >= EQClientSoF) @@ -3099,7 +3100,7 @@ void command_peekinv(Client *c, const Seperator *sep) } } } - for (i=2500; i<=2501; i++) { + for (i = EmuConstants::SHARED_BANK_BEGIN; i <= EmuConstants::SHARED_BANK_END; i++) { const ItemInst* inst = client->GetInv().GetItem(i); item = (inst) ? inst->GetItem() : nullptr; if (c->GetClientVersion() >= EQClientSoF) @@ -3118,7 +3119,7 @@ void command_peekinv(Client *c, const Seperator *sep) } if (inst && inst->IsType(ItemClassContainer)) { - for (uint8 j=0; j<10; j++) { + for (uint8 j = SUB_BEGIN; j < EmuConstants::ITEM_CONTAINER_SIZE; j++) { const ItemInst* instbag = client->GetInv().GetItem(i, j); item = (instbag) ? instbag->GetItem() : nullptr; if (c->GetClientVersion() >= EQClientSoF) @@ -3144,7 +3145,7 @@ void command_peekinv(Client *c, const Seperator *sep) if (bAll || (strcasecmp(sep->arg[1], "trade")==0)) { // Items in trade window (current trader only, not the other trader) bFound = true; - for (int16 i=3000; i<=3007; i++) { + for (int16 i = EmuConstants::TRADE_BEGIN; i <= EmuConstants::TRADE_END; i++) { const ItemInst* inst = client->GetInv().GetItem(i); item = (inst) ? inst->GetItem() : nullptr; if (c->GetClientVersion() >= EQClientSoF) @@ -3163,7 +3164,7 @@ void command_peekinv(Client *c, const Seperator *sep) } if (inst && inst->IsType(ItemClassContainer)) { - for (uint8 j=0; j<10; j++) { + for (uint8 j = SUB_BEGIN; j < EmuConstants::ITEM_CONTAINER_SIZE; j++) { const ItemInst* instbag = client->GetInv().GetItem(i, j); item = (instbag) ? instbag->GetItem() : nullptr; if (c->GetClientVersion() >= EQClientSoF) @@ -3532,7 +3533,7 @@ void command_listpetition(Client *c, const Seperator *sep) void command_equipitem(Client *c, const Seperator *sep) { uint32 slot_id = atoi(sep->arg[1]); - if (sep->IsNumber(1) && (slot_id>=0) && (slot_id<=21)) { + if (sep->IsNumber(1) && ((slot_id >= EmuConstants::EQUIPMENT_BEGIN) && (slot_id <= EmuConstants::EQUIPMENT_END) || (slot_id == MainPowerSource))) { const ItemInst* from_inst = c->GetInv().GetItem(MainCursor); const ItemInst* to_inst = c->GetInv().GetItem(slot_id); // added (desync issue when forcing stack to stack) bool partialmove = false; @@ -3568,6 +3569,8 @@ void command_equipitem(Client *c, const Seperator *sep) else if(c->SwapItem(mi)) { c->FastQueuePacket(&outapp); + // if the below code is still needed..just send an an item trade packet to each slot..it should overwrite the client instance + // below code has proper logic, but client does not like to have cursor charges changed // (we could delete the cursor item and resend, but issues would arise if there are queued items) //if (partialmove) { @@ -7776,16 +7779,19 @@ void command_path(Client *c, const Seperator *sep) } void Client::Undye() { - for (int cur_slot = 0; cur_slot < 9 ; cur_slot++ ){ + for (int cur_slot = EmuConstants::MATERIAL_BEGIN; cur_slot <= EmuConstants::MATERIAL_END; cur_slot++ ) { uint8 slot2=SlotConvert(cur_slot); ItemInst* inst = m_inv.GetItem(slot2); + if(inst != nullptr) { inst->SetColor(inst->GetItem()->Color); database.SaveInventory(CharacterID(), inst, slot2); } + m_pp.item_tint[cur_slot].color = 0; SendWearChange(cur_slot); } + Save(0); } @@ -11415,7 +11421,7 @@ void command_augmentitem(Client *c, const Seperator *sep) return; AugmentItem_Struct* in_augment = new AugmentItem_Struct[sizeof(AugmentItem_Struct)]; - in_augment->container_slot = 1000; + in_augment->container_slot = 1000; // in_augment->unknown02[0] = 0; in_augment->unknown02[1] = 0; in_augment->augment_slot = -1; diff --git a/zone/corpse.cpp b/zone/corpse.cpp index 4a9ba5541..d6b34d4bd 100644 --- a/zone/corpse.cpp +++ b/zone/corpse.cpp @@ -364,9 +364,9 @@ Corpse::Corpse(Client* client, int32 in_rezexp) // worn + inventory + cursor std::list removed_list; bool cursor = false; - for(i = 0; i <= 30; i++) + for(i = MAP_BEGIN; i < EmuConstants::MAP_POSSESSIONS_SIZE; i++) { - if(i == 21 && client->GetClientVersion() >= EQClientSoF) { + if(i == MainAmmo && client->GetClientVersion() >= EQClientSoF) { item = client->GetInv().GetItem(MainPowerSource); if((item && (!client->IsBecomeNPC())) || (item && client->IsBecomeNPC() && !item->GetItem()->NoRent)) { std::list slot_list = MoveItemToCorpse(client, item, MainPowerSource); @@ -449,9 +449,9 @@ std::list Corpse::MoveItemToCorpse(Client *client, ItemInst *item, int16 returnlist.push_back(equipslot); // Qualified bag slot iterations. processing bag slots that don't exist is probably not a good idea. - if(item->IsType(ItemClassContainer) && ((equipslot >= 22 && equipslot <=30))) // Limit the bag check to inventory and cursor slots. + if(item->IsType(ItemClassContainer) && ((equipslot >= EmuConstants::GENERAL_BEGIN && equipslot <= MainCursor))) // Limit the bag check to inventory and cursor slots. { - for(bagindex = 0; bagindex <= 9; bagindex++) + for(bagindex = SUB_BEGIN; bagindex <= EmuConstants::ITEM_CONTAINER_SIZE; bagindex++) { // For empty bags in cursor queue, slot was previously being resolved as SLOT_INVALID (-1) interior_slot = Inventory::CalcSlotId(equipslot, bagindex); @@ -685,7 +685,7 @@ ServerLootItem_Struct* Corpse::GetItem(uint16 lootslot, ServerLootItem_Struct** if (sitem && bag_item_data && Inventory::SupportsContainers(sitem->equipSlot)) { - int16 bagstart = Inventory::CalcSlotId(sitem->equipSlot, 0); + int16 bagstart = Inventory::CalcSlotId(sitem->equipSlot, SUB_BEGIN); cur = itemlist.begin(); end = itemlist.end(); @@ -750,7 +750,7 @@ void Corpse::RemoveItem(ServerLootItem_Struct* item_data) itemlist.erase(cur); material = Inventory::CalcMaterialFromSlot(sitem->equipSlot); - if(material != 0xFF) + if(material != _MaterialInvalid) SendWearChange(material); safe_delete(sitem); @@ -983,7 +983,7 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a const Item_Struct* item = database.GetItem(pkitem); ItemInst* inst = database.CreateItem(item, item->MaxCharges); if(inst) { - client->SendItemPacket(22, inst, ItemPacketLoot); + client->SendItemPacket(EmuConstants::CORPSE_BEGIN, inst, ItemPacketLoot); safe_delete(inst); } else { client->Message(13, "Could not find item number %i to send!!", GetPKItem()); } @@ -1016,7 +1016,8 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a if(client && item) { ItemInst* inst = database.CreateItem(item, item_data->charges, item_data->aug1, item_data->aug2, item_data->aug3, item_data->aug4, item_data->aug5); if(inst) { - client->SendItemPacket(i + 22, inst, ItemPacketLoot); // 22 is the corpse inventory start offset for Ti(EMu) + // MainGeneral1 is the corpse inventory start offset for Ti(EMu) - CORPSE_END = MainGeneral1 + MainCursor + client->SendItemPacket(i + EmuConstants::CORPSE_BEGIN, inst, ItemPacketLoot); safe_delete(inst); } @@ -1110,9 +1111,9 @@ void Corpse::LootItem(Client* client, const EQApplicationPacket* app) if(GetPKItem()>1) item = database.GetItem(GetPKItem()); else if(GetPKItem()==-1 || GetPKItem()==1) - item_data = GetItem(lootitem->slot_id - 22); //dont allow them to loot entire bags of items as pvp reward + item_data = GetItem(lootitem->slot_id - EmuConstants::CORPSE_BEGIN); //dont allow them to loot entire bags of items as pvp reward else - item_data = GetItem(lootitem->slot_id - 22, bag_item_data); + item_data = GetItem(lootitem->slot_id - EmuConstants::CORPSE_BEGIN, bag_item_data); if (GetPKItem()<=1 && item_data != 0) { @@ -1141,7 +1142,7 @@ void Corpse::LootItem(Client* client, const EQApplicationPacket* app) if(inst->IsAugmented()) { - for (int i = 0; iGetAugment(i); if(itm) @@ -1238,7 +1239,7 @@ void Corpse::LootItem(Client* client, const EQApplicationPacket* app) // remove bag contents too if (item->ItemClass == ItemClassContainer && (GetPKItem()!=-1 || GetPKItem()!=1)) { - for (int i=0; i < 10; i++) + for (int i = SUB_BEGIN; i < EmuConstants::ITEM_CONTAINER_SIZE; i++) { if (bag_item_data[i]) { @@ -1971,14 +1972,14 @@ bool ZoneDatabase::DeletePlayerCorpse(uint32 dbid) { uint32 Corpse::GetEquipment(uint8 material_slot) const { int invslot; - if(material_slot > 8) + if(material_slot > EmuConstants::MATERIAL_END) { - return 0; + return NO_ITEM; } invslot = Inventory::CalcSlotFromMaterial(material_slot); - if(invslot == -1) - return 0; + if(invslot == INVALID_INDEX) // GetWornItem() should be returning a NO_ITEM for any invalid index... + return NO_ITEM; return GetWornItem(invslot); } @@ -1986,13 +1987,13 @@ uint32 Corpse::GetEquipment(uint8 material_slot) const { uint32 Corpse::GetEquipmentColor(uint8 material_slot) const { const Item_Struct *item; - if(material_slot > 8) + if(material_slot > EmuConstants::MATERIAL_END) { return 0; } item = database.GetItem(GetEquipment(material_slot)); - if(item != 0) + if(item != NO_ITEM) { return item_tint[material_slot].rgb.use_tint ? item_tint[material_slot].color : @@ -2054,6 +2055,17 @@ void Corpse::LoadPlayerCorpseDecayTime(uint32 dbid){ safe_delete_array(query); } +/* +uint32 Corpse::ServerToCorpseSlot(int16 server_slot) { + // reserved +} +*/ +/* +int16 Corpse::CorpseToServerSlot(uint32 corpse_slot) { + // reserved +} +*/ + /* void Corpse::CastRezz(uint16 spellid, Mob* Caster){ if(Rezzed()){ diff --git a/zone/corpse.h b/zone/corpse.h index cc274a319..e76b3b4ce 100644 --- a/zone/corpse.h +++ b/zone/corpse.h @@ -111,6 +111,10 @@ public: uint32 GetEquipmentColor(uint8 material_slot) const; inline int GetRezzExp() { return rezzexp; } + // these are a temporary work-around until corpse inventory is removed from the database blob + //static uint32 ServerToCorpseSlot(int16 server_slot); // encode + //static int16 CorpseToServerSlot(uint32 corpse_slot); // decode + protected: std::list MoveItemToCorpse(Client *client, ItemInst *item, int16 equipslot); diff --git a/zone/inventory.cpp b/zone/inventory.cpp index 553a2f456..9ea9749a0 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -253,7 +253,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, bool enforcerestr = RuleB(Inventory, EnforceAugmentRestriction); bool enforceusable = RuleB(Inventory, EnforceAugmentUsability); - for (int iter = 0; iter < EmuConstants::ITEM_COMMON_SIZE; ++iter) { + for (int iter = AUG_BEGIN; iter < EmuConstants::ITEM_COMMON_SIZE; ++iter) { const Item_Struct* augtest = database.GetItem(augments[iter]); if(augtest == nullptr) { @@ -547,7 +547,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, } // add any validated augments - for (int iter = 0; iter < EmuConstants::ITEM_COMMON_SIZE; ++iter) { + for (int iter = AUG_BEGIN; iter < EmuConstants::ITEM_COMMON_SIZE; ++iter) { if(augments[iter]) inst->PutAugment(&database, iter, augments[iter]); } @@ -585,7 +585,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, if(!IsDiscovered(item_id)) DiscoverItem(item_id); - for (int iter = 0; iter < EmuConstants::ITEM_COMMON_SIZE; ++iter) { + for (int iter = AUG_BEGIN; iter < EmuConstants::ITEM_COMMON_SIZE; ++iter) { if(augments[iter] && !IsDiscovered(augments[iter])) DiscoverItem(augments[iter]); } @@ -727,7 +727,7 @@ void Client::DeleteItemInInventory(int16 slot_id, int8 quantity, bool client_upd qsaudit->items[parent_offset].aug_5 = m_inv[slot_id]->GetAugmentItemID(5); if(m_inv[slot_id]->IsType(ItemClassContainer)) { - for(uint8 bag_idx = 0; bag_idx < m_inv[slot_id]->GetItem()->BagSlots; bag_idx++) { + for(uint8 bag_idx = SUB_BEGIN; bag_idx < m_inv[slot_id]->GetItem()->BagSlots; bag_idx++) { ItemInst* bagitem = m_inv[slot_id]->GetItem(bag_idx); if(bagitem) { @@ -853,7 +853,7 @@ void Client::PutLootInInventory(int16 slot_id, const ItemInst &inst, ServerLootI { int16 interior_slot; // solar: our bag went into slot_id, now let's pack the contents in - for(int i = 0; i < 10; i++) + for(int i = SUB_BEGIN; i < EmuConstants::ITEM_CONTAINER_SIZE; i++) { if(bag_item_data[i] == nullptr) continue; @@ -872,7 +872,7 @@ bool Client::TryStacking(ItemInst* item, uint8 type, bool try_worn, bool try_cur return false; int16 i; uint32 item_id = item->GetItem()->ID; - for (i = 22; i <= 29; i++) + for (i = EmuConstants::GENERAL_BEGIN; i <= EmuConstants::GENERAL_END; i++) { ItemInst* tmp_inst = m_inv.GetItem(i); if(tmp_inst && tmp_inst->GetItem()->ID == item_id && tmp_inst->GetCharges() < tmp_inst->GetItem()->StackSize){ @@ -883,9 +883,9 @@ bool Client::TryStacking(ItemInst* item, uint8 type, bool try_worn, bool try_cur return true; } } - for (i = 22; i <= 29; i++) + for (i = EmuConstants::GENERAL_BEGIN; i <= EmuConstants::GENERAL_END; i++) { - for (uint8 j = 0; j < 10; j++) + for (uint8 j = SUB_BEGIN; j < EmuConstants::ITEM_CONTAINER_SIZE; j++) { uint16 slotid = Inventory::CalcSlotId(i, j); ItemInst* tmp_inst = m_inv.GetItem(slotid); @@ -909,10 +909,11 @@ bool Client::AutoPutLootInInventory(ItemInst& inst, bool try_worn, bool try_curs // #1: Try to auto equip if (try_worn && inst.IsEquipable(GetBaseRace(), GetClass()) && inst.GetItem()->ReqLevel<=level && !inst.GetItem()->Attuneable && inst.GetItem()->ItemType != ItemTypeAugmentation) { - for (int16 i = 0; i < 9999; i++) // originally (i < 22) + // too messy as-is... + for (int16 i = EmuConstants::EQUIPMENT_BEGIN; i < MainPowerSource; i++) // originally (i < 22) { - if (i == 22) { - if(this->GetClientVersion() >= EQClientSoF) { i = 9999; } // added power source check for SoF+ clients + if (i == EmuConstants::GENERAL_BEGIN) { + if(this->GetClientVersion() >= EQClientSoF) { i = MainPowerSource; } // added power source check for SoF+ clients else { break; } } @@ -949,7 +950,7 @@ bool Client::AutoPutLootInInventory(ItemInst& inst, bool try_worn, bool try_curs //send worn to everyone... PutLootInInventory(i, inst); uint8 worn_slot_material = Inventory::CalcMaterialFromSlot(i); - if(worn_slot_material != 0xFF) + if(worn_slot_material != _MaterialInvalid) { SendWearChange(worn_slot_material); } @@ -1225,7 +1226,7 @@ void Client::SendLootItemInPacket(const ItemInst* inst, int16 slot_id) bool Client::IsValidSlot(uint32 slot) { if ((slot == (uint32)INVALID_INDEX) || - (slot >= EmuConstants::POSSESSIONS_BEGIN && slot <= EmuConstants::POSSESSIONS_END) || + (slot >= MAP_BEGIN && slot < EmuConstants::MAP_POSSESSIONS_SIZE) || (slot >= EmuConstants::GENERAL_BAGS_BEGIN && slot <= EmuConstants::CURSOR_BAG_END) || (slot >= EmuConstants::TRIBUTE_BEGIN && slot <= EmuConstants::TRIBUTE_END) || (slot >= EmuConstants::BANK_BEGIN && slot <= EmuConstants::BANK_END) || @@ -1234,7 +1235,7 @@ bool Client::IsValidSlot(uint32 slot) { (slot >= EmuConstants::SHARED_BANK_BAGS_BEGIN && slot <= EmuConstants::SHARED_BANK_BAGS_END) || (slot >= EmuConstants::TRADE_BEGIN && slot <= EmuConstants::TRADE_END) || (slot >= EmuConstants::WORLD_BEGIN && slot <= EmuConstants::WORLD_END) || - (slot == EmuConstants::POWER_SOURCE)) + (slot == MainPowerSource)) return true; else return false; @@ -1242,10 +1243,10 @@ bool Client::IsValidSlot(uint32 slot) { bool Client::IsBankSlot(uint32 slot) { - if ((slot >= 2000 && slot <= 2023) || // Bank - (slot >= 2031 && slot <= 2270) || // Bank bags - (slot >= 2500 && slot <= 2501) || // Shared bank - (slot >= 2531 && slot <= 2550)) // Shared bank bags + if ((slot >= EmuConstants::BANK_BEGIN && slot <= EmuConstants::BANK_END) || + (slot >= EmuConstants::BANK_BAGS_BEGIN && slot <= EmuConstants::BANK_BAGS_END) || + (slot >= EmuConstants::SHARED_BANK_BEGIN && slot <= EmuConstants::SHARED_BANK_END) || + (slot >= EmuConstants::SHARED_BANK_BAGS_BEGIN && slot <= EmuConstants::SHARED_BANK_BAGS_END)) { return true; } @@ -1356,15 +1357,18 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { ItemInst* dstbag; uint32 srcbagid =0; uint32 dstbagid = 0; - if (src_slot_id>=250 && src_slot_id<330){ - srcbag=m_inv.GetItem(((int)(src_slot_id/10))-3); - if(srcbag) - srcbagid=srcbag->GetItem()->ID; + + //if (src_slot_id >= 250 && src_slot_id < 330) { + if (src_slot_id >= EmuConstants::GENERAL_BAGS_BEGIN && src_slot_id <= EmuConstants::GENERAL_BAGS_END) { + srcbag = m_inv.GetItem(((int)(src_slot_id / 10)) - 3); + if (srcbag) + srcbagid = srcbag->GetItem()->ID; } - if (dst_slot_id>=250 && dst_slot_id<330){ - dstbag=m_inv.GetItem(((int)(dst_slot_id/10))-3); - if(dstbag) - dstbagid=dstbag->GetItem()->ID; + //if (dst_slot_id >= 250 && dst_slot_id < 330) { + if (dst_slot_id >= EmuConstants::GENERAL_BAGS_BEGIN && dst_slot_id <= EmuConstants::GENERAL_BAGS_END) { + dstbag = m_inv.GetItem(((int)(dst_slot_id / 10)) - 3); + if (dstbag) + dstbagid = dstbag->GetItem()->ID; } if (srcitemid==17899 || srcbagid==17899 || dstitemid==17899 || dstbagid==17899){ this->Trader_EndTrader(); @@ -1374,7 +1378,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { // Step 2: Validate item in from_slot // After this, we can assume src_inst is a valid ptr - if (!src_inst && (src_slot_id<4000 || src_slot_id>4009)) { + if (!src_inst && (src_slot_id < EmuConstants::WORLD_BEGIN || src_slot_id > EmuConstants::WORLD_END)) { if (dst_inst) { // If there is no source item, but there is a destination item, // move the slots around before deleting the invalid source slot item, @@ -1388,14 +1392,14 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { return false; } //verify shared bank transactions in the database - if(src_inst && src_slot_id >= 2500 && src_slot_id <= 2550) { + if(src_inst && src_slot_id >= EmuConstants::SHARED_BANK_BEGIN && src_slot_id <= EmuConstants::SHARED_BANK_BAGS_END) { if(!database.VerifyInventory(account_id, src_slot_id, src_inst)) { LogFile->write(EQEMuLog::Error, "Player %s on account %s was found exploiting the shared bank.\n", GetName(), account_name); DeleteItemInInventory(dst_slot_id,0,true); return(false); } - if(src_slot_id >= 2500 && src_slot_id <= 2501 && src_inst->IsType(ItemClassContainer)){ - for (uint8 idx=0; idx<10; idx++) { + if(src_slot_id >= EmuConstants::SHARED_BANK_BEGIN && src_slot_id <= EmuConstants::SHARED_BANK_END && src_inst->IsType(ItemClassContainer)){ + for (uint8 idx = SUB_BEGIN; idx < EmuConstants::ITEM_CONTAINER_SIZE; idx++) { const ItemInst* baginst = src_inst->GetItem(idx); if(baginst && !database.VerifyInventory(account_id, Inventory::CalcSlotId(src_slot_id, idx), baginst)){ DeleteItemInInventory(Inventory::CalcSlotId(src_slot_id, idx),0,false); @@ -1403,14 +1407,14 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { } } } - if(dst_inst && dst_slot_id >= 2500 && dst_slot_id <= 2550) { + if(dst_inst && dst_slot_id >= EmuConstants::SHARED_BANK_BEGIN && dst_slot_id <= EmuConstants::SHARED_BANK_BAGS_END) { if(!database.VerifyInventory(account_id, dst_slot_id, dst_inst)) { LogFile->write(EQEMuLog::Error, "Player %s on account %s was found exploting the shared bank.\n", GetName(), account_name); DeleteItemInInventory(src_slot_id,0,true); return(false); } - if(dst_slot_id >= 2500 && dst_slot_id <= 2501 && dst_inst->IsType(ItemClassContainer)){ - for (uint8 idx=0; idx<10; idx++) { + if(dst_slot_id >= EmuConstants::SHARED_BANK_BEGIN && dst_slot_id <= EmuConstants::SHARED_BANK_END && dst_inst->IsType(ItemClassContainer)){ + for (uint8 idx = SUB_BEGIN; idx < EmuConstants::ITEM_CONTAINER_SIZE; idx++) { const ItemInst* baginst = dst_inst->GetItem(idx); if(baginst && !database.VerifyInventory(account_id, Inventory::CalcSlotId(dst_slot_id, idx), baginst)){ DeleteItemInInventory(Inventory::CalcSlotId(dst_slot_id, idx),0,false); @@ -1422,8 +1426,8 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { // Check for No Drop Hacks Mob* with = trade->With(); - if (((with && with->IsClient() && dst_slot_id>=3000 && dst_slot_id<=3007) || // Trade - (dst_slot_id >= 2500 && dst_slot_id <= 2550)) // Shared Bank + if (((with && with->IsClient() && dst_slot_id >= EmuConstants::TRADE_BEGIN && dst_slot_id <= EmuConstants::TRADE_END) || + (dst_slot_id >= EmuConstants::SHARED_BANK_BEGIN && dst_slot_id <= EmuConstants::SHARED_BANK_BAGS_END)) && GetInv().CheckNoDrop(src_slot_id) && RuleI(World, FVNoDropFlag) == 0 || RuleI(Character, MinStatusForNoDropExemptions) < Admin() && RuleI(World, FVNoDropFlag) == 2) { DeleteItemInInventory(src_slot_id); @@ -1433,7 +1437,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { // Step 3: Check for interaction with World Container (tradeskills) if(m_tradeskill_object != nullptr) { - if (src_slot_id>=4000 && src_slot_id<=4009) { + if (src_slot_id >= EmuConstants::WORLD_BEGIN && src_slot_id <= EmuConstants::WORLD_END) { // Picking up item from world container ItemInst* inst = m_tradeskill_object->PopItem(Inventory::CalcBagIdx(src_slot_id)); if (inst) { @@ -1445,7 +1449,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { return true; } - else if (dst_slot_id>=4000 && dst_slot_id<=4009) { + else if (dst_slot_id >= EmuConstants::WORLD_BEGIN && dst_slot_id <= EmuConstants::WORLD_END) { // Putting item into world container, which may swap (or pile onto) with existing item uint8 world_idx = Inventory::CalcBagIdx(dst_slot_id); ItemInst* world_inst = m_tradeskill_object->PopItem(world_idx); @@ -1509,7 +1513,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { } // Step 4: Check for entity trade - if (dst_slot_id>=3000 && dst_slot_id<=3007) { + if (dst_slot_id >= EmuConstants::TRADE_BEGIN && dst_slot_id <= EmuConstants::TRADE_END) { if (src_slot_id != MainCursor) { Kick(); return false; @@ -1596,12 +1600,12 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { } else { // Not dealing with charges - just do direct swap - if(src_inst && (dst_slot_id <= MainAmmo || dst_slot_id == MainPowerSource) && dst_slot_id >= MainCharm) { + if(src_inst && (dst_slot_id <= EmuConstants::EQUIPMENT_END || dst_slot_id == MainPowerSource) && dst_slot_id >= EmuConstants::EQUIPMENT_BEGIN) { if (src_inst->GetItem()->Attuneable) { src_inst->SetInstNoDrop(true); } if (src_inst->IsAugmented()) { - for (int i = 0; i < EmuConstants::ITEM_COMMON_SIZE; i++) { + for (int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { if (src_inst->GetAugment(i)) { if (src_inst->GetAugment(i)->GetItem()->Attuneable) { src_inst->GetAugment(i)->SetInstNoDrop(true); @@ -1614,7 +1618,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { if(!m_inv.SwapItem(src_slot_id, dst_slot_id)) { return false; } mlog(INVENTORY__SLOTS, "Moving entire item from slot %d to slot %d", src_slot_id, dst_slot_id); - if(src_slot_id <= MainAmmo || src_slot_id == MainPowerSource) { + if(src_slot_id <= EmuConstants::EQUIPMENT_END || src_slot_id == MainPowerSource) { if(src_inst) { parse->EventItem(EVENT_UNEQUIP_ITEM, this, src_inst, nullptr, "", src_slot_id); } @@ -1624,7 +1628,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { } } - if(dst_slot_id <= MainAmmo || dst_slot_id == MainPowerSource) { + if(dst_slot_id <= EmuConstants::EQUIPMENT_END || dst_slot_id == MainPowerSource) { if(dst_inst) { parse->EventItem(EVENT_UNEQUIP_ITEM, this, dst_inst, nullptr, "", dst_slot_id); } @@ -1636,7 +1640,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { } int matslot = SlotConvert2(dst_slot_id); - if (dst_slot_id<22 && matslot != 0) { + if (dst_slot_id <= EmuConstants::EQUIPMENT_END && matslot != MaterialHead) { // think this is to allow the client to update with /showhelm SendWearChange(matslot); } @@ -1646,6 +1650,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { database.SaveCursor(character_id, s, e); } else database.SaveInventory(character_id, m_inv.GetItem(src_slot_id), src_slot_id); + if (dst_slot_id == MainCursor) { std::list::const_iterator s=m_inv.cursor_begin(),e=m_inv.cursor_end(); database.SaveCursor(character_id, s, e); @@ -1668,7 +1673,7 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) { mlog(INVENTORY__ERROR, "Inventory desyncronization. (charname: %s, source: %i, destination: %i)", GetName(), move_slots->from_slot, move_slots->to_slot); Message(15, "Inventory Desyncronization detected: Resending slot data..."); - if((move_slots->from_slot >= MainCharm && move_slots->from_slot <= 340) || move_slots->from_slot == MainPowerSource) { + if((move_slots->from_slot >= EmuConstants::EQUIPMENT_BEGIN && move_slots->from_slot <= EmuConstants::CURSOR_BAG_END) || move_slots->from_slot == MainPowerSource) { int16 resync_slot = (Inventory::CalcSlotId(move_slots->from_slot) == INVALID_INDEX) ? move_slots->from_slot : Inventory::CalcSlotId(move_slots->from_slot); if (IsValidSlot(resync_slot) && resync_slot != INVALID_INDEX) { // This prevents the client from crashing when closing any 'phantom' bags -U @@ -1711,7 +1716,7 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) { else { Message(13, "Could not resyncronize source slot %i.", move_slots->from_slot); } } - if((move_slots->to_slot >= MainCharm && move_slots->to_slot <= 340) || move_slots->to_slot == MainPowerSource) { + if((move_slots->to_slot >= EmuConstants::EQUIPMENT_BEGIN && move_slots->to_slot <= EmuConstants::CURSOR_BAG_END) || move_slots->to_slot == MainPowerSource) { int16 resync_slot = (Inventory::CalcSlotId(move_slots->to_slot) == INVALID_INDEX) ? move_slots->to_slot : Inventory::CalcSlotId(move_slots->to_slot); if (IsValidSlot(resync_slot) && resync_slot != INVALID_INDEX) { const Item_Struct* token_struct = database.GetItem(22292); // 'Copper Coin' @@ -1792,7 +1797,7 @@ void Client::QSSwapItemAuditor(MoveItem_Struct* move_in, bool postaction_call) { qsaudit->items[move_count++].aug_5 = from_inst->GetAugmentItemID(5); if(from_inst->IsType(ItemClassContainer)) { - for(uint8 bag_idx = 0; bag_idx < from_inst->GetItem()->BagSlots; bag_idx++) { + for(uint8 bag_idx = SUB_BEGIN; bag_idx < from_inst->GetItem()->BagSlots; bag_idx++) { const ItemInst* from_baginst = from_inst->GetItem(bag_idx); if(from_baginst) { @@ -1825,7 +1830,7 @@ void Client::QSSwapItemAuditor(MoveItem_Struct* move_in, bool postaction_call) { qsaudit->items[move_count++].aug_5 = to_inst->GetAugmentItemID(5); if(to_inst->IsType(ItemClassContainer)) { - for(uint8 bag_idx = 0; bag_idx < to_inst->GetItem()->BagSlots; bag_idx++) { + for(uint8 bag_idx = SUB_BEGIN; bag_idx < to_inst->GetItem()->BagSlots; bag_idx++) { const ItemInst* to_baginst = to_inst->GetItem(bag_idx); if(to_baginst) { @@ -1854,7 +1859,7 @@ void Client::QSSwapItemAuditor(MoveItem_Struct* move_in, bool postaction_call) { void Client::DyeArmor(DyeStruct* dye){ int16 slot=0; - for(int i=0;i<7;i++){ + for (int i = EmuConstants::MATERIAL_BEGIN; i <= EmuConstants::MATERIAL_TINT_END; i++) { if(m_pp.item_tint[i].rgb.blue!=dye->dye[i].rgb.blue || m_pp.item_tint[i].rgb.red!=dye->dye[i].rgb.red || m_pp.item_tint[i].rgb.green != dye->dye[i].rgb.green){ @@ -1892,7 +1897,7 @@ void Client::DyeArmor(DyeStruct* dye){ const Item_Struct* TempItem = 0; ItemInst* ins; int x; - for(x=0; x <= 30; x++) + for(x=EmuConstants::POSSESSIONS_BEGIN; x <= EmuConstants::POSSESSIONS_END; x++) { TempItem = 0; ins = GetInv().GetItem(x); @@ -1914,7 +1919,7 @@ void Client::DyeArmor(DyeStruct* dye){ return true; } } - for(x=251; x < 331; x++) + for(x=EmuConstants::GENERAL_BAGS_BEGIN; x <= EmuConstants::GENERAL_BAGS_END; x++) { TempItem = 0; ins = GetInv().GetItem(x); @@ -1944,9 +1949,9 @@ bool Client::DecreaseByID(uint32 type, uint8 amt) { ItemInst* ins; int x; int num = 0; - for(x = EmuConstants::POSSESSIONS_BEGIN; x <= EmuConstants::GENERAL_BAGS_END; x++) + for(x = EmuConstants::EQUIPMENT_BEGIN; x <= EmuConstants::GENERAL_BAGS_END; x++) { - if (x == EmuConstants::CURSOR + 1) + if (x == MainCursor + 1) x = EmuConstants::GENERAL_BAGS_BEGIN; TempItem = 0; ins = GetInv().GetItem(x); @@ -1961,9 +1966,9 @@ bool Client::DecreaseByID(uint32 type, uint8 amt) { } if (num < amt) return false; - for(x = EmuConstants::POSSESSIONS_BEGIN; x <= EmuConstants::GENERAL_BAGS_END; x++) // should this be CURSOR_BAG_END + for(x = EmuConstants::EQUIPMENT_BEGIN; x <= EmuConstants::GENERAL_BAGS_END; x++) // should this be CURSOR_BAG_END? { - if (x == EmuConstants::CURSOR + 1) + if (x == MainCursor + 1) x = EmuConstants::GENERAL_BAGS_BEGIN; TempItem = 0; ins = GetInv().GetItem(x); @@ -1993,7 +1998,7 @@ void Client::RemoveNoRent(bool client_update) { int16 slot_id; // personal - for(slot_id = EmuConstants::POSSESSIONS_BEGIN; slot_id <= EmuConstants::POSSESSIONS_END; slot_id++) { + for(slot_id = MAP_BEGIN; slot_id < EmuConstants::MAP_POSSESSIONS_SIZE; slot_id++) { const ItemInst* inst = m_inv[slot_id]; if(inst && !inst->GetItem()->NoRent) { mlog(INVENTORY__SLOTS, "NoRent Timer Lapse: Deleting %s from slot %i", inst->GetItem()->Name, slot_id); @@ -2002,10 +2007,10 @@ void Client::RemoveNoRent(bool client_update) { } // power source - const ItemInst* inst = m_inv[EmuConstants::POWER_SOURCE]; + const ItemInst* inst = m_inv[MainPowerSource]; if(inst && !inst->GetItem()->NoRent) { - mlog(INVENTORY__SLOTS, "NoRent Timer Lapse: Deleting %s from slot %i", inst->GetItem()->Name, EmuConstants::POWER_SOURCE); - DeleteItemInInventory(EmuConstants::POWER_SOURCE, 0, (GetClientVersion() >= EQClientSoF) ? client_update : false); // Ti slot non-existent + mlog(INVENTORY__SLOTS, "NoRent Timer Lapse: Deleting %s from slot %i", inst->GetItem()->Name, MainPowerSource); + DeleteItemInInventory(MainPowerSource, 0, (GetClientVersion() >= EQClientSoF) ? client_update : false); // Ti slot non-existent } // containers @@ -2060,7 +2065,7 @@ void Client::RemoveDuplicateLore(bool client_update) { int16 slot_id; // personal - for(slot_id = EmuConstants::POSSESSIONS_BEGIN; slot_id <= EmuConstants::POSSESSIONS_END; slot_id++) { + for(slot_id = MAP_BEGIN; slot_id < EmuConstants::MAP_POSSESSIONS_SIZE; slot_id++) { ItemInst* inst = m_inv.PopItem(slot_id); if(inst) { if(CheckLoreConflict(inst->GetItem())) { @@ -2075,14 +2080,14 @@ void Client::RemoveDuplicateLore(bool client_update) { } // power source - ItemInst* inst = m_inv.PopItem(EmuConstants::POWER_SOURCE); + ItemInst* inst = m_inv.PopItem(MainPowerSource); if(inst) { if(CheckLoreConflict(inst->GetItem())) { mlog(INVENTORY__ERROR, "Lore Duplication Error: Deleting %s from slot %i", inst->GetItem()->Name, slot_id); - database.SaveInventory(character_id, nullptr, EmuConstants::POWER_SOURCE); + database.SaveInventory(character_id, nullptr, MainPowerSource); } else { - m_inv.PutItem(EmuConstants::POWER_SOURCE, *inst); + m_inv.PutItem(MainPowerSource, *inst); } safe_delete(inst); } @@ -2153,7 +2158,7 @@ void Client::MoveSlotNotAllowed(bool client_update) { } // power source - slot_id = EmuConstants::POWER_SOURCE; + slot_id = MainPowerSource; if(m_inv[slot_id] && !m_inv[slot_id]->IsSlotAllowed(slot_id)) { ItemInst* inst = m_inv.PopItem(slot_id); bool is_arrow = (inst->GetItem()->ItemType == ItemTypeArrow) ? true : false; @@ -2174,7 +2179,7 @@ uint32 Client::GetEquipment(uint8 material_slot) const int invslot; const ItemInst *item; - if(material_slot > 8) + if(material_slot > EmuConstants::MATERIAL_END) { return 0; } @@ -2214,7 +2219,7 @@ uint32 Client::GetEquipmentColor(uint8 material_slot) const { const Item_Struct *item; - if(material_slot > 8) + if(material_slot > EmuConstants::MATERIAL_END) { return 0; } @@ -2373,7 +2378,7 @@ void Client::SetBandolier(const EQApplicationPacket *app) { m_inv.GetItem(MainCursor)->GetCharges() >= 1) // '> 0' the same, but this matches Inventory::_HasItem conditional check slot = MainCursor; else if (m_inv.GetItem(MainCursor)->GetItem()->ItemClass == 1) { - for(int16 CursorBagSlot = 331; CursorBagSlot <= 340; CursorBagSlot++) { + for(int16 CursorBagSlot = EmuConstants::CURSOR_BAG_BEGIN; CursorBagSlot <= EmuConstants::CURSOR_BAG_END; CursorBagSlot++) { if (m_inv.GetItem(CursorBagSlot)) { if (m_inv.GetItem(CursorBagSlot)->GetItem()->ID == m_pp.bandoliers[bss->number].items[BandolierSlot].item_id && m_inv.GetItem(CursorBagSlot)->GetCharges() >= 1) { // ditto @@ -2513,7 +2518,7 @@ bool Client::MoveItemToInventory(ItemInst *ItemToReturn, bool UpdateClient) { // if(ItemToReturn->IsStackable()) { - for (int16 i=22; i<=30; i++) { // changed slot max to 30 from 29. client will stack into slot 30 (bags too) before moving. + for (int16 i = EmuConstants::GENERAL_BEGIN; i <= MainCursor; i++) { // changed slot max to 30 from 29. client will stack into slot 30 (bags too) before moving. ItemInst* InvItem = m_inv.GetItem(i); @@ -2540,12 +2545,12 @@ bool Client::MoveItemToInventory(ItemInst *ItemToReturn, bool UpdateClient) { // if (InvItem && InvItem->IsType(ItemClassContainer)) { - int16 BaseSlotID = Inventory::CalcSlotId(i, 0); + int16 BaseSlotID = Inventory::CalcSlotId(i, SUB_BEGIN); uint8 BagSize=InvItem->GetItem()->BagSlots; uint8 BagSlot; - for (BagSlot=0; BagSlotGetItem()->ID == ItemID) && (InvItem->GetCharges() < InvItem->GetItem()->StackSize)) { @@ -2576,7 +2581,7 @@ bool Client::MoveItemToInventory(ItemInst *ItemToReturn, bool UpdateClient) { // We have tried stacking items, now just try and find an empty slot. - for (int16 i=22; i<=30; i++) { // changed slot max to 30 from 29. client will move into slot 30 (bags too) before pushing onto cursor. + for (int16 i = EmuConstants::GENERAL_BEGIN; i <= MainCursor; i++) { // changed slot max to 30 from 29. client will move into slot 30 (bags too) before pushing onto cursor. ItemInst* InvItem = m_inv.GetItem(i); @@ -2595,11 +2600,11 @@ bool Client::MoveItemToInventory(ItemInst *ItemToReturn, bool UpdateClient) { } if(InvItem->IsType(ItemClassContainer) && Inventory::CanItemFitInContainer(ItemToReturn->GetItem(), InvItem->GetItem())) { - int16 BaseSlotID = Inventory::CalcSlotId(i, 0); + int16 BaseSlotID = Inventory::CalcSlotId(i, SUB_BEGIN); uint8 BagSize=InvItem->GetItem()->BagSlots; - for (uint8 BagSlot=0; BagSlot(EmuConstants::GENERAL_END)), // deprecated luabind::value("GeneralEnd", static_cast(EmuConstants::GENERAL_END)), luabind::value("CursorEnd", 0xFFFE), // deprecated - luabind::value("Tradeskill", static_cast(SLOT_TRADESKILL)), // deprecated - luabind::value("Augment", static_cast(SLOT_AUGMENT)), // deprecated + luabind::value("Tradeskill", static_cast(legacy::SLOT_TRADESKILL)), // deprecated + luabind::value("Augment", static_cast(legacy::SLOT_AUGMENT)), // deprecated luabind::value("Invalid", INVALID_INDEX) ]; } diff --git a/zone/merc.cpp b/zone/merc.cpp index 2a879ecf9..ff4581489 100644 --- a/zone/merc.cpp +++ b/zone/merc.cpp @@ -5136,13 +5136,13 @@ bool Merc::Spawn(Client *owner) { //printf("Spawned Merc with ID %i\n", npc->GetID()); fflush(stdout); /* - uint32 itemID = 0; - uint8 materialFromSlot = 0xFF; - for(int i=0; i<22; ++i) { + uint32 itemID = NO_ITEM; + uint8 materialFromSlot = _MaterialInvalid; + for(int i=EmuConstants::EQUIPMENT_BEGIN; i<=EmuConstants::EQUIPMENT_END; ++i) { itemID = GetMercItemBySlot(i); - if(itemID != 0) { + if(itemID != NO_ITEM) { materialFromSlot = Inventory::CalcMaterialFromSlot(i); - if(materialFromSlot != 0xFF) { + if(materialFromSlot != _MaterialInvalid) { this->SendWearChange(materialFromSlot); } } diff --git a/zone/perl_mob.cpp b/zone/perl_mob.cpp index 6f4c66e3e..86cf58981 100644 --- a/zone/perl_mob.cpp +++ b/zone/perl_mob.cpp @@ -872,7 +872,7 @@ XS(XS_Mob_Attack) Perl_croak(aTHX_ "other is nullptr, avoiding crash."); if (items < 3) - Hand = MainPrimary; + Hand = 13; else { Hand = (int)SvIV(ST(2)); } diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index c3b3abadf..0ee88a154 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -1427,9 +1427,10 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) SendAppearancePacket(AT_Size, 6); } } - for(int x = 0; x < 7; x++){ + + for(int x = EmuConstants::MATERIAL_BEGIN; x <= EmuConstants::MATERIAL_TINT_END; x++) SendWearChange(x); - } + if(caster && (caster->spellbonuses.IllusionPersistence || caster->aabonuses.IllusionPersistence || caster->itembonuses.IllusionPersistence)) buffs[buffslot].persistant_buff = 1; @@ -1451,9 +1452,9 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial) caster->GetTarget()->GetTexture() ); caster->SendAppearancePacket(AT_Size, caster->GetTarget()->GetSize()); - for(int x = 0; x < 7; x++){ + + for(int x = EmuConstants::MATERIAL_BEGIN; x <= EmuConstants::MATERIAL_TINT_END; x++) caster->SendWearChange(x); - } } } @@ -3724,7 +3725,7 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses) else{ SendAppearancePacket(AT_Size, 6); } - for(int x = 0; x < 7; x++){ + for(int x = EmuConstants::MATERIAL_BEGIN; x <= EmuConstants::MATERIAL_TINT_END; x++){ SendWearChange(x); } break; @@ -5047,7 +5048,7 @@ int16 Client::GetSympatheticFocusEffect(focusType type, uint16 spell_id) { const Item_Struct* TempItem = 0; - for(int x=0; x<=21; x++) + for(int x = EmuConstants::EQUIPMENT_BEGIN; x <= EmuConstants::EQUIPMENT_END; x++) { if (SympatheticProcList.size() > MAX_SYMPATHETIC) continue; @@ -5070,7 +5071,7 @@ int16 Client::GetSympatheticFocusEffect(focusType type, uint16 spell_id) { } } - for (int y = 0; y < EmuConstants::ITEM_COMMON_SIZE; ++y) + for (int y = AUG_BEGIN; y < EmuConstants::ITEM_COMMON_SIZE; ++y) { if (SympatheticProcList.size() > MAX_SYMPATHETIC) continue; @@ -5192,7 +5193,7 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) { int16 focus_max_real = 0; //item focus - for(int x=0; x<=21; x++) + for(int x = EmuConstants::EQUIPMENT_BEGIN; x <= EmuConstants::EQUIPMENT_END; x++) { TempItem = nullptr; ItemInst* ins = GetInv().GetItem(x); @@ -5226,7 +5227,7 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id) { } } - for (int y = 0; y < EmuConstants::ITEM_COMMON_SIZE; ++y) + for (int y = AUG_BEGIN; y < EmuConstants::ITEM_COMMON_SIZE; ++y) { ItemInst *aug = nullptr; aug = ins->GetAugment(y); diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index f9b2969d8..23771d586 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -68,7 +68,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme // Verify that no more than two items are in container to guarantee no inadvertant wipes. uint8 itemsFound = 0; - for (uint8 i=0; i<10; i++) + for (uint8 i = MAP_BEGIN; i < EmuConstants::MAP_WORLD_SIZE; i++) { const ItemInst* inst = container->GetItem(i); if (inst) @@ -212,7 +212,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme else { // Delete items in our inventory container... - for (uint8 i=0; i<10; i++) + for (uint8 i = MAP_BEGIN; i < EmuConstants::MAP_WORLD_SIZE; i++) { const ItemInst* inst = container->GetItem(i); if (inst) @@ -254,7 +254,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob uint32 some_id = 0; bool worldcontainer=false; - if (in_combine->container_slot == SLOT_TRADESKILL) { + if (in_combine->container_slot == legacy::SLOT_TRADESKILL) { if(!worldo) { user->Message(13, "Error: Server is not aware of the tradeskill container you are attempting to use"); return; @@ -353,7 +353,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob safe_delete(outapp); database.DeleteWorldContainer(worldo->m_id, zone->GetZoneID()); } else{ - for (uint8 i=0; i<10; i++){ + for (uint8 i = MAP_BEGIN; i < EmuConstants::MAP_WORLD_SIZE; i++) { const ItemInst* inst = container->GetItem(i); if (inst) { user->DeleteItemInInventory(Inventory::CalcSlotId(in_combine->container_slot,i),0,true); @@ -758,7 +758,7 @@ void Client::SendTradeskillDetails(uint32 recipe_id) { uint32 *ffff_start = (uint32 *) startblock; //fill in the FFFF's as if there were 0 items - for(r = 0; r < 10; r++) { + for(r = 0; r < 10; r++) { // world:item container size related? *ffff_start = 0xFFFFFFFF; ffff_start++; } @@ -794,7 +794,7 @@ void Client::SendTradeskillDetails(uint32 recipe_id) { icon = htonl(icon); //if we get more than 10 items, just start skipping them... - for(k = 0; k < num && count < 10; k++) { + for(k = 0; k < num && count < 10; k++) { // world:item container size related? itemptr = (uint32 *) cblock; cblock += sizeof(uint32); datalen += sizeof(uint32); @@ -1199,7 +1199,7 @@ bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint3 bool first = true; uint8 i; char *pos = buf2; - for (i=0; i<10; i++) { + for (i = 0; i < 10; i++) { // TODO: need to determine if this is bound to world/item container size const ItemInst* inst = container->GetItem(i); if (inst) { const Item_Struct* item = GetItem(inst->GetItem()->ID); @@ -1334,7 +1334,7 @@ bool ZoneDatabase::GetTradeRecipe(const ItemInst* container, uint8 c_type, uint3 if (RunQuery(TSquery, MakeAnyLenString(&TSquery, "SELECT item_id, componentcount from tradeskill_recipe_entries where recipe_id=%i AND componentcount > 0", recipe_id), TSerrbuf, &TSresult)) { while((TSrow = mysql_fetch_row(TSresult))!=nullptr) { int ccnt = 0; - for(int x = 0; x < 10; x++){ + for(int x = MAP_BEGIN; x < EmuConstants::MAP_WORLD_SIZE; x++) { const ItemInst* inst = container->GetItem(x); if(inst){ const Item_Struct* item = GetItem(inst->GetItem()->ID); diff --git a/zone/trading.cpp b/zone/trading.cpp index d00cd039f..8c564c130 100644 --- a/zone/trading.cpp +++ b/zone/trading.cpp @@ -148,7 +148,7 @@ void Trade::SendItemData(const ItemInst* inst, int16 dest_slot_id) if (with && with->IsClient()) { with->SendItemPacket(dest_slot_id - EmuConstants::TRADE_BEGIN, inst, ItemPacketTradeView); if (inst->GetItem()->ItemClass == 1) { - for (uint16 i=0; i<10; i++) { + for (uint16 i = SUB_BEGIN; i < EmuConstants::ITEM_CONTAINER_SIZE; i++) { uint16 bagslot_id = Inventory::CalcSlotId(dest_slot_id, i); const ItemInst* bagitem = trader->GetInv().GetItem(bagslot_id); if (bagitem) { @@ -174,7 +174,7 @@ void Trade::LogTrade() uint8 item_count = 0; if (zone->tradevar != 0) { - for (uint16 i=3000; i<=3007; i++) { + for (uint16 i = EmuConstants::TRADE_BEGIN; i <= EmuConstants::TRADE_END; i++) { if (trader->GetInv().GetItem(i)) item_count++; } @@ -226,7 +226,7 @@ void Trade::LogTrade() if (item_count > 0) { strcat(logtext, "items {"); - for (uint16 i=3000; i<=3007; i++) { + for (uint16 i = EmuConstants::TRADE_BEGIN; i <= EmuConstants::TRADE_END; i++) { const ItemInst* inst = trader->GetInv().GetItem(i); if (!comma) @@ -242,7 +242,7 @@ void Trade::LogTrade() strcat(logtext, item_num); if (inst->IsType(ItemClassContainer)) { - for (uint8 j=0; j<10; j++) { + for (uint8 j = SUB_BEGIN; j < EmuConstants::ITEM_CONTAINER_SIZE; j++) { inst = trader->GetInv().GetItem(i, j); if (inst) { strcat(logtext, ","); @@ -278,7 +278,7 @@ void Trade::DumpTrade() return; Client* trader = owner->CastToClient(); - for (uint16 i=3000; i<=3007; i++) { + for (uint16 i = EmuConstants::TRADE_BEGIN; i <= EmuConstants::TRADE_END; i++) { const ItemInst* inst = trader->GetInv().GetItem(i); if (inst) { @@ -287,7 +287,7 @@ void Trade::DumpTrade() i, ((inst->IsType(ItemClassContainer)) ? "True" : "False")); if (inst->IsType(ItemClassContainer)) { - for (uint8 j=0; j<10; j++) { + for (uint8 j = SUB_BEGIN; j < EmuConstants::ITEM_CONTAINER_SIZE; j++) { inst = trader->GetInv().GetItem(i, j); if (inst) { LogFile->write(EQEMuLog::Debug, "\tBagItem %i (Charges=%i, Slot=%i)", @@ -308,7 +308,7 @@ void Client::ResetTrade() { ItemInst* ins; int x; AddMoneyToPP(trade->cp, trade->sp, trade->gp, trade->pp, true); - for(x=3000; x <= 3007; x++) + for(x = EmuConstants::TRADE_BEGIN; x <= EmuConstants::TRADE_END; x++) { TempItem = 0; ins = GetInv().GetItem(x); @@ -355,7 +355,7 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) } // Move each trade slot into free inventory slot - for(int16 i = 3000; i <= 3007; i++){ + for(int16 i = EmuConstants::TRADE_BEGIN; i <= EmuConstants::TRADE_END; i++){ const ItemInst* inst = m_inv[i]; uint16 parent_offset = 0; @@ -385,7 +385,7 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) if(inst->IsType(ItemClassContainer)) { // Pseudo-Slot ID's are generated based on how the db saves bag items... - for(uint8 j = 0; j < inst->GetItem()->BagSlots; j++) { + for(uint8 j = SUB_BEGIN; j < inst->GetItem()->BagSlots; j++) { const ItemInst* baginst = inst->GetItem(j); if(baginst == nullptr) { continue; } @@ -424,7 +424,7 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) qsaudit->items[parent_offset].to_slot = slot_id; if(inst->IsType(ItemClassContainer)) { - for(uint8 bagslot_idx = 0; bagslot_idx < inst->GetItem()->BagSlots; bagslot_idx++) { + for(uint8 bagslot_idx = SUB_BEGIN; bagslot_idx < inst->GetItem()->BagSlots; bagslot_idx++) { const ItemInst* bag_inst = inst->GetItem(bagslot_idx); if(bag_inst == nullptr) { continue; } @@ -444,7 +444,7 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) qsaudit->items[parent_offset].to_slot = MainCursor; if(inst->IsType(ItemClassContainer)) { - for(uint8 bagslot_idx = 0; bagslot_idx < inst->GetItem()->BagSlots; bagslot_idx++) { + for(uint8 bagslot_idx = SUB_BEGIN; bagslot_idx < inst->GetItem()->BagSlots; bagslot_idx++) { const ItemInst* bag_inst = inst->GetItem(bagslot_idx); if(bag_inst == nullptr) { continue; } @@ -468,7 +468,7 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) qsaudit->items[parent_offset].to_slot = MainCursor; if(inst->IsType(ItemClassContainer)) { - for(uint8 bagslot_idx = 0; bagslot_idx < inst->GetItem()->BagSlots; bagslot_idx++) { + for(uint8 bagslot_idx = SUB_BEGIN; bagslot_idx < inst->GetItem()->BagSlots; bagslot_idx++) { const ItemInst* bag_inst = inst->GetItem(bagslot_idx); if(bag_inst == nullptr) { continue; } @@ -531,7 +531,7 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) } if(QSPLH) { // This can be incoporated below when revisions are made -U - for(int16 slot_id = 3000; slot_id <= 3003; slot_id++) { + for(int16 slot_id = EmuConstants::TRADE_BEGIN; slot_id <= EmuConstants::TRADE_NPC_END; slot_id++) { const ItemInst* trade_inst = m_inv[slot_id]; if(trade_inst) { @@ -547,7 +547,7 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) qsaudit->items[qsaudit->char_count++].aug_5 = trade_inst->GetAugmentItemID(5); if(trade_inst->IsType(ItemClassContainer)) { - for(uint8 bag_idx = 0; bag_idx < trade_inst->GetItem()->BagSlots; bag_idx++) { + for(uint8 bag_idx = SUB_BEGIN; bag_idx < trade_inst->GetItem()->BagSlots; bag_idx++) { const ItemInst* trade_baginst = trade_inst->GetItem(bag_idx); if(trade_baginst) { @@ -576,10 +576,10 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) std::vector item_list; uint32 items[4] = { 0 }; - for(int i = 3000; i < 3004; ++i) { + for(int i = EmuConstants::TRADE_BEGIN; i <= EmuConstants::TRADE_NPC_END; ++i) { ItemInst *inst = m_inv.GetItem(i); if(inst) { - items[i - 3000] = inst->GetItem()->ID; + items[i - EmuConstants::TRADE_BEGIN] = inst->GetItem()->ID; item_list.push_back(inst); } else { item_list.push_back(nullptr); @@ -592,7 +592,7 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) if(GetGM() || (item->NoDrop != 0 && inst->IsInstNoDrop() == false)) { // pets need to look inside bags and try to equip items found there if(item->ItemClass == ItemClassContainer && item->BagSlots > 0) { - for(int16 bslot=0; bslot < item->BagSlots; bslot++) { + for(int16 bslot = SUB_BEGIN; bslot < item->BagSlots; bslot++) { const ItemInst* baginst = inst->GetItem(bslot); if (baginst) { const Item_Struct* bagitem = baginst->GetItem(); @@ -646,8 +646,8 @@ void Client::FinishTrade(Mob* tradingWith, ServerPacket* qspack, bool finalizer) } ItemInst *insts[4] = { 0 }; - for(int i = 3000; i < 3004; ++i) { - insts[i - 3000] = m_inv.PopItem(i); + for(int i = EmuConstants::TRADE_BEGIN; i <= EmuConstants::TRADE_NPC_END; ++i) { + insts[i - EmuConstants::TRADE_BEGIN] = m_inv.PopItem(i); database.SaveInventory(CharacterID(), nullptr, i); } @@ -666,8 +666,7 @@ bool Client::CheckTradeLoreConflict(Client* other) if (!other) return true; // Move each trade slot into free inventory slot - for (int16 i=3000; i<=3179; i++){ - if(i == 3008) { i = 3100; } + for (int16 i = EmuConstants::TRADE_BEGIN; i <= EmuConstants::TRADE_END; i++){ const ItemInst* inst = m_inv[i]; if (inst && inst->GetItem()) { @@ -675,6 +674,16 @@ bool Client::CheckTradeLoreConflict(Client* other) return true; } } + + for (int16 i = EmuConstants::TRADE_BAGS_BEGIN; i <= EmuConstants::TRADE_BAGS_END; i++){ + const ItemInst* inst = m_inv[i]; + + if (inst && inst->GetItem()) { + if (other->CheckLoreConflict(inst->GetItem())) + return true; + } + } + return false; } @@ -873,7 +882,7 @@ void Client::SendSingleTraderItem(uint32 CharID, int SerialNumber) { ItemInst* inst= database.LoadSingleTraderItem(CharID, SerialNumber); if(inst) { - SendItemPacket(30, inst, ItemPacketMerchant); + SendItemPacket(30, inst, ItemPacketMerchant); // MainCursor? safe_delete(inst); } @@ -904,7 +913,7 @@ void Client::BulkSendTraderInventory(uint32 char_id) { } inst->SetPrice(TraderItems->ItemCost[i]); - SendItemPacket(30, inst, ItemPacketMerchant); + SendItemPacket(30, inst, ItemPacketMerchant); // MainCursor? safe_delete(inst); } else @@ -920,11 +929,12 @@ ItemInst* Client::FindTraderItemBySerialNumber(int32 SerialNumber){ ItemInst* item = nullptr; uint16 SlotID = 0; - for(int i = 0; i < 8;i++){ - item = this->GetInv().GetItem(22 + i); + for(int i = EmuConstants::GENERAL_BEGIN; i <= EmuConstants::GENERAL_END; i++){ + item = this->GetInv().GetItem(i); if(item && item->GetItem()->ID == 17899){ //Traders Satchel - for(int x = 0; x < 10; x++){ - SlotID = (((22 + i + 3) * 10) + x + 1); + for(int x = SUB_BEGIN; x < EmuConstants::ITEM_CONTAINER_SIZE; x++) { + // we already have the parent bag and a contents iterator..why not just iterate the bag!?? + SlotID = Inventory::CalcSlotId(i, x); item = this->GetInv().GetItem(SlotID); if(item) { if(item->GetSerialNumber() == SerialNumber) @@ -950,11 +960,11 @@ GetItems_Struct* Client::GetTraderItems(){ uint8 ndx = 0; - for(int i = 0; i < 8; i++){ - item = this->GetInv().GetItem(22 + i); + for(int i = EmuConstants::GENERAL_BEGIN; i <= EmuConstants::GENERAL_END; i++) { + item = this->GetInv().GetItem(i); if(item && item->GetItem()->ID == 17899){ //Traders Satchel - for(int x = 0; x < 10; x++){ - SlotID = (((22 + i +3 ) *10) + x + 1); + for(int x = SUB_BEGIN; x < EmuConstants::ITEM_CONTAINER_SIZE; x++) { + SlotID = Inventory::CalcSlotId(i, x); item = this->GetInv().GetItem(SlotID); @@ -974,11 +984,11 @@ uint16 Client::FindTraderItem(int32 SerialNumber, uint16 Quantity){ const ItemInst* item= nullptr; uint16 SlotID = 0; - for(int i = 0; i < 8;i++){ - item = this->GetInv().GetItem(22+i); + for(int i = EmuConstants::GENERAL_BEGIN; i <= EmuConstants::GENERAL_END; i++) { + item = this->GetInv().GetItem(i); if(item && item->GetItem()->ID == 17899){ //Traders Satchel - for(int x = 0; x < 10; x++){ - SlotID= (((22 + i + 3) * 10) + x + 1); + for(int x = SUB_BEGIN; x < EmuConstants::ITEM_CONTAINER_SIZE; x++){ + SlotID = Inventory::CalcSlotId(i, x); item = this->GetInv().GetItem(SlotID); @@ -1713,7 +1723,7 @@ static void UpdateTraderCustomerItemsAdded(uint32 CustomerID, TraderCharges_Stru _log(TRADING__CLIENT, "Sending price update for %s, Serial No. %i with %i charges", item->Name, gis->SerialNumber[i], gis->Charges[i]); - Customer->SendItemPacket(30, inst, ItemPacketMerchant); + Customer->SendItemPacket(30, inst, ItemPacketMerchant); // MainCursor? } } @@ -1789,7 +1799,7 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_St _log(TRADING__CLIENT, "Sending price update for %s, Serial No. %i with %i charges", item->Name, gis->SerialNumber[i], gis->Charges[i]); - Customer->SendItemPacket(30, inst, ItemPacketMerchant); + Customer->SendItemPacket(30, inst, ItemPacketMerchant); // MainCursor?? } safe_delete(inst); } diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index 98b302ba4..b14e63f26 100644 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -518,7 +518,7 @@ void ZoneDatabase::LoadWorldContainer(uint32 parentid, ItemInst* container) uint8 index = (uint8)atoi(row[0]); uint32 item_id = (uint32)atoi(row[1]); int8 charges = (int8)atoi(row[2]); - uint32 aug[5]; + uint32 aug[EmuConstants::ITEM_COMMON_SIZE]; aug[0] = (uint32)atoi(row[3]); aug[1] = (uint32)atoi(row[4]); aug[2] = (uint32)atoi(row[5]); @@ -528,7 +528,7 @@ void ZoneDatabase::LoadWorldContainer(uint32 parentid, ItemInst* container) ItemInst* inst = database.CreateItem(item_id, charges); if (inst) { if (inst->GetItem()->ItemClass == ItemClassCommon) { - for(int i=0;i<5;i++) { + for(int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { if (aug[i]) { inst->PutAugment(&database, i, aug[i]); } @@ -564,13 +564,13 @@ void ZoneDatabase::SaveWorldContainer(uint32 zone_id, uint32 parent_id, const It //Delete all items from container DeleteWorldContainer(parent_id,zone_id); // Save all 10 items, if they exist - for (uint8 index=0; index<10; index++) { + for (uint8 index = SUB_BEGIN; index < EmuConstants::ITEM_CONTAINER_SIZE; index++) { ItemInst* inst = container->GetItem(index); if (inst) { uint32 item_id = inst->GetItem()->ID; - uint32 augslot[5] = { 0, 0, 0, 0, 0 }; + uint32 augslot[EmuConstants::ITEM_COMMON_SIZE] = { NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM, NO_ITEM }; if (inst->IsType(ItemClassCommon)) { - for(int i=0;i<5;i++) { + for(int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { ItemInst *auginst=inst->GetAugment(i); augslot[i]=(auginst && auginst->GetItem()) ? auginst->GetItem()->ID : 0; } @@ -978,7 +978,7 @@ bool ZoneDatabase::GetCharacterInfoForLogin_result(MYSQL_RES* result, } // Fix use_tint, previously it was set to 1 for a dyed slot, client wants it set to 0xFF - for(int i = 0; i<9; i++) + for(int i = EmuConstants::MATERIAL_BEGIN; i <= EmuConstants::MATERIAL_END; i++) if(pp->item_tint[i].rgb.use_tint == 1) pp->item_tint[i].rgb.use_tint = 0xFF; @@ -1238,7 +1238,7 @@ const NPCType* ZoneDatabase::GetNPCType (uint32 id) { { if ((at_row = mysql_fetch_row(at_result))) { - for (i = 0; i < _MaterialCount; i++) + for (i = EmuConstants::MATERIAL_BEGIN; i <= EmuConstants::MATERIAL_END; i++) { tmpNPCType->armor_tint[i] = atoi(at_row[i * 3]) << 16; tmpNPCType->armor_tint[i] |= atoi(at_row[i * 3 + 1]) << 8; @@ -1271,7 +1271,7 @@ const NPCType* ZoneDatabase::GetNPCType (uint32 id) { if (armor_tint_id == 0) { - for (i = 1; i < _MaterialCount; i++) + for (i = MaterialChest; i <= EmuConstants::MATERIAL_END; i++) { tmpNPCType->armor_tint[i] = tmpNPCType->armor_tint[0]; } @@ -1551,7 +1551,7 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client { if ((at_row = mysql_fetch_row(at_result))) { - for (i = 0; i < _MaterialCount; i++) + for (i = EmuConstants::MATERIAL_BEGIN; i <= EmuConstants::MATERIAL_END; i++) { tmpNPCType->armor_tint[i] = atoi(at_row[i * 3]) << 16; tmpNPCType->armor_tint[i] |= atoi(at_row[i * 3 + 1]) << 8; @@ -1584,7 +1584,7 @@ const NPCType* ZoneDatabase::GetMercType(uint32 id, uint16 raceid, uint32 client if (armor_tint_id == 0) { - for (i = 1; i < _MaterialCount; i++) + for (i = MaterialChest; i <= EmuConstants::MATERIAL_END; i++) { tmpNPCType->armor_tint[i] = tmpNPCType->armor_tint[0]; } @@ -2774,7 +2774,7 @@ void ZoneDatabase::SavePetInfo(Client *c) { } } - for (i = 0; iItems[i]) { database.RunQuery(query, MakeAnyLenString(&query, "INSERT INTO `character_pet_inventory` (`char_id`, `pet`, `slot`, `item_id`) values (%u, 0, %u, %u)", @@ -2798,7 +2798,7 @@ void ZoneDatabase::SavePetInfo(Client *c) { } safe_delete_array(query); - for (i = 0; iItems[i]) { database.RunQuery(query, MakeAnyLenString(&query, "INSERT INTO `character_pet_inventory` (`char_id`, `pet`, `slot`, `item_id`) values (%u, 1, %u, %u)", @@ -2931,7 +2931,7 @@ void ZoneDatabase::LoadPetInfo(Client *c) { continue; int slot = atoi(row[1]); - if (slot < 0 || slot > EmuConstants::EQUIPMENT_SIZE) // if (slot == 22) { zone.TriggerRandomCrash(); } + if (slot < EmuConstants::EQUIPMENT_BEGIN || slot > EmuConstants::EQUIPMENT_END) continue; pi->Items[slot] = atoul(row[2]);