diff --git a/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp b/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp index 1ccb9259..28618a02 100644 --- a/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp @@ -1168,18 +1168,16 @@ void NetCommDeletePlayer ( // --> plNetCommDeletePlayerMsg //============================================================================ void NetCommGetPublicAgeList (//-> plNetCommPublicAgeListMsg - const char ageName[], + const plString& ageName, void * param, plNetCommReplyMsg::EParamType ptype ) { NetCommParam * cp = new NetCommParam; cp->param = param; cp->type = ptype; - - wchar_t wStr[MAX_PATH]; - StrToUnicode(wStr, ageName, arrsize(wStr)); + NetCliAuthGetPublicAgeList( - wStr, + ageName, INetCliAuthGetPublicAgeListCallback, cp ); diff --git a/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.h b/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.h index 521f42c2..b12821ec 100644 --- a/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.h +++ b/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.h @@ -219,7 +219,7 @@ void NetCommDeletePlayer ( // --> plNetCommDeletePlayerMsg void * param ); void NetCommGetPublicAgeList (//-> plNetCommPublicAgeListMsg - const char ageName[], + const plString& ageName, void * param, plNetCommReplyMsg::EParamType ptype = plNetCommReplyMsg::kParamTypeOther ); diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp index 16db2d1c..c68c58ef 100644 --- a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp +++ b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp @@ -427,17 +427,17 @@ struct GetPublicAgeListTrans : NetAuthTrans { void * m_param; // send - wchar_t m_ageName[MAX_PATH]; - + plString m_ageName; + // recv ARRAY(NetAgeInfo) m_ages; GetPublicAgeListTrans ( - const wchar_t ageName[], + const plString& ageName, FNetCliAuthGetPublicAgeListCallback callback, void * param ); - + bool Send (); void Post (); bool Recv ( @@ -3218,14 +3218,14 @@ bool AccountChangePasswordRequestTrans::Recv ( //============================================================================ GetPublicAgeListTrans::GetPublicAgeListTrans ( - const wchar_t ageName[], + const plString& ageName, FNetCliAuthGetPublicAgeListCallback callback, void * param ) : NetAuthTrans(kGetPublicAgeListTrans) +, m_ageName(ageName) , m_callback(callback) , m_param(param) { - StrCopy(m_ageName, ageName, arrsize(m_ageName)); } //============================================================================ @@ -3233,10 +3233,12 @@ bool GetPublicAgeListTrans::Send () { if (!AcquireConn()) return false; + plStringBuffer ageName = m_ageName.ToUtf16(); + const uintptr_t msg[] = { kCli2Auth_GetPublicAgeList, m_transId, - (uintptr_t) &m_ageName, + (uintptr_t) ageName.GetData(), }; m_conn->Send(msg, arrsize(msg)); @@ -5414,7 +5416,7 @@ void NetCliAuthSetAgePublic ( //============================================================================ void NetCliAuthGetPublicAgeList ( - const wchar_t ageName[], + const plString& ageName, FNetCliAuthGetPublicAgeListCallback callback, void * param ) { diff --git a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h index ea3b6b6b..a3657f64 100644 --- a/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h +++ b/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h @@ -258,7 +258,7 @@ typedef void (*FNetCliAuthGetPublicAgeListCallback)( const ARRAY(NetAgeInfo) & ages ); void NetCliAuthGetPublicAgeList ( - const wchar_t ageName[], + const plString& ageName, FNetCliAuthGetPublicAgeListCallback callback, void * param );