From 9f88e3de2e5cb51c8d20c0207fbff99d36ade925 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 3 Jan 2015 14:23:02 -0500 Subject: [PATCH] Fix CCR Petition Stub --- .../Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp | 6 ++---- .../Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp | 2 +- Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp index 347e5ef4..e81b1e48 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgrSend.cpp @@ -170,10 +170,8 @@ void plNetClientMgr::ISendCCRPetition(plCCRPetitionMsg* petMsg) std::string buf; buf.resize( size ); ram.CopyToMem( (void*)buf.data() ); - - wchar_t * wStr = StrDupToUnicode(buf.c_str()); - NetCliAuthSendCCRPetition(wStr); - free(wStr); + + NetCliAuthSendCCRPetition(buf.c_str()); } // diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp index c68c58ef..d3cdc5a0 100644 --- a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp +++ b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp @@ -5762,7 +5762,7 @@ void NetCliAuthSetRecvBufferHandler ( //============================================================================ void NetCliAuthSendCCRPetition ( - const wchar_t * petitionText + const plString& petitionText ) { hsAssert(false, "eric, implement me."); } diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h index a3657f64..bfda8de4 100644 --- a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h +++ b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h @@ -575,7 +575,7 @@ void NetCliAuthChangePlayerNameRequest ( // CCRPetition //============================================================================ void NetCliAuthSendCCRPetition ( - const wchar_t * petitionText + const plString& petitionText ); //============================================================================