diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp index c1e5d5a1..65e70d4c 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plLinkEffectsMgr.cpp @@ -64,7 +64,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnKeyedObject/plFixedKey.h" // chronicle var -#define kCleftSolved L"CleftSolved" +#define kCleftSolved "CleftSolved" #include "plAvatar/plArmatureMod.h" #include "plAvatar/plAvatarTasks.h" diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp index e1ae4468..b71efbf7 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp @@ -777,10 +777,8 @@ void plNetLinkingMgr::IPostProcessLink( void ) // Update our online status if (hsRef rvnInfo = VaultGetPlayerInfoNode()) { VaultPlayerInfoNode accInfo(rvnInfo); - wchar_t ageInstName[MAX_PATH]; plUUID ageInstGuid = *info->GetAgeInstanceGuid(); - StrToUnicode(ageInstName, info->GetAgeInstanceName(), arrsize(ageInstName)); - accInfo.SetAgeInstName(ageInstName); + accInfo.SetAgeInstName(info->GetAgeInstanceName()); accInfo.SetAgeInstUuid(ageInstGuid); accInfo.SetOnline(true); } @@ -869,11 +867,9 @@ uint8_t plNetLinkingMgr::IPreProcessLink(void) // Update our online status if (hsRef rvnInfo = VaultGetPlayerInfoNode()) { VaultPlayerInfoNode accInfo(rvnInfo); - wchar_t ageInstName[MAX_PATH]; - plUUID ageInstGuid = *GetAgeLink()->GetAgeInfo()->GetAgeInstanceGuid(); - StrToUnicode(ageInstName, info->GetAgeInstanceName(), arrsize(ageInstName)); - accInfo.SetAgeInstName(ageInstName); - accInfo.SetAgeInstUuid(ageInstGuid); + const plUUID* ageInstGuid = info->GetAgeInstanceGuid(); + accInfo.SetAgeInstName(info->GetAgeInstanceName()); + accInfo.SetAgeInstUuid(*ageInstGuid); accInfo.SetOnline(true); } #endif diff --git a/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp b/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp index c758b003..f05d76f5 100644 --- a/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp @@ -1120,7 +1120,6 @@ void NetCommSetActivePlayer (//--> plNetCommActivePlayerMsg if (s_player) { if (hsRef rvn = VaultGetPlayerInfoNode()) { VaultPlayerInfoNode pInfo(rvn); - pInfo.SetAgeInstName(nil); pInfo.SetAgeInstUuid(kNilUuid); pInfo.SetOnline(false); NetCliAuthVaultNodeSave(rvn, nil, nil); diff --git a/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp b/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp index ee2b8b4d..b5eec790 100644 --- a/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp +++ b/Sources/Plasma/PubUtilLib/plStatGather/plAutoProfile.cpp @@ -382,7 +382,7 @@ bool plAutoProfileImp::MsgReceive(plMessage* msg) if (ageBeginLoadingMsg) { plgDispatch::Dispatch()->UnRegisterForExactType(plAgeBeginLoadingMsg::Index(), GetKey()); - VaultAddChronicleEntryAndWait(L"InitialAvCursomizationsDone", 0, L"1"); + VaultAddChronicleEntryAndWait("InitialAvCursomizationsDone", 0, "1"); return true; }