From 1b0c3c23267d4c3044896cd79bb612bf49a76859 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 20 Nov 2016 15:10:30 +0100 Subject: [PATCH] Merge with develop --- code/nel/src/3d/ps_mesh.cpp | 1 + code/nel/src/3d/ps_ribbon.cpp | 1 + code/nel/src/sound/driver/sound_driver.cpp | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/nel/src/3d/ps_mesh.cpp b/code/nel/src/3d/ps_mesh.cpp index b1a9cc8b8..e98dc801f 100644 --- a/code/nel/src/3d/ps_mesh.cpp +++ b/code/nel/src/3d/ps_mesh.cpp @@ -1117,6 +1117,7 @@ void CPSConstraintMesh::getShapesNames(std::string *shapesNames) const std::copy(_MeshShapeFileName.begin(), _MeshShapeFileName.end(), stdext::make_unchecked_array_iterator(shapesNames)); #else std::copy(_MeshShapeFileName.begin(), _MeshShapeFileName.end(), shapesNames); +#endif } diff --git a/code/nel/src/3d/ps_ribbon.cpp b/code/nel/src/3d/ps_ribbon.cpp index b00b89775..e03693349 100644 --- a/code/nel/src/3d/ps_ribbon.cpp +++ b/code/nel/src/3d/ps_ribbon.cpp @@ -1469,6 +1469,7 @@ void CPSRibbon::getShape(CVector *shape) const std::copy(_Shape.begin(), _Shape.end(), stdext::make_unchecked_array_iterator(shape)); #else std::copy(_Shape.begin(), _Shape.end(), shape); +#endif } ///================================================================================================================== diff --git a/code/nel/src/sound/driver/sound_driver.cpp b/code/nel/src/sound/driver/sound_driver.cpp index c36eac5c9..4c83d5a0d 100644 --- a/code/nel/src/sound/driver/sound_driver.cpp +++ b/code/nel/src/sound/driver/sound_driver.cpp @@ -225,10 +225,10 @@ ISoundDriver *ISoundDriver::createDriver(IStringMapperProvider *stringMapper, TD * MTR: Is there a way with NLMISC to replace SearchFile() ? Until then, no info for Linux. */ #ifdef NL_OS_WINDOWS - char buffer[1024], *ptr; - uint len = SearchPath (NULL, dllName.c_str(), NULL, 1023, buffer, &ptr); + wchar_t buffer[1024], *ptr; + uint len = SearchPathW (NULL, utf8ToWide(dllName), NULL, 1023, buffer, &ptr); if( len ) - nlinfo ("Using the library '%s' that is in the directory: '%s'", dllName.c_str(), buffer); + nlinfo ("Using the library '%s' that is in the directory: '%s'", dllName.c_str(), wideToUtf8(buffer).c_str()); #endif createSoundDriver = (ISDRV_CREATE_PROC) driverLib.getSymbolAddress(IDRV_CREATE_PROC_NAME);