diff --git a/code/nel/include/nel/misc/timeout_assertion_thread.h b/code/nel/include/nel/misc/timeout_assertion_thread.h index a934693c1..525e6a85b 100644 --- a/code/nel/include/nel/misc/timeout_assertion_thread.h +++ b/code/nel/include/nel/misc/timeout_assertion_thread.h @@ -97,12 +97,12 @@ public: //nldebug("activate"); } - void desactivate() + void deactivate() { if(_Control == QUIT) return; nlassert(_Control == ACTIVE); _Control = INACTIVE; - //nldebug("desactivate"); + //nldebug("deactivate"); } void quit() diff --git a/code/nel/include/nel/sound/async_file_manager_sound.h b/code/nel/include/nel/sound/async_file_manager_sound.h index 081429f9e..1c7b25646 100644 --- a/code/nel/include/nel/sound/async_file_manager_sound.h +++ b/code/nel/include/nel/sound/async_file_manager_sound.h @@ -25,7 +25,7 @@ class IBuffer; /** * CAsyncFileManagerSound is a class that manage sound file loading in a seperate thread * This class mostly depend on the CAsyncFileManager class for serializing async file - * loas request. + * loading request. * \author Boris Boucher * \author Nevrax France * \date 2002 diff --git a/code/nel/src/3d/scene_group.cpp b/code/nel/src/3d/scene_group.cpp index 5424ec50d..e6610b70c 100644 --- a/code/nel/src/3d/scene_group.cpp +++ b/code/nel/src/3d/scene_group.cpp @@ -577,7 +577,7 @@ bool CInstanceGroup::addToScene (CScene& scene, IDriver *driver, uint selectedTe } if( _Instances[i] == NULL ) { - nlwarning("Not found '%s' file\n", shapeName.c_str()); + nlwarning("Not found '%s' file", shapeName.c_str()); } } } diff --git a/code/nel/src/net/service.cpp b/code/nel/src/net/service.cpp index 8f57d1c92..d59dbe5a8 100644 --- a/code/nel/src/net/service.cpp +++ b/code/nel/src/net/service.cpp @@ -1492,7 +1492,7 @@ sint IService::main (const char *serviceShortName, const char *serviceLongName, _ResetMeasures = false; } - MyTAT.desactivate(); + MyTAT.deactivate(); } } catch (EFatalError &) diff --git a/code/ryzom/client/src/client_cfg.h b/code/ryzom/client/src/client_cfg.h index 33a20fa63..c83e651a1 100644 --- a/code/ryzom/client/src/client_cfg.h +++ b/code/ryzom/client/src/client_cfg.h @@ -297,7 +297,7 @@ struct CClientConfig /// SoundForceSoftwareBuffer bool SoundForceSoftwareBuffer; - /// The outgmae music file + /// The outgame music file string SoundOutGameMusic; /// The Sound SFX Volume (0-1) (ie all but music)