pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 15:41:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ItemPacketType updates

Browse Source
This commit is contained in:
Uleat 2016-05-27 03:38:13 -04:00
parent a144ecd21b
commit 0ecc702612
10 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/eq_packet_structs.h
View File

@ -1522,7 +1522,7 @@ enum ItemPacketType
ItemPacketLoot = 0x66, ItemPacketLoot = 0x66,
ItemPacketTrade = 0x67, ItemPacketTrade = 0x67,
ItemPacketCharInventory = 0x69, ItemPacketCharInventory = 0x69,
ItemPacketSummonItem = 0x6A, ItemPacketLimbo = 0x6A,
ItemPacketWorldContainer = 0x6B, ItemPacketWorldContainer = 0x6B,
ItemPacketTributeItem = 0x6C, ItemPacketTributeItem = 0x6C,
ItemPacketGuildTribute = 0x6D, ItemPacketGuildTribute = 0x6D,
@ -1536,8 +1536,8 @@ enum ItemPacketType
// ItemPacketTradeView = /*101*/ 0x65, // ItemPacketTradeView = /*101*/ 0x65,
// ItemPacketLoot = /*102*/ 0x66, // ItemPacketLoot = /*102*/ 0x66,
// ItemPacketTrade = /*103*/ 0x67, // ItemPacketTrade = /*103*/ 0x67,
// ItemPacketCharInventory = /*105*/ 0x69, // ItemPacketCharInventory = /*105*/ 0x69, // 105 looks like raw item packet (no appearance update) thru shared bank..110, possibly possessions with appearance update
// ItemPacketLimbo = /*106*/ 0x6A, // name change // ItemPacketLimbo = /*106*/ 0x6A,
// ItemPacketWorldContainer = /*107*/ 0x6B, // ItemPacketWorldContainer = /*107*/ 0x6B,
// ItemPacketTributeItem = /*108*/ 0x6C, // ItemPacketTributeItem = /*108*/ 0x6C,
// ItemPacketGuildTribute = /*109*/ 0x6D, // missing from EQEmu // ItemPacketGuildTribute = /*109*/ 0x6D, // missing from EQEmu

5
common/patches/sod_limits.h
View File

@ -210,7 +210,10 @@ namespace SoD
const int WorldEnd = (WorldBegin + invtype::InvTypeWorldSize) - 1; const int WorldEnd = (WorldBegin + invtype::InvTypeWorldSize) - 1;
const int TributeBegin = 400; 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 CorpseBegin = invslot::PossessionsGeneral1;
const int CorpseEnd = invslot::PossessionsGeneral1 + invslot::PossessionsCursor; const int CorpseEnd = invslot::PossessionsGeneral1 + invslot::PossessionsCursor;

5
common/patches/sof_limits.h
View File

@ -210,7 +210,10 @@ namespace SoF
const int WorldEnd = (WorldBegin + invtype::InvTypeWorldSize) - 1; const int WorldEnd = (WorldBegin + invtype::InvTypeWorldSize) - 1;
const int TributeBegin = 400; 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 CorpseBegin = PossessionsGeneral1;
const int CorpseEnd = PossessionsGeneral1 + PossessionsCursor; const int CorpseEnd = PossessionsGeneral1 + PossessionsCursor;

5
common/patches/titanium_limits.h
View File

@ -209,7 +209,10 @@ namespace Titanium
const int WorldEnd = (WorldBegin + invtype::InvTypeWorldSize) - 1; const int WorldEnd = (WorldBegin + invtype::InvTypeWorldSize) - 1;
const int TributeBegin = 400; 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 CorpseBegin = PossessionsGeneral1;
const int CorpseEnd = PossessionsGeneral1 + PossessionsCursor; const int CorpseEnd = PossessionsGeneral1 + PossessionsCursor;

5
common/patches/uf_limits.h
View File

@ -211,7 +211,10 @@ namespace UF
const int WorldEnd = (WorldBegin + invtype::InvTypeWorldSize) - 1; const int WorldEnd = (WorldBegin + invtype::InvTypeWorldSize) - 1;
const int TributeBegin = 400; 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 CorpseBegin = invslot::PossessionsGeneral1;
const int CorpseEnd = invslot::PossessionsGeneral1 + invslot::PossessionsCursor; const int CorpseEnd = invslot::PossessionsGeneral1 + invslot::PossessionsCursor;

4
zone/client_packet.cpp
View File

