From 818fc592879d1d12c6ff937fa056da4482b3c8bf Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 14 May 2019 03:24:19 +0300 Subject: Update packet SMSG_NPC_CASH_BUY --- src/net/eathena/cashshoprecv.cpp | 3 +-- src/net/eathena/packetsin.inc | 14 +++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'src/net/eathena') diff --git a/src/net/eathena/cashshoprecv.cpp b/src/net/eathena/cashshoprecv.cpp index 54679ac54..fef8c5906 100644 --- a/src/net/eathena/cashshoprecv.cpp +++ b/src/net/eathena/cashshoprecv.cpp @@ -102,8 +102,7 @@ void CashShopRecv::processCashShopOpen(Net::MessageIn &msg) void CashShopRecv::processCashShopBuyAck(Net::MessageIn &msg) { msg.readInt32("cash points"); - if (packetVersion >= 20070711) - msg.readInt32("kafra points"); + msg.readInt32("kafra points"); const uint16_t res = msg.readInt16("error"); switch (res) { diff --git a/src/net/eathena/packetsin.inc b/src/net/eathena/packetsin.inc index f27845f5a..6ace8fe6f 100644 --- a/src/net/eathena/packetsin.inc +++ b/src/net/eathena/packetsin.inc @@ -190,7 +190,6 @@ packet(SMSG_MVP_NO_ITEM, 0x010d, 2, &ChatRecv::processMVPNoI packet(SMSG_NPC_BUY, 0x00c6, -1, &BuySellRecv::processNpcBuy, 0); packet(SMSG_NPC_BUY_RESPONSE, 0x00ca, 3, &BuySellRecv::processNpcBuyResponse, 0); packet(SMSG_NPC_BUY_SELL_CHOICE, 0x00c4, 6, &Ea::BuySellRecv::processNpcBuySellChoice, 0); -packet(SMSG_NPC_CASH_BUY, 0x0849, 16, &CashShopRecv::processCashShopBuy, 0); packet(SMSG_NPC_CASH_POINTS, 0x0845, 10, &CashShopRecv::processCashShopPoints, 0); packet(SMSG_NPC_CASH_SCHEDULE, 0x08ca, -1, &CashShopRecv::processCashShopSchedule, 0); packet(SMSG_NPC_CASH_TAB_PRICE_LIST, 0x08c0, -1, &CashShopRecv::processCashShopTabPriceList, 0); @@ -694,6 +693,12 @@ if (packetVersionMain >= 20101005) packet(SMSG_HOMUNCULUS_INFO, 0x022e, 71, &HomunculusRecv::processHomunculusInfo1, 20101005); } +// 20101123 main +if (packetVersionMain >= 20101123) +{ + packet(SMSG_NPC_CASH_BUY, 0x0849, 16, &CashShopRecv::processCashShopBuy, 20101123); +} + // 20101124 if (packetVersion >= 20101124) { @@ -733,6 +738,12 @@ if (packetVersion >= 20120229) packet(SMSG_ACK_MERGE_ITEMS, 0x096f, 7, &InventoryRecv::processMergeItemResponse, 20120229); } +// 20120328 re +if (packetVersionRe >= 20120328) +{ + packet(SMSG_NPC_CASH_BUY, 0x0849, 16, &CashShopRecv::processCashShopBuy, 20120328); +} + // 20120410 packet(SMSG_BEING_CHARM, 0x08cf, 10, &BeingRecv::processBeingCharm, 20120410); packet(SMSG_RECRUIT_REGISTER_ACK, 0x08e6, 4, nullptr, 20120410); @@ -1233,6 +1244,7 @@ if (packets_zero == true) packet(SMSG_ENCHANT_EQUIPMENT, 0x0a3f, 9, &InventoryRecv::processEnchantEquipment, 20171018); packet(SMSG_GUILD_EXPULSION_LIST, 0x0a87, -1, &GuildRecv::processGuildExpulsionList3, 20171018); packet(SMSG_PLAYER_GUILD_PARTY_INFO, 0x0a30, 106, &BeingRecv::processPlayerGuilPartyInfo2, 20171018); + packet(SMSG_NPC_CASH_BUY, 0x0849, 16, &CashShopRecv::processCashShopBuy, 20171018); } // 20171019 zero -- cgit v1.2.3-60-g2f50