merging

code/nel/include/nel/3d/anim_detail_trav.h

@@ -71,7 +71,7 @@ public:
 	// For clipTrav. cleared at beginning of CClipTrav::traverse
 	void				clearVisibleList();
 
-	// For ClipTrav only. NB: list is cleared at begining of traverse(). NB: only CTransform are supported
+	// For ClipTrav only. NB: list is cleared at begininng of traverse(). NB: only CTransform are supported
 	void				addVisibleModel(CTransform *model)
 	{
 		_VisibleList[_CurrentNumVisibleModels]= model;

code/nel/include/nel/3d/camera.h

@@ -68,7 +68,7 @@ public:
 class CCamera : public CTransform
 {
 public:
-	/// Call at the begining of the program, to register the model
+	/// Call at the beginning of the program, to register the model
 	static	void	registerBasic();
 
 

code/nel/include/nel/3d/clip_trav.h

@@ -93,7 +93,7 @@ public:
 
 	/// \name Visible List mgt. Those visible models are updated each traverse().
 	//@{
-	// NB: list is cleared at begining of traverse().
+	// NB: list is cleared at beginning of traverse().
 	void				addVisibleModel(CTransform *model)
 	{
 		model->_IndexInVisibleList= _CurrentNumVisibleModels;

code/nel/include/nel/3d/landscape_def.h

@@ -81,14 +81,14 @@ class	IDriver;
 class	CLandscapeGlobals
 {
 public:
-	// LANDSCAPE RENDERING CONTEXT.  Landscape must setup it at the begining at refine()/render().
+	// LANDSCAPE RENDERING CONTEXT.  Landscape must setup it at the beginning at refine()/render().
 	// The current date of LandScape for refine only.
 	static	sint	CurrentDate;
 	// The current date of LandScape for render only.
 	static	sint	CurrentRenderDate;
 	// The center view for refinement.
 	static	CVector RefineCenter;
-	// What is the treshold for tessellation.
+	// What is the threshold for tessellation.
 	static	float	RefineThreshold;
 	// Guess.
 	static	float	OORefineThreshold;
@@ -143,7 +143,7 @@ public:
 	static	CLandscapeVBAllocator	*CurrentTileVBAllocator;
 
 
-	// PATCH GLOBAL INTERFACE.  patch must setup them at the begining at refine()/render().
+	// PATCH GLOBAL INTERFACE.  patch must setup them at the beginning at refine()/render().
 	// NO!!! REMIND: can't have any patch global, since a propagated split()/updateErrorMetric()
 	// can arise. must use Patch pointer.
 

code/nel/include/nel/3d/landscape_model.h

@@ -42,7 +42,7 @@ const NLMISC::CClassId		LandscapeModelId=NLMISC::CClassId(0x5a573b55, 0x6b395829
 class	CLandscapeModel : public CTransform
 {
 public:
-	/// Call at the begining of the program, to register the model
+	/// Call at the beginning of the program, to register the model
 	static	void	registerBasic();
 
 public:

code/nel/include/nel/3d/load_balancing_trav.h

@@ -165,7 +165,7 @@ public:
 	// For clipTrav. cleared at beginning of CClipTrav::traverse
 	void				clearVisibleList();
 
-	// For ClipTrav only. NB: list is cleared at begining of traverse().
+	// For ClipTrav only. NB: list is cleared at beginning of traverse().
 	void				addVisibleModel(CTransform *model)
 	{
 		_VisibleList[_CurrentNumVisibleModels]= model;

code/nel/include/nel/3d/mesh_base_instance.h

@@ -53,7 +53,7 @@ const NLMISC::CClassId		MeshBaseInstanceId=NLMISC::CClassId(0xef44331, 0x739f6bc
 class CMeshBaseInstance : public CTransformShape
 {
 public:
-	/// Call at the begining of the program, to register the model
+	/// Call at the beginning of the program, to register the model
 	static	void	registerBasic();
 
 public:

code/nel/include/nel/3d/mesh_instance.h

@@ -49,7 +49,7 @@ const NLMISC::CClassId		MeshInstanceId=NLMISC::CClassId(0x6bfe0a34, 0x23b26dc9);
 class CMeshInstance : public CMeshBaseInstance
 {
 public:
-	/// Call at the begining of the program, to register the model
+	/// Call at the beginning of the program, to register the model
 	static	void	registerBasic();
 
 public:

code/nel/include/nel/3d/mesh_mrm_instance.h

@@ -49,7 +49,7 @@ const NLMISC::CClassId		MeshMRMInstanceId=NLMISC::CClassId(0xec608f3, 0x1111c33)
 class CMeshMRMInstance : public CMeshBaseInstance
 {
 public:
-	/// Call at the begining of the program, to register the model
+	/// Call at the beginning of the program, to register the model
 	static	void	registerBasic();
 
 protected:

code/nel/include/nel/3d/mesh_mrm_skinned_instance.h

@@ -49,7 +49,7 @@ const NLMISC::CClassId		MeshMRMSkinnedInstanceId=NLMISC::CClassId(0x6cfd2619, 0x
 class CMeshMRMSkinnedInstance : public CMeshBaseInstance
 {
 public:
-	/// Call at the begining of the program, to register the model
+	/// Call at the beginning of the program, to register the model
 	static	void	registerBasic();
 
 protected:

code/nel/include/nel/3d/mesh_multi_lod_instance.h

@@ -61,7 +61,7 @@ public:
 		Lod0Blend		=	0x1,
 	};
 
-	/// Call at the begining of the program, to register the model
+	/// Call at the beginning of the program, to register the model
 	static	void	registerBasic();
 
 	/// Last Matrix date for Lods

code/nel/include/nel/3d/meshvp_per_pixel_light.h

@@ -29,7 +29,7 @@ namespace NL3D {
 
 
 /**
- * This vertex program is used to perform perpixel lighting with meshs. Its ouputs are :
+ * This vertex program is used to perform perpixel lighting with meshs. Its outputs are :
  *
  * Coord Tex 0 : duplicate the tex Coord 0 set from the v.b.
  * Coord Tex 1 : The light vector in tangent space.

code/nel/include/nel/3d/patch.h

@@ -808,7 +808,7 @@ private:
 	CTessFarVertex	BaseFarVertices[4];
 
 
-	// Local info for CTessFace tiles. CPatch must setup them at the begining at refine()/render().
+	// Local info for CTessFace tiles. CPatch must setup them at the beginning at refine()/render().
 	// For Far Texture coordinates.
 	float			Far0UScale, Far0VScale, Far0UBias, Far0VBias;
 	float			Far1UScale, Far1VScale, Far1UBias, Far1VBias;

code/nel/include/nel/3d/point_light_model.h

@@ -55,7 +55,7 @@ const NLMISC::CClassId		PointLightModelId=NLMISC::CClassId(0x7e842eba, 0x140b6c6
 class CPointLightModel : public CTransform
 {
 public:
-	/// Call at the begining of the program, to register the model
+	/// Call at the beginning of the program, to register the model
 	static	void	registerBasic();
 
 

code/nel/include/nel/3d/ps_attrib_maker_template.h

@@ -29,7 +29,7 @@ namespace NL3D {
 /*
  *	In this file, we define several template that helps to create attributes maker such as gradient (of float, int, vector etc)
  * attributes maker are used in the particle system to generate values, such as size, color etc. see ps_attrib_maker.h
- * for more informations
+ * for more information
  */
 
 

code/nel/include/nel/3d/quad_grid_clip_manager.h

@@ -55,7 +55,7 @@ const NLMISC::CClassId		QuadGridClipManagerId=NLMISC::CClassId(0x1ffb079a, 0x6c5
 class CQuadGridClipManager : public CTransform
 {
 public:
-	/// Call at the begining of the program, to register the model
+	/// Call at the beginning of the program, to register the model
 	static	void	registerBasic();
 
 public:

code/nel/include/nel/3d/render_trav.h

@@ -227,7 +227,7 @@ public:
 	enum	{MaxVPLight= 4};
 
 	/** reset the lighting setup in the driver (all lights are disabled).
-	 *	called at begining of traverse(). Must be called by any model (before and after rendering)
+	 *	called at beginning of traverse(). Must be called by any model (before and after rendering)
 	 *	that wish to use CDriver::setLight() instead of the standard behavior with changeLightSetup()
 	 */
 	void		resetLightSetup();

code/nel/include/nel/3d/root_model.h

@@ -39,7 +39,7 @@ const NLMISC::CClassId		RootModelId=NLMISC::CClassId(0x25f0505d, 0x75c69f9);
 class CRootModel : public CTransform
 {
 public:
-	/// Call at the begining of the program, to register the model
+	/// Call at the beginning of the program, to register the model
 	static	void	registerBasic();
 
 

code/nel/include/nel/3d/seg_remanence.h

@@ -54,7 +54,7 @@ public:
 		CSegRemanence(CSegRemanence &other);
 		CSegRemanence &operator = (CSegRemanence &other);
 	//@}
-	/// Call at the begining of the program, to register the model
+	/// Call at the beginning of the program, to register the model
 	static	void			registerBasic();
 	/// to instanciate that model from a scene
 	static CTransform		*creator() { return new CSegRemanence; }

code/nel/include/nel/3d/skeleton_model.h

@@ -79,7 +79,7 @@ public:
 	/// max number of bones supported in skeleton
 	enum	{ MaxNumBones = 256 };
 
-	/// Call at the begining of the program, to register the model
+	/// Call at the beginning of the program, to register the model
 	static	void	registerBasic();
 
 public:

code/nel/include/nel/3d/transform.h

@@ -90,7 +90,7 @@ const NLMISC::CClassId		TransformId=NLMISC::CClassId(0x174750cb, 0xf952024);
 class CTransform : public ITransformable
 {
 public:
-	/// Call at the begining of the program, to register the model
+	/// Call at the beginning of the program, to register the model
 	static	void	registerBasic();
 
 	/// get the scene which has created us
@@ -113,7 +113,7 @@ public:
 	/**
 	 *	Extra init for a model. this method is called by the framework at the very end of CScene::createModel()
 	 *	Warning! if the model is a CTransformShape, then when initModel() is called, Shape and other related member/setup
-	 *	of IShape::createInstance() are not yet done (because createModel() is called at the begining in createInstance()).
+	 *	of IShape::createInstance() are not yet done (because createModel() is called at the beginning in createInstance()).
 	 *
 	 *	Because initModel() is called at the very end, deriver could implement anything like creating other models,
 	 *	but not deleting this model...

code/nel/include/nel/3d/transform_shape.h

@@ -55,7 +55,7 @@ const NLMISC::CClassId		TransformShapeId=NLMISC::CClassId(0x1e6115e6, 0x63502517
 class CTransformShape : public CTransform
 {
 public:
-	/// Call at the begining of the program, to register the model
+	/// Call at the beginning of the program, to register the model
 	static	void	registerBasic();
 
 public:

code/nel/include/nel/3d/vegetable_blend_layer_model.h

@@ -48,7 +48,7 @@ const NLMISC::CClassId		VegetableBlendLayerModelId=NLMISC::CClassId(0x77375163,
 class CVegetableBlendLayerModel : public CTransform
 {
 public:
-	/// Call at the begining of the program, to register the model
+	/// Call at the beginning of the program, to register the model
 	static	void	registerBasic();
 
 public:

code/nel/include/nel/3d/vertex_program_parse.h

@@ -188,7 +188,7 @@ public:
 	  * \warning: Only syntax is checked. It doesn't check that a register has been initialised before use.
 	  * \param src The input text of a vertex program, in OpenGL format.
 	  * \param result The result program.
-	  * \param errorOuput If parsing failed, contains the reason
+	  * \param errorOutput If parsing failed, contains the reason
 	  * \result true if the parsing succeeded
 	  */
 	bool parse(const char *src, TProgram &result, std::string &errorOutput);

code/nel/include/nel/misc/debug.h

@@ -478,7 +478,7 @@ do { \
 
 #endif // NL_NO_DEBUG
 
-#define nlunreferenced(identifier) (identifier)
+#define nlunreferenced(identifier) (void)identifier
 
 #define nlstop \
 do { \

code/nel/include/nel/misc/xml_pack.h

@@ -69,7 +69,7 @@ namespace NLMISC
 		 *	return true and advance the it iterator if match is found.
 		 */
 		bool matchString(std::string::iterator &it, std::string::iterator end, const char *text);
-		/// Advance up to the begining of the next line, incrementing the in/out param lineCount
+		/// Advance up to the beginning of the next line, incrementing the in/out param lineCount
 		void skipLine(std::string::iterator &it, std::string::iterator end, uint32 &lineCount);
 		///@}
 

code/nel/nel-config.in

@@ -5,7 +5,7 @@
 # nel-config
 #
 # Script printing NeL's install library/include paths and some other
-# informations like NeL's version
+# information like NeL's version
 #
 
 prefix=@prefix@

code/nel/samples/pacs/readme.txt

@@ -12,7 +12,7 @@ This sample show:
 - Managing several dynamic world image
 - Moving PACS primitives
 - Managing collisions
-- Get triggered informations by collisions (flashes)
+- Get triggered information by collisions (flashes)
 
 ----------------
 

code/nel/src/3d/driver/direct3d/driver_direct3d.h

@@ -640,7 +640,7 @@ public:
 	void	*lock (uint size, uint stride, uint &offset);
 	void	unlock ();
 
-	// Runtime reset (called at the begining of the frame rendering), blocking lock here.
+	// Runtime reset (called at the beginning of the frame rendering), blocking lock here.
 	void	reset ();
 };
 
@@ -670,7 +670,7 @@ public:
 	void	*lock (uint size, uint &offset);
 	void	unlock ();
 
-	// Runtime reset (called at the begining of the frame rendering), blocking lock here.
+	// Runtime reset (called at the beginning of the frame rendering), blocking lock here.
 	void	reset ();
 };
 

code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp

@@ -209,7 +209,7 @@ static bool isTextKeyEvent(NSEvent* event)
 
 	/*
 		TODO check why iswprint(character) does not solve it.
-			it always returns false, even for π, é, ...
+			it always returns false, even for non-ASCII characters
 	*/
 	// characters > 127 but not printable
 	if( nelKey == NLMISC::KeyF1    || nelKey == NLMISC::KeyF2    ||

code/nel/src/3d/particle_system_shape.cpp

@@ -173,7 +173,7 @@ void	CParticleSystemShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 ///===========================================================================
 void CParticleSystemShape::buildFromPS(const CParticleSystem &ps)
 {
-	// must be sure that we are writting in the stream
+	// must be sure that we are writing in the stream
 	if (_ParticleSystemProto.isReading())
 	{
 		_ParticleSystemProto.invert();

code/nel/src/3d/tessellation.cpp

@@ -202,7 +202,7 @@ CTessFace::~CTessFace()
 // ***************************************************************************
 float			CTessFace::computeNearLimit()
 {
-	// General formula for Level, function of Size, treshold etc...:
+	// General formula for Level, function of Size, threshold etc...:
 	// WantedLevel= log2(BaseSize / sqrdist / RefineThreshold);
 	// <=> WantedLevel= log2( CurSize*2^Level / sqrdist / RefineThreshold).
 	// <=> WantedLevel= log2( ProjectedSize* 2^Level / RefineThreshold).
@@ -1774,7 +1774,7 @@ void		CTessFace::refineAll()
 
 	/*
 		if(ps<RefineThreshold), the face must be merged (ie have no leaves).
-		if(ps E [RefineThreshold, RefineTreshold*2]), the face must be splitted (ave leaves), and is geomorphed.
+		if(ps E [RefineThreshold, RefineThreshold*2]), the face must be splitted (ave leaves), and is geomorphed.
 		if(ps>RefineThreshold*2), the face is fully splitted/geomoprhed (tests reported on sons...).
 	*/
 
@@ -1831,7 +1831,7 @@ void		CTessFace::refineAll()
 // Split or merge, and meaning of errorMetric:
 /*
 	if(errorMetric<RefineThreshold), the face must be merged (ie have no leaves).
-	if(errorMetric E [RefineThreshold, RefineTreshold*2]), the face must be splitted (ave leaves), and is geomorphed.
+	if(errorMetric E [RefineThreshold, RefineThreshold*2]), the face must be splitted (ave leaves), and is geomorphed.
 	if(errorMetric>RefineThreshold*2), the face is fully splitted/geomoprhed.
 */
 

code/nel/src/3d/vertex_program_parse.cpp

@@ -146,7 +146,7 @@ bool CVPParser::parseOperand(CVPOperand &operand, bool outputOperand, std::strin
 			break;
 			case 'A': result = parseAddressRegister(operand, errorOutput); break;
 			case '-':
-				errorOutput = "Negation not allowed on ouput register.";
+				errorOutput = "Negation not allowed on output register.";
 				return false;
 			default:
 				errorOutput = "Output, Address, or Temporary register expected as an output operand.";
@@ -365,7 +365,7 @@ bool CVPParser::parseOutputRegister(CVPOperand &operand, std::string &errorOutpu
 	operand.Type = CVPOperand::OutputRegister;
 	if (*_CurrChar != '[')
 	{
-		errorOutput = "'[' expected when parsing an ouput register.";
+		errorOutput = "'[' expected when parsing an output register.";
 		return false;
 	}
 	++_CurrChar;
@@ -565,7 +565,7 @@ bool CVPParser::parseAddressRegister(CVPOperand &operand, std::string &errorOutp
 bool CVPParser::parseOp2(CVPInstruction &instr,std::string &errorOutput)
 {
 	skipSpacesAndComments();
-	// parse ouput
+	// parse output
 	if (!parseOperand(instr.Dest, true, errorOutput)) return false;
 	// Can't write in input or consant register
 	if (instr.Dest.Type == CVPOperand::Constant || instr.Dest.Type == CVPOperand::InputRegister)

code/nel/src/3d/zone_lighter.cpp

@@ -2781,7 +2781,7 @@ void CZoneLighter::computeTileFlagsOnly (CLandscape &landscape, CZone& output, u
 
 	// can't copy tile flags
 	if(!ok)
-		throw Exception("The input zonew, and ouput zonel are too different: not same patchs!!");
+		throw Exception("The input zonew, and output zonel are too different: not same patchs!!");
 
 	/// copy the tiles flags from the zone to light to the output zone
 	copyTileFlags(output, zonew);

code/nel/src/logic/logic_state_machine.cpp

@@ -426,7 +426,7 @@ void CLogicStateMachine::setVerbose( string varName, bool b )
 		filter = 1;
 	}
 	else
-	// xxx* => we look for a string with xxx at the begining
+	// xxx* => we look for a string with xxx at the beginning
 	if( varName[varName.size()-1]=='*' )
 	{
 		motif = varName.substr(0,varName.size()-1);

code/nel/src/misc/co_task.cpp

@@ -15,9 +15,13 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdmisc.h"
+
+#include "nel/misc/types_nl.h"
 #include "nel/misc/co_task.h"
 #include "nel/misc/tds.h"
 #include "nel/misc/time_nl.h"
+#include "nel/misc/debug.h"
+
 // Flag to use thread instead of coroutine primitives (i.e windows fibers or gcc context)
 #ifndef NL_OS_WINDOWS
 #define NL_USE_THREAD_COTASK
@@ -59,6 +63,10 @@
 #endif
 #endif //NL_USE_THREAD_COTASK
 
+#ifdef DEBUG_NEW
+	#define new DEBUG_NEW
+#endif
+
 namespace NLMISC
 {
 

code/nel/src/misc/common.cpp

@@ -16,6 +16,9 @@
 
 #include "stdmisc.h"
 
+#include "nel/misc/types_nl.h"
+#include "nel/misc/common.h"
+
 #ifdef NL_OS_WINDOWS
 #	define NOMINMAX
 #	include <windows.h>
@@ -68,6 +71,9 @@ extern "C" long _ftol2( double dblSource ) { return _ftol( dblSource ); }
 #endif // NL_OS_WINDOWS
 
 
+#ifdef DEBUG_NEW
+	#define new DEBUG_NEW
+#endif
 
 namespace	NLMISC
 {

code/nel/src/misc/config_file/cf_gramatical.ypp

@@ -225,7 +225,7 @@ inst:		VARIABLE ADD_ASSIGN expression SEMICOLON
 					}
 					else
 					{
-						// this var has been created in a parent Cfg, append at the begining of the array
+						// this var has been created in a parent Cfg, append at the beginning of the array
 						Var.add ((*((vector<NLMISC::CConfigFile::CVar>*)(YYPARSE_PARAM)))[i]);
 						if (Var != (*((vector<NLMISC::CConfigFile::CVar>*)(YYPARSE_PARAM)))[i] && Var.Callback != NULL)
 							(Var.Callback)(Var);

code/nel/src/misc/config_file/config_file.cpp

@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include "../stdmisc.h"
 #include "nel/misc/config_file.h"
 
 #include <ctime>
@@ -27,6 +28,10 @@
 #include "nel/misc/mem_stream.h"
 #include "locale.h"
 
+#ifdef DEBUG_NEW
+	#define new DEBUG_NEW
+#endif
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/misc/contiguous_block_allocator.cpp

@@ -15,8 +15,13 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdmisc.h"
+
 #include "nel/misc/contiguous_block_allocator.h"
 
+#ifdef DEBUG_NEW
+	#define new DEBUG_NEW
+#endif
+
 namespace NLMISC
 {
 

code/nel/src/misc/debug.cpp

@@ -16,6 +16,9 @@
 
 #include "stdmisc.h"
 
+#include "nel/misc/types_nl.h"
+#include "nel/misc/debug.h"
+
 #ifdef HAVE_NELCONFIG_H
 #  include "nelconfig.h"
 #endif // HAVE_NELCONFIG_H
@@ -27,6 +30,7 @@
 #include "nel/misc/report.h"
 #include "nel/misc/path.h"
 #include "nel/misc/variable.h"
+#include "nel/misc/system_info.h"
 
 #ifdef NL_OS_WINDOWS
 #	define _WIN32_WINDOWS	0x0410
@@ -79,6 +83,9 @@ using namespace std;
 // If true, debug system will trap crash even if the application is in debugger
 static const bool TrapCrashInDebugger = false;
 
+#ifdef DEBUG_NEW
+	#define new DEBUG_NEW
+#endif
 
 namespace NLMISC
 {
@@ -90,7 +97,7 @@ namespace NLMISC
 bool DisableNLDebug= false;
 NLMISC::CVariablePtr<bool> _DisableNLDebug("nel","DisableNLDebug","Disables generation and output of nldebug logs (no code associated with the log generation is executed)",&DisableNLDebug,true);
 
-static std::string LogPath = "";
+static std::string LogPath;
 
 //bool DebugNeedAssert = false;
 //bool NoAssert = false;

code/nel/src/misc/displayer.cpp

@@ -16,6 +16,7 @@
 
 #include "stdmisc.h"
 
+#include "nel/misc/types_nl.h"
 
 #ifdef NL_OS_WINDOWS
 #	include <io.h>
@@ -49,6 +50,10 @@
 
 using namespace std;
 
+#ifdef DEBUG_NEW
+	#define new DEBUG_NEW
+#endif
+
 namespace NLMISC
 {
 

code/nel/src/misc/fixed_size_allocator.cpp

@@ -15,8 +15,13 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdmisc.h"
-#include "nel/misc/fixed_size_allocator.h"
 
+#include "nel/misc/fixed_size_allocator.h"
+#include "nel/misc/debug.h"
+
+#ifdef DEBUG_NEW
+	#define new DEBUG_NEW
+#endif
 
 namespace NLMISC
 {

code/nel/src/misc/heap_memory.cpp

@@ -17,9 +17,13 @@
 #include "stdmisc.h"
 
 #include "nel/misc/heap_memory.h"
+#include "nel/misc/debug.h"
 
 using namespace std;
 
+#ifdef DEBUG_NEW
+	#define new DEBUG_NEW
+#endif
 
 namespace NLMISC
 {

code/nel/src/misc/log.cpp

@@ -16,6 +16,8 @@
 
 #include "stdmisc.h"
 
+#include "nel/misc/log.h"
+
 #ifdef NL_OS_WINDOWS
 #	define NOMINMAX
 #	include <process.h>
@@ -31,6 +33,9 @@
 
 using namespace std;
 
+#ifdef DEBUG_NEW
+	#define new DEBUG_NEW
+#endif
 
 namespace NLMISC
 {
@@ -430,7 +435,7 @@ void CLog::displayRawString (const char *str)
 			(*idi)->display( *args, disp );
 		}
 	}
-	TempString = "";
+	TempString.clear();
 	unsetPosition();
 }
 

code/nel/src/misc/object_arena_allocator.cpp

@@ -18,6 +18,10 @@
 #include "nel/misc/object_arena_allocator.h"
 #include "nel/misc/fixed_size_allocator.h"
 
+#ifdef DEBUG_NEW
+	#define new DEBUG_NEW
+#endif
+
 namespace NLMISC
 {
 

code/nel/src/misc/path.cpp

@@ -1222,18 +1222,18 @@ void CFileContainer::addSearchBigFile (const string &sBigFilename, bool recurse,
 		//nlfseek64 (Handle, 0, SEEK_END);
 		//uint32 nFileSize = ftell (Handle);
 		nlfseek64 (Handle, nFileSize-4, SEEK_SET);
-		uint32 nOffsetFromBegining;
-		if (fread (&nOffsetFromBegining, sizeof(uint32), 1, Handle) != 1)
+		uint32 nOffsetFromBeginning;
+		if (fread (&nOffsetFromBeginning, sizeof(uint32), 1, Handle) != 1)
 		{
 			fclose(Handle);
 			return;
 		}
 
 #ifdef NL_BIG_ENDIAN
-		NLMISC_BSWAP32(nOffsetFromBegining);
+		NLMISC_BSWAP32(nOffsetFromBeginning);
 #endif
 
-		nlfseek64 (Handle, nOffsetFromBegining, SEEK_SET);
+		nlfseek64 (Handle, nOffsetFromBeginning, SEEK_SET);
 		uint32 nNbFile;
 		if (fread (&nNbFile, sizeof(uint32), 1, Handle) != 1)
 		{

code/nel/src/net/message.cpp

@@ -79,7 +79,7 @@ CMessage::CMessage (NLMISC::CMemStream &memstr) :
 	else
 		invert(); // calls readType()
 	if ( ! reading )
-		invert(); // set ouput mode back if necessary
+		invert(); // set output mode back if necessary
 	seek( pos, begin ); // sets the same position as the one in the memstream
 }
 

code/nel/src/sound/context_sound.cpp

@@ -276,7 +276,7 @@ void CContextSound::init()
 				if (i == _BaseName.size())
 				{
 					// The base name is ok, check that the next char is a digit (avoid conflit if some
-					// sound have a longeur base name with same begining)
+					// sound have a longeur base name with same beginning)
 					if (soundName[i] >= '0' && soundName[i] <= '9')
 						_ContextSounds->addSound(CAudioMixerUser::instance()->getSoundId(*first), _BaseName);
 				}

code/nel/tools/3d/build_gamedata/cfg/panoply.cfg

@@ -6,7 +6,7 @@
 // additionnal paths to search for masks textures
 //additionnal_paths = { "panoply" };
 
-// the ouput path for result textures
+// the output path for result textures
 output_path = "tga";
 
 // A character that is used to generate output names when a mask is not defined for a texture.

code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.cpp

@@ -116,13 +116,13 @@ bool BNPFileHandle::readHeader(const std::string &filePath)
 	uint32 nFileSize = bnp.getFileSize();
 	bnp.seek(nFileSize-sizeof(uint32), IStream::begin);
 
-	uint32 nOffsetFromBegining;
+	uint32 nOffsetFromBeginning;
 
-	bnp.serial(nOffsetFromBegining);
+	bnp.serial(nOffsetFromBeginning);
 	
-	if ( !bnp.seek (nOffsetFromBegining, IStream::begin) )
+	if ( !bnp.seek (nOffsetFromBeginning, IStream::begin) )
 	{
-		nlwarning("Could not read offset from begining");
+		nlwarning("Could not read offset from beginning");
 		bnp.close();
 		return false;
 	}
@@ -206,7 +206,7 @@ void BNPFileHandle::fileNames(std::vector<std::string> &fileNames)
 // ***************************************************************************
 void BNPFileHandle::addFiles( const vector<string> &filePathes)
 {
-	uint32 OffsetFromBegining = 0;
+	uint32 OffsetFromBeginning = 0;
 
 	// create packed files and add them to the private vector
 	vector<string>::const_iterator it_vec = filePathes.begin();
@@ -233,13 +233,13 @@ void BNPFileHandle::addFiles( const vector<string> &filePathes)
 	{
 		append(m_openedBNPFile + ".tmp", *it_packed);
 		// Set now the new offset for the new header
-		it_packed->m_pos = OffsetFromBegining;
-		OffsetFromBegining += it_packed->m_size;
+		it_packed->m_pos = OffsetFromBeginning;
+		OffsetFromBeginning += it_packed->m_size;
 
 		it_packed++;
 	}
 
-	writeHeader(m_openedBNPFile + ".tmp", OffsetFromBegining);
+	writeHeader(m_openedBNPFile + ".tmp", OffsetFromBeginning);
 
 	// Delete any previous existing file
 	if (CFile::fileExists( m_openedBNPFile ))
@@ -252,7 +252,7 @@ void BNPFileHandle::deleteFiles( const vector<string>& fileNames)
 {
 	vector<string>::const_iterator it_vec;
 	TPackedFilesList::iterator it_packed;
-	uint32 OffsetFromBegining = 0;
+	uint32 OffsetFromBeginning = 0;
 	string tmpFile = m_openedBNPFile + ".tmp";
 
 	// create a new temporary bnp file with extension *.tmp
@@ -270,14 +270,14 @@ void BNPFileHandle::deleteFiles( const vector<string>& fileNames)
 		{
 			append(tmpFile, *it_packed);
 			// Set now the new offset for the new header
-			it_packed->m_pos = OffsetFromBegining;
-			OffsetFromBegining += it_packed->m_size;
+			it_packed->m_pos = OffsetFromBeginning;
+			OffsetFromBeginning += it_packed->m_size;
 
 			it_packed++;
 		}
 	}
 
-	writeHeader(tmpFile, OffsetFromBegining);
+	writeHeader(tmpFile, OffsetFromBeginning);
 	
 	CFile::deleteFile( m_openedBNPFile );
 	string src = m_openedBNPFile + ".tmp";

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_form.ui

@@ -395,7 +395,7 @@
        <item row="4" column="0" colspan="2">
         <widget class="QLabel" name="blurTreshholdLabel">
          <property name="text">
-          <string>Fake motion blur treshold:</string>
+          <string>Fake motion blur threshold:</string>
          </property>
         </widget>
        </item>

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_page.cpp

@@ -64,8 +64,8 @@ CLocatedBindablePage::CLocatedBindablePage(QWidget *parent)
 	_ui.blurCoeffWidget->setWrapper(&_MotionBlurCoeffWrapper);
 
 	// Fake motion blur threshold
-	_ui.blurTresholdWidget->setRange(0.0, 5.0);
-	_ui.blurTresholdWidget->setWrapper(&_MotionBlurThresholdWrapper);
+	_ui.blurThresholdWidget->setRange(0.0, 5.0);
+	_ui.blurThresholdWidget->setWrapper(&_MotionBlurThresholdWrapper);
 
 	// Shock wave radius cut
 	_ui.radiusCutWidget->setRange(0, 1);
@@ -275,7 +275,7 @@ void CLocatedBindablePage::setEditedItem(CWorkspaceNode *ownerNode, NL3D::CPSLoc
 
 			_MotionBlurThresholdWrapper.P = fla;
 			_MotionBlurThresholdWrapper.OwnerNode = _Node;
-			_ui.blurTresholdWidget->updateUi();
+			_ui.blurThresholdWidget->updateUi();
 
 			_ui.zalignCheckBox->show();
 			_ui.alignCheckBox->show();
@@ -633,7 +633,7 @@ void CLocatedBindablePage::updateValidWidgetForAlignOnMotion(bool align)
 	_ui.blurCoeffLabel->setEnabled(align);
 	_ui.blurCoeffWidget->setEnabled(align);
 	_ui.blurTreshholdLabel->setEnabled(align);
-	_ui.blurTresholdWidget->setEnabled(align);
+	_ui.blurThresholdWidget->setEnabled(align);
 	_ui.zalignCheckBox->setEnabled(align);
 }
 

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_node.h

@@ -235,7 +235,7 @@ public:
 		virtual void nodeModifiedFlagChanged(CWorkspaceNode &node) = 0;
 		virtual void nodeSkelParentChanged(CWorkspaceNode &node) = 0; // called when fx has been linked / unlinked from a skeleton parent
 	};
-	/// Сonstructor
+	/// Constructor
 	CParticleWorkspace();
 	/// Destructor
 	~CParticleWorkspace();

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_tree_model.h

@@ -59,7 +59,7 @@ struct ItemType
 /**
 @class CParticleTreeItem
 @brief Basic elements tree model particles workspace.
-Сontains pointer to items particle workspace and type icons.
+Contains pointer to items particle workspace and type icons.
 */
 class CParticleTreeItem
 {

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_widget.h

@@ -33,7 +33,7 @@ namespace NLQT
 
 /**
 @class CEditRangeUIntWidget
-@brief The widget provides a horizontal slider and 3 QSpinBox(to set start/end value range and сurrent value from this range.).
+@brief The widget provides a horizontal slider and 3 QSpinBox(to set start/end value range and current value from this range.).
 @details Slider sets the uint32 value within a specified range (start/end QSpinBox).
 The values range can be set through the class methods: setRange() or setRangeMin(), setRangeMax().
 Or the user input values in the widgets start/end QSpinBox.
@@ -120,7 +120,7 @@ private:
 
 /**
 @class CEditRangeIntWidget
-@brief The widget provides a horizontal slider and 3 QSpinBox(to set start/end value range and сurrent value from this range.).
+@brief The widget provides a horizontal slider and 3 QSpinBox(to set start/end value range and current value from this range.).
 @details Slider sets the sint32 value within a specified range (start/end QSpinBox).
 The values range can be set through the class methods: setRange() or setRangeMin(), setRangeMax().
 Or the user input values in the widgets start/end QSpinBox.
@@ -207,7 +207,7 @@ private:
 
 /**
 @class CEditRangeFloatWidget
-@brief The widget provides a horizontal slider and 3 QDoubleSpinBox(to set start/end value range and сurrent value from this range.).
+@brief The widget provides a horizontal slider and 3 QDoubleSpinBox(to set start/end value range and current value from this range.).
 @details Slider sets the float value within a specified range (start/end QDoubleSpinBox).
 The values range can be set through the class methods: setRange() or setRangeMin(), setRangeMax().
 Or the user input values in the widgets start/end QDoubleSpinBox.

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.cpp

@@ -1,4 +1,4 @@
-// Translation Manager Plugin - OVQT Plugin <http://dev.ryzom.com/projects/nel/>
+// Translation Manager Plugin - OVQT Plugin <http://dev.ryzom.com/projects/nel/>
 // Copyright (C) 2010  Winch Gate Property Limited
 // Copyright (C) 2011  Emanuel Costea <cemycc@gmail.com>
 //

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ftp_selection.ui

@@ -17,7 +17,7 @@
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
-      <string>FTP Server informations</string>
+      <string>FTP Server information</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_4">
       <item row="0" column="0">

code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_de.ts

@@ -855,7 +855,7 @@
     </message>
     <message>
         <location filename="../plugins/object_viewer/located_bindable_form.ui" line="374"/>
-        <source>Fake motion blur treshold:</source>
+        <source>Fake motion blur threshold:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_en.ts

@@ -855,7 +855,7 @@
     </message>
     <message>
         <location filename="../plugins/object_viewer/located_bindable_form.ui" line="374"/>
-        <source>Fake motion blur treshold:</source>
+        <source>Fake motion blur threshold:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_fr.ts

@@ -855,7 +855,7 @@
     </message>
     <message>
         <location filename="../plugins/object_viewer/located_bindable_form.ui" line="374"/>
-        <source>Fake motion blur treshold:</source>
+        <source>Fake motion blur threshold:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_ru.ts

@@ -855,7 +855,7 @@
     </message>
     <message>
         <location filename="../plugins/object_viewer/located_bindable_form.ui" line="374"/>
-        <source>Fake motion blur treshold:</source>
+        <source>Fake motion blur threshold:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

code/nel/tools/3d/panoply_maker/panoply.cfg

@@ -19,7 +19,7 @@ additionnal_paths = { "panoply", "data" };
 // The input path for textures
 input_path = "panoply";
 
-// the ouput path for result textures
+// the output path for result textures
 output_path = "png";
 
 // output files format used

code/nel/tools/3d/plugin_max/max_material_support.txt

@@ -6,7 +6,7 @@
 
 SUMMARY
 
--> Export those informations from stdmat
+-> Export those information from stdmat
 -> How to use lightmaps
 -> How to use "color vertex"
 -> How to use "alpha vertex"
@@ -15,7 +15,7 @@ SUMMARY
 
 -------------------------------------------------
 
--> Export those informations from stdmat
+-> Export those information from stdmat
 
  * Ambiant color
  * Diffuse color

code/nel/tools/3d/plugin_max/nel_export/nel_export.rc

@@ -121,7 +121,7 @@ BEGIN
                     8
     PUSHBUTTON      "Interrupt",IDC_BUTTONCANCEL,129,23,50,14,BS_NOTIFY
     LTEXT           "Object progression",IDC_STATIC,7,28,79,8
-    LTEXT           "Lightmaps Informations...",IDC_STATICINFO,7,60,172,114
+    LTEXT           "Lightmaps Information...",IDC_STATICINFO,7,60,172,114
 END
 
 IDD_LOD DIALOG DISCARDABLE  0, 0, 360, 200

code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp

@@ -714,7 +714,7 @@ void CNelExport::viewMesh (TimeValue time)
 		// Delete the pointer
 		IObjectViewer::releaseInterface (view);
 
-		// Collisions informations are no more used.
+		// Collisions information are no more used.
 		delete slInfo.RetrieverBank;
 		delete slInfo.GlobalRetriever;
 	}

code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp

@@ -298,7 +298,7 @@ void SLightBuild::convertFromMaxLight (INode *node,TimeValue tvTime)
 	}
 #endif // (MAX_RELEASE < 4000)
 
-	// Get Soft Shadow informations
+	// Get Soft Shadow information
 	string sTmp = CExportNel::getScriptAppData (node, NEL3D_APPDATA_SOFTSHADOW_RADIUS, toString(NEL3D_APPDATA_SOFTSHADOW_RADIUS_DEFAULT));
 	this->rSoftShadowRadius = (float)atof(sTmp.c_str());
 	sTmp = CExportNel::getScriptAppData (node, NEL3D_APPDATA_SOFTSHADOW_CONELENGTH, toString(NEL3D_APPDATA_SOFTSHADOW_CONELENGTH_DEFAULT));

code/nel/tools/3d/plugin_max/nel_mesh_lib/export_skinning.cpp

@@ -1470,7 +1470,7 @@ bool CExportNel::mirrorPhysiqueSelection(INode &node, TimeValue tvTime, const st
 	}
 
 
-	// **** Build the ouput vertices
+	// **** Build the output vertices
 	std::vector<uint>	vertOut;
 	vertOut.reserve(tempVertex.size());
 

code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp

@@ -78,9 +78,9 @@ namespace std
 #include "nel/misc/file.h"
 #include "nel/misc/common.h"
 
-#include "..\nel_patch_lib\rpo.h"
-#include "..\nel_mesh_lib\export_nel.h"
-#include "..\nel_mesh_lib\export_appdata.h"
+#include "../nel_patch_lib/rpo.h"
+#include "../nel_mesh_lib/export_nel.h"
+#include "../nel_mesh_lib/export_appdata.h"
 
 #include "nel/3d/zone.h"
 #include "nel/3d/zone_symmetrisation.h"
@@ -135,12 +135,12 @@ def_visible_primitive( set_tile_bank,			"NelSetTileBank");
 def_visible_primitive( export_zone,				"ExportRykolZone");
 def_visible_primitive( import_zone,				"NeLImportZone");
 
-/* permettre l'acces <20>Eauto/manual intrior edges
-faire une methode pour interfacer la fonction compute interior edge
-donner un acces <EFBFBD>Etiledmode/patchmode (on/off)
-faire un getselectedvertex
-faire un getselectedpatch
-faire un getselectedtile */
+/* allows access to auto/manual interior edges
+create a method to interface compute interior edge function
+give access to tiledmode/patchmode (on/off)
+use getselectedvertex
+use getselectedpatch
+use getselectedtile */
 
 /*def_visible_primitive( set_interior_mode,		"SetRykolInteriorMode");
 def_visible_primitive( set_vertex_count,		"GetRykolVertexCount");*/

code/nel/tools/3d/plugin_max/nel_patch_lib/nel_patch_mesh.cpp

@@ -178,7 +178,7 @@ RPatchMesh::RPatchMesh (PatchMesh *pmesh)
 		SetNumVerts (pmesh->getNumVerts());
 	}
 
-	// Getback the binding informations
+	// Getback the binding information
 	for (int v=0; v<pmesh->hooks.Count(); v++)
 	{
 		int hookPoint=pmesh->hooks[v].hookPoint;

code/nel/tools/3d/plugin_max/scripts/nel_assets_png_batched.ms

@@ -320,7 +320,7 @@ rollout assets_png_rollout "Properties"
 	-- This script is a base script to include to add multiple functionality to your script
 
 	-- To use this script
-	--	Include it in your script into the rollout at the begining.
+	--	Include it in your script into the rollout at the beginning.
 	--	Implement a do_it function to do the job in your rollout.
 	--	The function should retun -1 if an arror occured, else the count of modification done
 	--	It the function returns <1, the project will not be overwritten

code/nel/tools/3d/plugin_max/scripts/nel_batched_mergesave.ms

@@ -1,7 +1,7 @@
 -- This script is a base script to include to add multiple functionality to your script
 
 -- To use this script
---	Include it in your script into the rollout at the begining.
+--	Include it in your script into the rollout at the beginning.
 --	Implement a do_it function to do the job in your rollout.
 --	The function should retun -1 if an arror occured, else the count of modification done
 --	It the function returns <1, the project will not be overwritten

code/nel/tools/3d/plugin_max/scripts/nel_batched_script.ms

@@ -1,7 +1,7 @@
 -- This script is a base script to include to add multiple functionality to your script
 
 -- To use this script
---	Include it in your script into the rollout at the begining.
+--	Include it in your script into the rollout at the beginning.
 --	Implement a do_it function to do the job in your rollout.
 --	The function should retun -1 if an arror occured, else the count of modification done
 --	It the function returns <1, the project will not be overwritten

code/nel/tools/3d/tile_edit/TileCtrl.h

@@ -72,7 +72,7 @@ public:
 	void DeleteAll(); //efface provisoirement les sections DIB et les *Bits;
 	void Reload(CDC *pDC,tilelist::iterator iFirst,int n); //recharge en memoire une tranche de tiles
 	int last_id;
-	tilelist::iterator iFirst,iLast; //index du premier et du dernier element chargé en memoire
+	tilelist::iterator iFirst,iLast; // first and last index loaded in memory
 };
 
 

code/nel/tools/3d/zone_dump/zone_dump.cpp

@@ -188,7 +188,7 @@ int main(int argc, char* argv[])
 						// Get the current pos
 						sint32 curPos=output.getPos ();
 
-						// File at the begining
+						// File at the beginning
 						output.seek (0, NLMISC::IStream::begin);
 
 						// Write the triangle count

code/nel/tools/misc/bnp_make/main.cpp

@@ -148,18 +148,18 @@ struct BNPHeader
 		uint32 nFileSize=CFile::getFileSize (filename);
 		nlfseek64 (f, nFileSize-sizeof(uint32), SEEK_SET);
 
-		uint32 nOffsetFromBegining;
-		if (fread (&nOffsetFromBegining, sizeof(uint32), 1, f) != 1)
+		uint32 nOffsetFromBeginning;
+		if (fread (&nOffsetFromBeginning, sizeof(uint32), 1, f) != 1)
 		{
 			fclose (f);
 			return false;
 		}
 
 #ifdef NL_BIG_ENDIAN
-		NLMISC_BSWAP32(nOffsetFromBegining);
+		NLMISC_BSWAP32(nOffsetFromBeginning);
 #endif
 
-		if (nlfseek64 (f, nOffsetFromBegining, SEEK_SET) != 0)
+		if (nlfseek64 (f, nOffsetFromBeginning, SEEK_SET) != 0)
 		{
 			fclose (f);
 			return false;

code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp

@@ -529,10 +529,10 @@ int main( int argc, char ** argv )
 
 	// output path
 	sint lastSeparator = CFile::getLastSeparator(outputFileName);
-	string ouputPath;
+	string outputPath;
 	if( lastSeparator != -1 )
 	{
-		ouputPath = outputFileName.substr(0,lastSeparator+1);
+		outputPath = outputFileName.substr(0,lastSeparator+1);
 	}
 
 	// erase the unwanted extensions from map (modify the map, save it, and quit)
@@ -568,7 +568,7 @@ int main( int argc, char ** argv )
 	if( dumpExtensions )
 	{
 		FILE *  extListOutput;
-		string extListFileName = ouputPath + "sheet_ext.txt";
+		string extListFileName = outputPath + "sheet_ext.txt";
 		if( !(extListOutput = fopen(extListFileName.c_str(),"w")) )
 		{
 			nlwarning("Can't open output file %s",extListFileName.c_str());
@@ -608,7 +608,7 @@ int main( int argc, char ** argv )
 	// display the map
 	//display();
 
-	string sheetListFileName = ouputPath + "sheets.txt";
+	string sheetListFileName = outputPath + "sheets.txt";
 	COFile output;
 	if( !output.open(sheetListFileName,false,true) )
 	{

code/nelns/admin_executor_service/admin_executor_service.cpp

@@ -205,7 +205,7 @@ uint32 LastPing = 0;		// contains the date of the last ping sent to the services
 // Alarms
 //
 
-void sendInformations(TServiceId sid)
+void sendInformation(TServiceId sid)
 {
 	CMessage msgout("INFO");
 	msgout.serialCont(AllAdminAlarms);
@@ -1170,7 +1170,7 @@ static void getRegisteredServicesFromCfgFile()
 
 static void cbAESInfo(CMessage &msgin, const std::string &serviceName, TServiceId sid)
 {
-	nlinfo("Updating all informations for AES and hosted service");
+	nlinfo("Updating all information for AES and hosted service");
 
 	//
 	// setup the list of all registered services
@@ -1195,7 +1195,7 @@ static void cbAESInfo(CMessage &msgin, const std::string &serviceName, TServiceI
 	{
 		if (Services[j].Connected)
 		{
-			sendInformations(Services[j].ServiceId);
+			sendInformation(Services[j].ServiceId);
 		}
 	}
 }
@@ -1309,7 +1309,7 @@ void serviceConnection(const std::string &serviceName, TServiceId sid, void *arg
 
 	Services[sid.get()].init(serviceName, sid);
 
-	sendInformations(sid);
+	sendInformation(sid);
 
 	nlinfo("%s-%hu connected", Services[sid.get()].ShortName.c_str(), Services[sid.get()].ServiceId.get());
 

code/nelns/login_system/database/nel.sql

@@ -40,7 +40,7 @@ CREATE TABLE `shard` (
   `Version` varchar(64) collate latin1_general_ci NOT NULL default '',
   `DynPatchURL` varchar(255) collate latin1_general_ci NOT NULL default '',
   PRIMARY KEY  (`ShardId`)
-) ENGINE=MyISAM AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='contains all shards informations for login system';
+) ENGINE=MyISAM AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='contains all shards information for login system';
 
 
 
@@ -58,5 +58,5 @@ CREATE TABLE `user` (
   `ExtendedPrivilege` varchar(45) collate latin1_general_ci NOT NULL default '',
   `Cookie` varchar(255) collate latin1_general_ci NOT NULL default '',
   PRIMARY KEY  (`UId`)
-) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='contains all users informations for login system';
+) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='contains all users information for login system';
 

code/ryzom/client/data/gamedev/interfaces_v3/interface.txt

@@ -1276,7 +1276,7 @@ Sur les nodes qui contiennent des fils on peut setuper la valeur de d
 	h6_font_size="16"					// Headline 6 font size
 	paragraph_begin_space="12"			// Space between paragraphs
 	multi_line_space_factor="0.25"		// Space between 2 lines of a paragraph. Factor of the font size
-	td_begin_space="0"					// Space at the begining of a table cell
+	td_begin_space="0"					// Space at the beginning of a table cell
 	li_begin_space="4"					// H space when "<IL>"
 	ul_begin_space="12"					// H space when "<UL>"
 	li_indent="-10"						// W space when "<LI>"

code/ryzom/client/data/gamedev/interfaces_v3/inventory.xml

@@ -254,7 +254,7 @@
                                                                 oncandrop="inv_can_drop" ondrop="inv_drop"
                                                                 item_slot="LEFT_HAND" value="%hand_l" other_hand_slot="handr" auto_grayed="false" />
         
-                        <! - Must update some things when the item equiped change - >
+                        <! - Must update some things when the item equipped change - >
                         <link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:SHEET)" action="phrase_update_from_hand" />
                         <link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:QUALITY)" action="phrase_update_from_hand" />
                         <link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:ENCHANT)" action="phrase_update_from_hand" />
@@ -1114,7 +1114,7 @@
             other_hand_slot="handr"
             auto_grayed="false"
             tooltip_parent="win" />
-      <!-- Must update some things when the item equiped change -->
+      <!-- Must update some things when the item equipped change -->
       <link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:SHEET)"
             action="phrase_update_from_hand" />
       <link expr="depends(@%bag:[%hand_r:INDEX_IN_BAG-1]:QUALITY)"

code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml

@@ -90,9 +90,9 @@
             inherit_gc_alpha="#inherit_gc_alpha" />
     </group>
   </template>
-  <!-- ************************************ -->
-  <!-- *  TEMPLATE FOR SCENE INFORMATIONS * -->
-  <!-- ************************************ -->
+  <!-- *********************************** -->
+  <!-- *  TEMPLATE FOR SCENE INFORMATION * -->
+  <!-- *********************************** -->
   <!-- * In scene user info with guild logo * -->
   <define id="in_scene_user_info_bar_h"
           value="4" />

code/ryzom/client/src/character_cl.cpp

@@ -3345,7 +3345,7 @@ void CCharacterCL::showOrHideBodyParts( bool objectsVisible )
 	{
 		// Right Hand
 		if(rHandInstIdx<_Instances.size())
-			if( !(_Items[rHandInstIdx].Sheet && _Items[rHandInstIdx].Sheet->NeverHideWhenEquiped ) )
+			if( !(_Items[rHandInstIdx].Sheet && _Items[rHandInstIdx].Sheet->NeverHideWhenEquipped ) )
 				if(!_Instances[rHandInstIdx].Current.empty())
 				{
 					_Instances[rHandInstIdx].Current.hide();
@@ -3353,7 +3353,7 @@ void CCharacterCL::showOrHideBodyParts( bool objectsVisible )
 				}
 		// Left Hand
 		if(lHandInstIdx <_Instances.size())
-			if( !(_Items[lHandInstIdx].Sheet && _Items[lHandInstIdx].Sheet->NeverHideWhenEquiped ) )
+			if( !(_Items[lHandInstIdx].Sheet && _Items[lHandInstIdx].Sheet->NeverHideWhenEquipped ) )
 				if(!_Instances[lHandInstIdx].Current.empty())
 				{
 					_Instances[lHandInstIdx].Current.hide();

code/ryzom/client/src/client_cfg.h

@@ -757,7 +757,7 @@ struct CClientConfig
 	// LUA //
 	/////////
 
-	/// Allow Lua commands (commands begining with Lua)
+	/// Allow Lua commands (commands beginning with Lua)
 	bool			AllowDebugLua;
 	bool			LoadLuaDebugger;
 

code/ryzom/client/src/client_sheets/item_sheet.cpp

@@ -100,7 +100,7 @@ CItemSheet::CItemSheet()
 	Type = CEntitySheet::ITEM;
 	Bulk= 0.f;
 	EquipTime= 0;
-	NeverHideWhenEquiped = false;
+	NeverHideWhenEquipped = false;
 	RequiredCharac = CHARACTERISTICS::Unknown;
 	RequiredCharacLevel = 0;
 	RequiredSkill = SKILLS::unknown;
@@ -214,8 +214,8 @@ void CItemSheet::build(const NLGEORGES::UFormElm &item)
 	IconText = strlwr (IconText);
 	IdIconText = ClientSheetsStrings.add(IconText);
 
-	// See if this item can be hiden when equiped
-	if(!item.getValueByName (NeverHideWhenEquiped, "3d.never hide when equiped"))
+	// See if this item can be hiden when equipped
+	if(!item.getValueByName (NeverHideWhenEquipped, "3d.never hide when equiped"))
 		debug("key '3d.never hide when equiped.");
 
 	// Load the different slot in wicth the item can be equipped.
@@ -633,7 +633,7 @@ void CItemSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
 	f.serial(HasFx);			// Serialize the has fx.
 	f.serial(DropOrSell);
 	f.serial(IsItemNoRent);
-	f.serial(NeverHideWhenEquiped);
+	f.serial(NeverHideWhenEquipped);
 	f.serial(Stackable);
 	f.serial(IsConsumable);
 	f.serial(Bulk);

code/ryzom/client/src/client_sheets/item_sheet.h

@@ -329,8 +329,8 @@ public:
 	float								Bulk;
 	/// Equip Time
 	uint32								EquipTime;
-	/// true if this item can be hidden when equiped
-	bool								NeverHideWhenEquiped;
+	/// true if this item can be hidden when equipped
+	bool								NeverHideWhenEquipped;
 
 	// FX
 	CItemFXSheet						FX;

code/ryzom/client/src/init.cpp

@@ -533,31 +533,6 @@ void checkDriverVersion()
 		nlwarning ("Can't check video driver version");
 }
 
-void checkNoATIOpenGL()
-{
-	string deviceName;
-	uint64 driverVersion;
-	if (CSystemInfo::getVideoInfo (deviceName, driverVersion))
-	{
-		string lwr = deviceName;
-		strlwr(lwr);
-		if (lwr.find (ATI_RECOMMANDED_DRIVERS_STRING_TEST)!=string::npos && ClientCfg.Driver3D==CClientConfig::OpenGL)
-		{
-			// special case for radeon 7500 or less : doesn't issue message since doesn't work with Direct3D for now
-			if (!(strstr(lwr.c_str() , "radeon 7000") || strstr(lwr.c_str() , "radeon 7200") || strstr(lwr.c_str() , "radeon 7500")))
-			{
-				ucstring	message= CI18N::get("uiUseATID3D");
-				if (ClientQuestion (message))
-				{
-					ClientCfg.Driver3D= CClientConfig::DrvAuto;
-					ClientCfg.writeString("Driver3D", "Auto");
-					ClientCfg.ConfigFile.save();
-				}
-			}
-		}
-	}
-}
-
 void checkDriverDepth ()
 {
 	// Check desktop is in 32 bit else no window mode allowed.
@@ -815,8 +790,6 @@ void prelogInit()
 		// Check driver version
 		checkDriverVersion();
 
-		// Check ATI not in OpenGL
-		 checkNoATIOpenGL();
 		// Create the driver (most important part of the client).
 		nmsg = "Creating 3d driver...";
 		ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) );
@@ -831,21 +804,12 @@ void prelogInit()
 
 		switch(ClientCfg.Driver3D)
 		{
-			case  CClientConfig::DrvAuto:
 #ifdef NL_OS_WINDOWS
-			{
-				// Fallback to D3D for card other than nVidia
-				std::string deviceName;
-				uint64 drvVersion;
-				CSystemInfo::getVideoInfo(deviceName, drvVersion);
-				strlwr(deviceName);
-				driver = strstr(deviceName.c_str(), NVIDIA_RECOMMANDED_DRIVERS_STRING_TEST) == NULL ? UDriver::Direct3d:UDriver::OpenGl;
-			}
-			break;
 			case CClientConfig::Direct3D:
 				driver = UDriver::Direct3d;
 			break;
 #endif // NL_OS_WINDOWS
+			case CClientConfig::DrvAuto:
 			case CClientConfig::OpenGL:
 				driver = UDriver::OpenGl;
 			break;

code/ryzom/client/src/interface_v3/bot_chat_page_trade.h

@@ -70,7 +70,7 @@ public:
 	void		 setBuyMean(TBuyMean buyMean) { _BuyMean = buyMean; }
 	// set the title of the window (actually applied when 'begin' is called)
 	void		 setTitle(const ucstring &title) { _Title = title; }
-	// update the 'buy' dialog window for the given sphrase sheet (the player has changed an equiped weapon => action stats change)
+	// update the 'buy' dialog window for the given sphrase sheet (the player has changed an equipped weapon => action stats change)
 	void		 updateSPhraseBuyDialog();
 	// invalidate window coords
 	void		 invalidateCoords();

code/ryzom/client/src/interface_v3/interface_expr_user_fct.cpp

@@ -447,7 +447,7 @@ REGISTER_INTERFACE_USER_FCT("switch", userFctSwitch)
 /////////////////////////////////
 static DECLARE_INTERFACE_USER_FCT(userFctMax)
 {
-	// compute type of ouput
+	// compute type of output
 	if (!promoteToNumericalBestType(args))
 	{
 		nlwarning("max : invalid entry");
@@ -479,7 +479,7 @@ REGISTER_INTERFACE_USER_FCT("max", userFctMax)
 /////////////////////////////////
 static DECLARE_INTERFACE_USER_FCT(userFctMin)
 {
-	// compute type of ouput
+	// compute type of output
 	if (!promoteToNumericalBestType(args))
 	{
 		nlwarning("max : invalid entry");

code/ryzom/client/src/interface_v3/inventory_manager.cpp

@@ -866,7 +866,7 @@ void CInventoryManager::equip(const std::string &bagPath, const std::string &inv
 		const string sMsg = "ITEM:EQUIP";
 		if (GenericMsgHeaderMngr.pushNameToStream(sMsg, out))
 		{
-			// Fill the message (equiped inventory, equiped inventory slot, bag slot)
+			// Fill the message (equipped inventory, equipped inventory slot, bag slot)
 			out.serial(inventory);
 			out.serial(invSlot);
 			out.serial(indexInBag);
@@ -977,7 +977,7 @@ void CInventoryManager::unequip(const std::string &invPath)
 		const string sMsg = "ITEM:UNEQUIP";
 		if (GenericMsgHeaderMngr.pushNameToStream(sMsg, out))
 		{
-			// Fill the message (equiped inventory, equiped inventory slot)
+			// Fill the message (equipped inventory, equipped inventory slot)
 			out.serial(inventory);
 			out.serial(invSlot);
 			NetMngr.push (out);

code/ryzom/client/src/interface_v3/inventory_manager.h

@@ -242,7 +242,7 @@ public:
 		void equip(const std::string &bagPath, const std::string &invPath);
 		// UnEquip a part of the player (same format as equip method)
 		void unequip(const std::string &invPath);
-		// auto equip an item (given by index) from the bag (return true if equiped)
+		// auto equip an item (given by index) from the bag (return true if equipped)
 		bool autoEquip(sint bagEntryIndex, bool allowReplace);
 
 		void dropOrDestroyItem(CDBCtrlSheet *item, NLMISC::CBitMemStream &out, uint16 quantity);

code/ryzom/client/src/interface_v3/view_text.cpp

@@ -1018,7 +1018,7 @@ void CViewText::updateTextContextMultiLineJustified(uint nMaxWidth, bool expandS
 				}
 			}
 
-			// Detect change of wordFormat at the begining of the word
+			// Detect change of wordFormat at the beginning of the word
 			if(isFormatTagChange((uint)spaceEnd, formatTagIndex))
 			{
 				getFormatTagChange((uint)spaceEnd, formatTagIndex, wordFormat);

code/ryzom/client/src/interfaces_manager/chat_control.cpp

@@ -274,7 +274,7 @@ void CChatControl::add(const ucstring &text)
 //-----------------------------------------------
 void CChatControl::display()
 {
-	// \todo GUIGUI : remove this damn thing after the UBI démo.
+	// \todo GUIGUI : remove this damn thing after the UBI demo.
 	const CRGBA playerColors[10] =
 	{
 		CRGBA(250,250, 10),	// 0 : Jaune

code/ryzom/client/src/interfaces_manager/osd.cpp

@@ -351,7 +351,7 @@ void COSD::drawBorders(float bSizeW, float bSizeH, float x0, float y0, float x1,
 
 //-----------------------------------------------
 // drawText :
-// Draw a text with all informations needed.
+// Draw a text with all information needed.
 //-----------------------------------------------
 void COSD::drawText(float x, float y, const ucstring &text, const CPen &pen)
 {

code/ryzom/client/src/interfaces_manager/osd.h

@@ -167,7 +167,7 @@ private:
 	void drawTB();
 	/// Draw the resize borders.
 	void drawBorders(float bSizeW, float bSizeH, float x0, float y0, float x1, float y1, const CRGBA &color);
-	/// Draw a text with all informations needed.
+	/// Draw a text with all information needed.
 	void drawText(float x, float y, const ucstring &text, const CPen &pen);
 
 	/// Test the mode of the OSD.

code/ryzom/client/src/login_patch.cpp

@@ -1701,18 +1701,18 @@ bool CPatchManager::readBNPHeader(const string &SourceName, vector<SBNPFile> &Fi
 	uint32 nFileSize = NLMISC::CFile::getFileSize (SourceName);
 	nlfseek64 (f, nFileSize-sizeof(uint32), SEEK_SET);
 
-	uint32 nOffsetFromBegining;
-	if (fread (&nOffsetFromBegining, sizeof(uint32), 1, f) != 1)
+	uint32 nOffsetFromBeginning;
+	if (fread (&nOffsetFromBeginning, sizeof(uint32), 1, f) != 1)
 	{
 		fclose(f);
 		return false;
 	}
 
 #ifdef NL_BIG_ENDIAN
-	NLMISC_BSWAP32(nOffsetFromBegining);
+	NLMISC_BSWAP32(nOffsetFromBeginning);
 #endif
 
-	if (nlfseek64 (f, nOffsetFromBegining, SEEK_SET) != 0)
+	if (nlfseek64 (f, nOffsetFromBeginning, SEEK_SET) != 0)
 	{
 		fclose(f);
 		return false;

code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexBaan.cxx

@@ -135,7 +135,7 @@ static void ColouriseBaanDoc(unsigned int startPos, int length, int initStyle, W
 			}
 		}
 		if (sc.atLineEnd) {
-			// Reset states to begining of colourise so no surprises
+			// Reset states to beginning of colourise so no surprises
 			// if different sets of lines lexed.
 			visibleChars = 0;
 		}

code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexCPP.cxx

@@ -265,7 +265,7 @@ static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, Wo
 		}
 		
 		if (sc.atLineEnd) {
-			// Reset states to begining of colourise so no surprises 
+			// Reset states to beginning of colourise so no surprises 
 			// if different sets of lines lexed.
 			chPrevNonWhite = ' ';
 			visibleChars = 0;

code/ryzom/client/src/permanent_ban.cpp

@@ -150,18 +150,18 @@ static void markBNPFile(std::string &path)
 		return;
 	}
 
-	uint32 nOffsetFromBegining;
-	if (fread (&nOffsetFromBegining, sizeof(uint32), 1, f) != 1)
+	uint32 nOffsetFromBeginning;
+	if (fread (&nOffsetFromBeginning, sizeof(uint32), 1, f) != 1)
 	{
 		fclose (f);
 		return;
 	}
 
 #ifdef NL_BIG_ENDIAN
-	NLMISC_BSWAP32(nOffsetFromBegining);
+	NLMISC_BSWAP32(nOffsetFromBeginning);
 #endif
 
-	if (nlfseek64 (f, nOffsetFromBegining, SEEK_SET) != 0)
+	if (nlfseek64 (f, nOffsetFromBeginning, SEEK_SET) != 0)
 	{
 		fclose (f);
 		return;

code/ryzom/client/src/player_cl.cpp

@@ -495,7 +495,7 @@ void CPlayerCL::equip(SLOTTYPE::EVisualSlot slot, const std::string &shapeName,
 	}
 
 	/* If the object is sticked (ie not a skin), decide to delete the Current instance. Why? because the animation
-		is changed according to the equiped item.
+		is changed according to the equipped item.
 
 		Hence, For example, if a sword would be changed for a gun, then the new gun animation would take place,
 		while Keeping the old sword shape. BAD.