aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-26 16:56:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2016-11-20 15:10:30 +01:00
parent 323f6bd83a
commit 1b0c3c2326
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/src/3d/ps_mesh.cpp
View file

@ -1117,6 +1117,7 @@ void CPSConstraintMesh::getShapesNames(std::string *shapesNames) const
std::copy(_MeshShapeFileName.begin(), _MeshShapeFileName.end(), stdext::make_unchecked_array_iterator(shapesNames)); std::copy(_MeshShapeFileName.begin(), _MeshShapeFileName.end(), stdext::make_unchecked_array_iterator(shapesNames));
#else #else
std::copy(_MeshShapeFileName.begin(), _MeshShapeFileName.end(), shapesNames); std::copy(_MeshShapeFileName.begin(), _MeshShapeFileName.end(), shapesNames);
#endif
} }

1
code/nel/src/3d/ps_ribbon.cpp
View file

@ -1469,6 +1469,7 @@ void CPSRibbon::getShape(CVector *shape) const
std::copy(_Shape.begin(), _Shape.end(), stdext::make_unchecked_array_iterator(shape)); std::copy(_Shape.begin(), _Shape.end(), stdext::make_unchecked_array_iterator(shape));
#else #else
std::copy(_Shape.begin(), _Shape.end(), shape); std::copy(_Shape.begin(), _Shape.end(), shape);
#endif
} }
///================================================================================================================== ///==================================================================================================================

6
code/nel/src/sound/driver/sound_driver.cpp
View file

@ -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. * MTR: Is there a way with NLMISC to replace SearchFile() ? Until then, no info for Linux.
*/ */
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
char buffer[1024], *ptr; wchar_t buffer[1024], *ptr;
uint len = SearchPath (NULL, dllName.c_str(), NULL, 1023, buffer, &ptr); uint len = SearchPathW (NULL, utf8ToWide(dllName), NULL, 1023, buffer, &ptr);
if( len ) 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 #endif
createSoundDriver = (ISDRV_CREATE_PROC) driverLib.getSymbolAddress(IDRV_CREATE_PROC_NAME); createSoundDriver = (ISDRV_CREATE_PROC) driverLib.getSymbolAddress(IDRV_CREATE_PROC_NAME);