From f9d700d6aad3742bff8a7014533a3d011f50b107 Mon Sep 17 00:00:00 2001 From: Deniz Sokmen Date: Thu, 8 Oct 2015 19:33:46 +0300 Subject: [PATCH 1/2] Fix broken compilation, add m_virtualPlatinum --- src/graysvr/CObjBase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/graysvr/CObjBase.h b/src/graysvr/CObjBase.h index 76e0781c1..2825d2010 100644 --- a/src/graysvr/CObjBase.h +++ b/src/graysvr/CObjBase.h @@ -2693,6 +2693,7 @@ class CChar : public CObjBase, public CContainer, public CTextConsole CPointMap m_ptHome; // What is our "home" region. (towns and bounding of NPC's) FONT_TYPE m_fonttype; // Speech font to use // can client set this ? INT64 m_virtualGold; // Virtual gold used by TOL clients + INT64 m_virtualPlatinum; // Virtual platinum // In order to revert to original Hue and body. CREID_TYPE m_prev_id; // Backup of body type for ghosts and poly From ef17d04c7411a31429c195a51abc90a08ad553d7 Mon Sep 17 00:00:00 2001 From: Deniz Sokmen Date: Thu, 8 Oct 2015 19:38:52 +0300 Subject: [PATCH 2/2] Apparently, virtual platinum was supposed to be removed --- src/graysvr/CClientUse.cpp | 4 ++-- src/graysvr/CObjBase.h | 1 - src/network/send.cpp | 6 ++---- src/network/send.h | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/graysvr/CClientUse.cpp b/src/graysvr/CClientUse.cpp index 78823c95d..ef2eb998d 100644 --- a/src/graysvr/CClientUse.cpp +++ b/src/graysvr/CClientUse.cpp @@ -1475,12 +1475,12 @@ bool CClient::Cmd_SecureTrade( CChar * pChar, CItem * pItem ) PacketTradeAction cmd2(SECURE_TRADE_UPDATELEDGER); if ( GetNetState()->isClientVersion(MINCLIVER_NEWSECURETRADE) ) { - cmd2.prepareUpdateLedger(pCont1, static_cast(m_pChar->m_virtualGold), static_cast(m_pChar->m_virtualPlatinum)); + cmd2.prepareUpdateLedger(pCont1, static_cast(m_pChar->m_virtualGold)); cmd2.send(this); } if ( pChar->GetClient()->GetNetState()->isClientVersion(MINCLIVER_NEWSECURETRADE) ) { - cmd2.prepareUpdateLedger(pCont2, static_cast(pChar->m_virtualGold), static_cast(pChar->m_virtualPlatinum)); + cmd2.prepareUpdateLedger(pCont2, static_cast(pChar->m_virtualGold)); cmd2.send(pChar->GetClient()); } diff --git a/src/graysvr/CObjBase.h b/src/graysvr/CObjBase.h index 2825d2010..76e0781c1 100644 --- a/src/graysvr/CObjBase.h +++ b/src/graysvr/CObjBase.h @@ -2693,7 +2693,6 @@ class CChar : public CObjBase, public CContainer, public CTextConsole CPointMap m_ptHome; // What is our "home" region. (towns and bounding of NPC's) FONT_TYPE m_fonttype; // Speech font to use // can client set this ? INT64 m_virtualGold; // Virtual gold used by TOL clients - INT64 m_virtualPlatinum; // Virtual platinum // In order to revert to original Hue and body. CREID_TYPE m_prev_id; // Backup of body type for ghosts and poly diff --git a/src/network/send.cpp b/src/network/send.cpp index 0149aedf1..70b1a7956 100644 --- a/src/network/send.cpp +++ b/src/network/send.cpp @@ -1794,25 +1794,23 @@ void PacketTradeAction::prepareClose(const CItemContainer *container) writeBool(false); } -void PacketTradeAction::prepareUpdateGold(const CItemContainer *container, DWORD gold, DWORD platinum) +void PacketTradeAction::prepareUpdateGold(const CItemContainer *container, DWORD gold) { ADDTOCALLSTACK("PacketTradeAction::prepareUpdateGold"); seek(4); writeInt32(container->GetUID()); writeInt32(gold); - writeInt32(platinum); writeBool(false); } -void PacketTradeAction::prepareUpdateLedger(const CItemContainer *container, DWORD gold, DWORD platinum) +void PacketTradeAction::prepareUpdateLedger(const CItemContainer *container, DWORD gold) { ADDTOCALLSTACK("PacketTradeAction::prepareUpdateLedger"); seek(4); writeInt32(container->GetUID()); writeInt32(gold); - writeInt32(platinum); writeBool(false); } diff --git a/src/network/send.h b/src/network/send.h index f6aa82284..bab111bf6 100644 --- a/src/network/send.h +++ b/src/network/send.h @@ -625,8 +625,8 @@ class PacketTradeAction : public PacketSend void prepareContainerOpen(const CChar *character, const CItem *container1, const CItem *container2); void prepareReadyChange(const CItemContainer *container1, const CItemContainer *container2); void prepareClose(const CItemContainer *container); - void prepareUpdateGold(const CItemContainer *container, DWORD gold, DWORD platinum); - void prepareUpdateLedger(const CItemContainer *container, DWORD gold, DWORD platinum); + void prepareUpdateGold(const CItemContainer *container, DWORD gold); + void prepareUpdateLedger(const CItemContainer *container, DWORD gold); }; /***************************************************************************