diff --git a/Source/Client/Mode/CGameMode.h b/Source/Client/Mode/CGameMode.h index 195351859..162664677 100644 --- a/Source/Client/Mode/CGameMode.h +++ b/Source/Client/Mode/CGameMode.h @@ -822,6 +822,7 @@ public: void ReceiveVendingItemList(int aid, int storeId, char own, int count, std::uint32_t duration, const unsigned char* data, int value, int unused); void ReceiveVendingItemList2(int aid, int storeId, char own, int count, std::uint32_t duration, const unsigned char* data); void ReceiveVendingItemSoldNow(const unsigned char* data); + void ProcessBuyingStorePurchase(int updateTime, int itemId, int amount, int zeny, int zenyLimit, int charId); void ReceiveBuyingStorePurchase(const unsigned char* packet); void ReceiveFriendAddResult(const unsigned char* data); void ReceiveNavigation(const unsigned char* packet); @@ -1036,6 +1037,5 @@ int CountItemRandomOptions(const unsigned char* entries); void TraceSelection(int selection); void TraceSelectionRange(int first, int last); void WriteMyLog(const char* file, int line, const char* format, ...); -void __stdcall ProcessBuyingStorePurchase(int updateTime, int itemId, int amount, int zeny, int zenyLimit, int charId); #endif diff --git a/Source/Client/Mode/GameModeNotices.cpp b/Source/Client/Mode/GameModeNotices.cpp index 8e60c1741..cae580aae 100644 --- a/Source/Client/Mode/GameModeNotices.cpp +++ b/Source/Client/Mode/GameModeNotices.cpp @@ -3950,7 +3950,7 @@ static __forceinline void FillVendingItem(ITEM_INFO& item, const VendingItemReco // OFFSET: 0x00D47720 // FUNCTION: fn_21850 void CGameMode::ReceiveVendingItemSoldNow(const unsigned char* data) { - ProcessBuyingStorePurchase(static_cast(_time32(nullptr)), *reinterpret_cast(data + 2), + this->ProcessBuyingStorePurchase(static_cast(_time32(nullptr)), *reinterpret_cast(data + 2), *reinterpret_cast(data + 6), *reinterpret_cast(data + 8), 0, 0); } diff --git a/Source/Client/Mode/GameModePackets.cpp b/Source/Client/Mode/GameModePackets.cpp index 8d063ef79..52a2c91ef 100644 --- a/Source/Client/Mode/GameModePackets.cpp +++ b/Source/Client/Mode/GameModePackets.cpp @@ -1977,7 +1977,7 @@ void __stdcall ProcessVendingSale(int field8, int itemIdWord, int quantityWord, // OFFSET: 0x00D08670 // FUNCTION: fn_21592 -void __declspec(noinline) __stdcall ProcessBuyingStorePurchase(int updateTime, int itemId, int amount, int zeny, int zenyLimit, int charId) { +__declspec(noinline) void CGameMode::ProcessBuyingStorePurchase(int updateTime, int itemId, int amount, int zeny, int zenyLimit, int charId) { ITEM_INFO item = g_session.FindItem1758ByItemId(itemId); item.SetItemId(itemId); item.quantity = amount; @@ -2003,7 +2003,7 @@ void __declspec(noinline) __stdcall ProcessBuyingStorePurchase(int updateTime, i // OFFSET: 0x00D08640 // FUNCTION: fn_21591 __declspec(noinline) void CGameMode::ReceiveBuyingStorePurchase(const unsigned char* packet) { - ProcessBuyingStorePurchase( + this->ProcessBuyingStorePurchase( *reinterpret_cast(packet + 0x14), *reinterpret_cast(packet + 2), *reinterpret_cast(packet + 6),