Skip to content

Fix broken compilation, add m_virtualPlatinum #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
denizsokmen wants to merge 2 commits into from
Closed

Fix broken compilation, add m_virtualPlatinum #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9d700d
Fix broken compilation, add m_virtualPlatinum
denizsokmen Oct 8, 2015
ef17d04
Apparently, virtual platinum was supposed to be removed
denizsokmen Oct 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/graysvr/CClientUse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<DWORD>(m_pChar->m_virtualGold), static_cast<DWORD>(m_pChar->m_virtualPlatinum));
cmd2.prepareUpdateLedger(pCont1, static_cast<DWORD>(m_pChar->m_virtualGold));
cmd2.send(this);
}
if ( pChar->GetClient()->GetNetState()->isClientVersion(MINCLIVER_NEWSECURETRADE) )
{
cmd2.prepareUpdateLedger(pCont2, static_cast<DWORD>(pChar->m_virtualGold), static_cast<DWORD>(pChar->m_virtualPlatinum));
cmd2.prepareUpdateLedger(pCont2, static_cast<DWORD>(pChar->m_virtualGold));
cmd2.send(pChar->GetClient());
}

Expand Down
6 changes: 2 additions & 4 deletions src/network/send.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions src/network/send.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};

/***************************************************************************
Expand Down