From 995ea1e64f552e29265ddb3a3d609924d3e2e0fc Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 9 Dec 2016 16:04:50 +0100 Subject: [PATCH] Changed: Unimplemented functions --HG-- branch : develop --- code/ryzom/client/src/interface_v3/action_handler_item.cpp | 2 -- .../world_editor/world_editor/dialog_properties.cpp | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/action_handler_item.cpp b/code/ryzom/client/src/interface_v3/action_handler_item.cpp index 30a13bbea..f3192a9ee 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_item.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_item.cpp @@ -429,8 +429,6 @@ static CDBCtrlSheet *CurrentStackDst= NULL; static TStackMode CurrentStackMode; -static void putStackableInventoryItemToExchange(CDBCtrlSheet *src, CDBCtrlSheet *dest, uint quantity); -static void putStackableExchangedItemToInventory(CDBCtrlSheet *src, CDBCtrlSheet *dest, uint quantity); static void validateStackItem(CDBCtrlSheet *src, CDBCtrlSheet *dest, sint32 quantity, TStackMode stackMode); diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp index 3462928db..91b3d292d 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/dialog_properties.cpp @@ -1671,8 +1671,9 @@ BOOL CDialogProperties::OnCommand(WPARAM wParam, LPARAM lParam) text += "\n"; } CConfigFile::CVar *var = getMainFrame ()->getConfigFile().getVarPtr ("TextEditor"); - char windows[512]; - GetWindowsDirectory (windows, sizeof (windows)); + + std::string windows = CPath::getWindowsDirectory(); + if (EditExternalText (var?var->asString():windows+string ("/notepad.exe"), text, widget->Parameter.FileExtension.c_str ())) { widget->Default = false;