From bcc97fa1dc2258f73b5314762bd0f389b8a6371e Mon Sep 17 00:00:00 2001 From: Joseph Davies Date: Mon, 14 Jan 2013 15:13:06 -0800 Subject: [PATCH] Update MaxComponent for pfLocalization changes. Adds limited plString usage to MaxComponent's plPickLocalizationDlg for compatibility with pfLocalizationDataMgr. --- Sources/Tools/MaxComponent/plPickLocalizationDlg.cpp | 12 ++++++------ Sources/Tools/MaxMain/GlobalUtility.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Sources/Tools/MaxComponent/plPickLocalizationDlg.cpp b/Sources/Tools/MaxComponent/plPickLocalizationDlg.cpp index 259ee36c..8992ddd8 100644 --- a/Sources/Tools/MaxComponent/plPickLocalizationDlg.cpp +++ b/Sources/Tools/MaxComponent/plPickLocalizationDlg.cpp @@ -129,20 +129,20 @@ HTREEITEM plPickLocalizationDlg::IAddVar(std::string name, std::string match, HT void plPickLocalizationDlg::IAddLocalizations(std::string ageName, std::string setName, std::string itemName) { - std::vector ages = pfLocalizationDataMgr::Instance().GetAgeList(); + std::vector ages = pfLocalizationDataMgr::Instance().GetAgeList(); for (int curAge = 0; curAge < ages.size(); curAge++) { - HTREEITEM hAgeItem = IAddVar(WStringToString(ages[curAge]), ageName, TVI_ROOT); + HTREEITEM hAgeItem = IAddVar(ages[curAge].c_str(), ageName, TVI_ROOT); - std::vector sets = pfLocalizationDataMgr::Instance().GetSetList(ages[curAge]); + std::vector sets = pfLocalizationDataMgr::Instance().GetSetList(ages[curAge]); for (int curSet = 0; curSet < sets.size(); curSet++) { - std::vector elements = pfLocalizationDataMgr::Instance().GetElementList(ages[curAge], sets[curSet]); + std::vector elements = pfLocalizationDataMgr::Instance().GetElementList(ages[curAge], sets[curSet]); - HTREEITEM hSetItem = IAddVar(WStringToString(sets[curSet]), setName, hAgeItem); + HTREEITEM hSetItem = IAddVar(sets[curSet].c_str(), setName, hAgeItem); for (int curElement = 0; curElement < elements.size(); curElement++) - IAddVar(WStringToString(elements[curElement]), itemName, hSetItem); + IAddVar(elements[curElement].c_str(), itemName, hSetItem); } } } diff --git a/Sources/Tools/MaxMain/GlobalUtility.cpp b/Sources/Tools/MaxMain/GlobalUtility.cpp index 9aa13c7b..a85c679b 100644 --- a/Sources/Tools/MaxMain/GlobalUtility.cpp +++ b/Sources/Tools/MaxMain/GlobalUtility.cpp @@ -230,7 +230,7 @@ DWORD PlasmaMax::Start() { std::string clientPath(pathTemp); clientPath += "dat"; - pfLocalizationMgr::Initialize(clientPath); + pfLocalizationMgr::Initialize(clientPath.c_str()); } return GUPRESULT_KEEP;