From 0ecc70261203cf1f2432561b6a78ab2d6937d752 Mon Sep 17 00:00:00 2001 From: Uleat Date: Fri, 27 May 2016 03:38:13 -0400 Subject: [PATCH] ItemPacketType updates --- common/eq_packet_structs.h | 6 +++--- common/patches/sod_limits.h | 5 ++++- common/patches/sof_limits.h | 5 ++++- common/patches/titanium_limits.h | 5 ++++- common/patches/uf_limits.h | 5 ++++- zone/client_packet.cpp | 4 ++-- zone/command.cpp | 2 +- zone/forage.cpp | 4 ++-- zone/inventory.cpp | 10 +++++----- zone/spell_effects.cpp | 4 ++-- 10 files changed, 31 insertions(+), 19 deletions(-) diff --git a/common/eq_packet_structs.h b/common/eq_packet_structs.h index e95f0eb0a..0692aa6a5 100644 --- a/common/eq_packet_structs.h +++ b/common/eq_packet_structs.h @@ -1522,7 +1522,7 @@ enum ItemPacketType ItemPacketLoot = 0x66, ItemPacketTrade = 0x67, ItemPacketCharInventory = 0x69, - ItemPacketSummonItem = 0x6A, + ItemPacketLimbo = 0x6A, ItemPacketWorldContainer = 0x6B, ItemPacketTributeItem = 0x6C, ItemPacketGuildTribute = 0x6D, @@ -1536,8 +1536,8 @@ enum ItemPacketType // ItemPacketTradeView = /*101*/ 0x65, // ItemPacketLoot = /*102*/ 0x66, // ItemPacketTrade = /*103*/ 0x67, -// ItemPacketCharInventory = /*105*/ 0x69, -// ItemPacketLimbo = /*106*/ 0x6A, // name change +// ItemPacketCharInventory = /*105*/ 0x69, // 105 looks like raw item packet (no appearance update) thru shared bank..110, possibly possessions with appearance update +// ItemPacketLimbo = /*106*/ 0x6A, // ItemPacketWorldContainer = /*107*/ 0x6B, // ItemPacketTributeItem = /*108*/ 0x6C, // ItemPacketGuildTribute = /*109*/ 0x6D, // missing from EQEmu diff --git a/common/patches/sod_limits.h b/common/patches/sod_limits.h index e4f4ba3d7..8bdac4150 100644 --- a/common/patches/sod_limits.h +++ b/common/patches/sod_limits.h @@ -210,7 +210,10 @@ namespace SoD const int WorldEnd = (WorldBegin + invtype::InvTypeWorldSize) - 1; const int TributeBegin = 400; - const int TributeEnd = 404; + const int TributeEnd = (TributeBegin + invtype::InvTypeTributeSize) - 1; + + const int GuildTributeBegin = 450; + const int GuildTributeEnd = (GuildTributeBegin + invtype::InvTypeGuildTributeSize) - 1; const int CorpseBegin = invslot::PossessionsGeneral1; const int CorpseEnd = invslot::PossessionsGeneral1 + invslot::PossessionsCursor; diff --git a/common/patches/sof_limits.h b/common/patches/sof_limits.h index 81c6727b1..bd755c820 100644 --- a/common/patches/sof_limits.h +++ b/common/patches/sof_limits.h @@ -210,7 +210,10 @@ namespace SoF const int WorldEnd = (WorldBegin + invtype::InvTypeWorldSize) - 1; const int TributeBegin = 400; - const int TributeEnd = 404; + const int TributeEnd = (TributeBegin + invtype::InvTypeTributeSize) - 1; + + const int GuildTributeBegin = 450; + const int GuildTributeEnd = (GuildTributeBegin + invtype::InvTypeGuildTributeSize) - 1; const int CorpseBegin = PossessionsGeneral1; const int CorpseEnd = PossessionsGeneral1 + PossessionsCursor; diff --git a/common/patches/titanium_limits.h b/common/patches/titanium_limits.h index 79351bad7..a4ce67faf 100644 --- a/common/patches/titanium_limits.h +++ b/common/patches/titanium_limits.h @@ -209,7 +209,10 @@ namespace Titanium const int WorldEnd = (WorldBegin + invtype::InvTypeWorldSize) - 1; const int TributeBegin = 400; - const int TributeEnd = 404; + const int TributeEnd = (TributeBegin + invtype::InvTypeTributeSize) - 1; + + const int GuildTributeBegin = 450; + const int GuildTributeEnd = (GuildTributeBegin + invtype::InvTypeGuildTributeSize) - 1; const int CorpseBegin = PossessionsGeneral1; const int CorpseEnd = PossessionsGeneral1 + PossessionsCursor; diff --git a/common/patches/uf_limits.h b/common/patches/uf_limits.h index 533ba87ab..fb2370a4c 100644 --- a/common/patches/uf_limits.h +++ b/common/patches/uf_limits.h @@ -211,7 +211,10 @@ namespace UF const int WorldEnd = (WorldBegin + invtype::InvTypeWorldSize) - 1; const int TributeBegin = 400; - const int TributeEnd = 404; + const int TributeEnd = (TributeBegin + invtype::InvTypeTributeSize) - 1; + + const int GuildTributeBegin = 450; + const int GuildTributeEnd = (GuildTributeBegin + invtype::InvTypeGuildTributeSize) - 1; const int CorpseBegin = invslot::PossessionsGeneral1; const int CorpseEnd = invslot::PossessionsGeneral1 + invslot::PossessionsCursor; diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index ac4466aab..e30f06741 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -1689,7 +1689,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app) if (iter == m_inv.cursor_cbegin()) continue; const ItemInst *inst = *iter; - SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketSummonItem); + SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketLimbo); } } @@ -7024,7 +7024,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app) { PushItemOnCursor(*inst); - SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketSummonItem); + SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketLimbo); GuildBanks->DeleteItem(GuildID(), gbwis->Area, gbwis->SlotID, gbwis->Quantity); } diff --git a/zone/command.cpp b/zone/command.cpp index 92116485c..332713f43 100644 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -10223,7 +10223,7 @@ void command_zopp(Client *c, const Seperator *sep) packettype = ItemPacketTrade; } else { - packettype = ItemPacketSummonItem; + packettype = ItemPacketLimbo; } int16 slotid = atoi(sep->arg[2]); diff --git a/zone/forage.cpp b/zone/forage.cpp index eb54d674d..e00d835b4 100644 --- a/zone/forage.cpp +++ b/zone/forage.cpp @@ -317,7 +317,7 @@ void Client::GoFish() else { PushItemOnCursor(*inst); - SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketSummonItem); + SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketLimbo); if(RuleB(TaskSystem, EnableTaskSystem)) UpdateTasksForItem(ActivityFish, food_id); @@ -431,7 +431,7 @@ void Client::ForageItem(bool guarantee) { } else { PushItemOnCursor(*inst); - SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketSummonItem); + SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketLimbo); if(RuleB(TaskSystem, EnableTaskSystem)) UpdateTasksForItem(ActivityForage, foragedfood); diff --git a/zone/inventory.cpp b/zone/inventory.cpp index 29f4574e1..8902f4e23 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -569,7 +569,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, // put item into inventory if (to_slot == EQEmu::legacy::SlotCursor) { PushItemOnCursor(*inst); - SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketSummonItem); + SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketLimbo); } else { PutItemInInventory(to_slot, *inst, true); @@ -710,7 +710,7 @@ void Client::SendCursorBuffer() SendCursorBuffer(); } else { - SendItemPacket(EQEmu::legacy::SlotCursor, test_inst, ItemPacketSummonItem); + SendItemPacket(EQEmu::legacy::SlotCursor, test_inst, ItemPacketLimbo); } } @@ -842,7 +842,7 @@ bool Client::PushItemOnCursor(const ItemInst& inst, bool client_update) m_inv.PushCursor(inst); if (client_update) { - SendItemPacket(EQEmu::legacy::SlotCursor, &inst, ItemPacketSummonItem); + SendItemPacket(EQEmu::legacy::SlotCursor, &inst, ItemPacketLimbo); } auto s = m_inv.cursor_cbegin(), e = m_inv.cursor_cend(); @@ -865,7 +865,7 @@ bool Client::PutItemInInventory(int16 slot_id, const ItemInst& inst, bool client if (client_update) { - SendItemPacket(slot_id, &inst, ((slot_id == EQEmu::legacy::SlotCursor) ? ItemPacketSummonItem : ItemPacketTrade)); + SendItemPacket(slot_id, &inst, ((slot_id == EQEmu::legacy::SlotCursor) ? ItemPacketLimbo : ItemPacketTrade)); //SendWearChange(Inventory::CalcMaterialFromSlot(slot_id)); } @@ -901,7 +901,7 @@ void Client::PutLootInInventory(int16 slot_id, const ItemInst &inst, ServerLootI if (slot_id == EQEmu::legacy::SlotCursor && !cursor_empty) { // RoF+ currently has a specialized cursor handler if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) - SendItemPacket(slot_id, &inst, ItemPacketSummonItem); + SendItemPacket(slot_id, &inst, ItemPacketLimbo); } else { SendLootItemInPacket(&inst, slot_id); diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp index 6508d6fc6..4a8b43365 100644 --- a/zone/spell_effects.cpp +++ b/zone/spell_effects.cpp @@ -1163,7 +1163,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove if (SummonedItem) { c->PushItemOnCursor(*SummonedItem); - c->SendItemPacket(EQEmu::legacy::SlotCursor, SummonedItem, ItemPacketSummonItem); + c->SendItemPacket(EQEmu::legacy::SlotCursor, SummonedItem, ItemPacketLimbo); safe_delete(SummonedItem); } SummonedItem = database.CreateItem(spell.base[i], charges); @@ -3018,7 +3018,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove if (SummonedItem) { Client *c=CastToClient(); c->PushItemOnCursor(*SummonedItem); - c->SendItemPacket(EQEmu::legacy::SlotCursor, SummonedItem, ItemPacketSummonItem); + c->SendItemPacket(EQEmu::legacy::SlotCursor, SummonedItem, ItemPacketLimbo); safe_delete(SummonedItem); }