From b15e73e1b211315677e1d715390ee3e167ee3da9 Mon Sep 17 00:00:00 2001 From: Aeadoin <109764533+Aeadoin@users.noreply.github.com> Date: Wed, 4 Jan 2023 14:49:43 -0500 Subject: [PATCH] [Bug Fix] AltCurrencySelectItemReply_Struct was not handled correctly. (#2702) --- common/emu_oplist.h | 2 +- common/eq_packet_structs.h | 8 ++++---- zone/client_packet.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/emu_oplist.h b/common/emu_oplist.h index b5e56422f..d8798c594 100644 --- a/common/emu_oplist.h +++ b/common/emu_oplist.h @@ -35,7 +35,7 @@ N(OP_AltCurrencyMerchantRequest), N(OP_AltCurrencyPurchase), N(OP_AltCurrencyReclaim), N(OP_AltCurrencySell), -N(OP_AltCurrencySellSelection), +N(OP_AltCurrencySellSelection), // Used by eqstr_us.txt 8066, 8068, 8069 N(OP_Animation), N(OP_AnnoyingZoneUnknown), N(OP_ApplyPoison), diff --git a/common/eq_packet_structs.h b/common/eq_packet_structs.h index b178cb28b..979c8b86e 100644 --- a/common/eq_packet_structs.h +++ b/common/eq_packet_structs.h @@ -5163,10 +5163,10 @@ struct AltCurrencySelectItemReply_Struct { /*000*/ uint32 unknown000; /*004*/ uint8 unknown004; //0xff /*005*/ uint8 unknown005; //0xff -/*006*/ uint8 unknown006; //0xff -/*007*/ uint8 unknown007; //0xff -/*008*/ char item_name[64]; -/*072*/ uint32 unknown074; +/*006*/ uint16 unknown006; //0xffff +/*008*/ uint16 unknown008; //0xffff +/*010*/ char item_name[64]; +/*074*/ uint16 unknown074; /*076*/ uint32 cost; /*080*/ uint32 unknown080; /*084*/ uint32 unknown084; diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 4589c0bde..75d549262 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -2849,8 +2849,8 @@ void Client::Handle_OP_AltCurrencySellSelection(const EQApplicationPacket *app) AltCurrencySelectItemReply_Struct *reply = (AltCurrencySelectItemReply_Struct*)outapp->pBuffer; reply->unknown004 = 0xFF; reply->unknown005 = 0xFF; - reply->unknown006 = 0xFF; - reply->unknown007 = 0xFF; + reply->unknown006 = 0xFFFF; + reply->unknown008 = 0xFFFF; strcpy(reply->item_name, inst->GetItem()->Name); reply->cost = cost; FastQueuePacket(&outapp);