@ -1689,7 +1689,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
if (iter == m_inv.cursor_cbegin()) if (iter == m_inv.cursor_cbegin())
continue; continue;
const ItemInst *inst = *iter; 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); PushItemOnCursor(*inst);
SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketSummonItem); SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketLimbo);
GuildBanks->DeleteItem(GuildID(), gbwis->Area, gbwis->SlotID, gbwis->Quantity); GuildBanks->DeleteItem(GuildID(), gbwis->Area, gbwis->SlotID, gbwis->Quantity);
} }

2
zone/command.cpp
View File

@ -10223,7 +10223,7 @@ void command_zopp(Client *c, const Seperator *sep)
packettype = ItemPacketTrade; packettype = ItemPacketTrade;
} }
else { else {
packettype = ItemPacketSummonItem; packettype = ItemPacketLimbo;
} }
int16 slotid = atoi(sep->arg[2]); int16 slotid = atoi(sep->arg[2]);

4
zone/forage.cpp
View File

@ -317,7 +317,7 @@ void Client::GoFish()
else else
{ {
PushItemOnCursor(*inst); PushItemOnCursor(*inst);
SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketSummonItem); SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketLimbo);
if(RuleB(TaskSystem, EnableTaskSystem)) if(RuleB(TaskSystem, EnableTaskSystem))
UpdateTasksForItem(ActivityFish, food_id); UpdateTasksForItem(ActivityFish, food_id);
@ -431,7 +431,7 @@ void Client::ForageItem(bool guarantee) {
} }
else { else {
PushItemOnCursor(*inst); PushItemOnCursor(*inst);
SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketSummonItem); SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketLimbo);
if(RuleB(TaskSystem, EnableTaskSystem)) if(RuleB(TaskSystem, EnableTaskSystem))
UpdateTasksForItem(ActivityForage, foragedfood); UpdateTasksForItem(ActivityForage, foragedfood);

10
zone/inventory.cpp
View File

@ -569,7 +569,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
// put item into inventory // put item into inventory
if (to_slot == EQEmu::legacy::SlotCursor) { if (to_slot == EQEmu::legacy::SlotCursor) {
PushItemOnCursor(*inst); PushItemOnCursor(*inst);
SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketSummonItem); SendItemPacket(EQEmu::legacy::SlotCursor, inst, ItemPacketLimbo);
} }
else { else {
PutItemInInventory(to_slot, *inst, true); PutItemInInventory(to_slot, *inst, true);
@ -710,7 +710,7 @@ void Client::SendCursorBuffer()
SendCursorBuffer(); SendCursorBuffer();
} }
else { 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); m_inv.PushCursor(inst);
if (client_update) { 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(); 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) 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)); //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) { if (slot_id == EQEmu::legacy::SlotCursor && !cursor_empty) {
// RoF+ currently has a specialized cursor handler // RoF+ currently has a specialized cursor handler
if (ClientVersion() < EQEmu::versions::ClientVersion::RoF) if (ClientVersion() < EQEmu::versions::ClientVersion::RoF)
SendItemPacket(slot_id, &inst, ItemPacketSummonItem); SendItemPacket(slot_id, &inst, ItemPacketLimbo);
} }
else { else {
SendLootItemInPacket(&inst, slot_id); SendLootItemInPacket(&inst, slot_id);

4
zone/spell_effects.cpp
View File

@ -1163,7 +1163,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
if (SummonedItem) { if (SummonedItem) {
c->PushItemOnCursor(*SummonedItem); c->PushItemOnCursor(*SummonedItem);
c->SendItemPacket(EQEmu::legacy::SlotCursor, SummonedItem, ItemPacketSummonItem); c->SendItemPacket(EQEmu::legacy::SlotCursor, SummonedItem, ItemPacketLimbo);
safe_delete(SummonedItem); safe_delete(SummonedItem);
} }
SummonedItem = database.CreateItem(spell.base[i], charges); 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) { if (SummonedItem) {
Client *c=CastToClient(); Client *c=CastToClient();
c->PushItemOnCursor(*SummonedItem); c->PushItemOnCursor(*SummonedItem);
c->SendItemPacket(EQEmu::legacy::SlotCursor, SummonedItem, ItemPacketSummonItem); c->SendItemPacket(EQEmu::legacy::SlotCursor, SummonedItem, ItemPacketLimbo);
safe_delete(SummonedItem); safe_delete(SummonedItem);
} }