diff --git a/code/nel/include/nel/3d/lod_character_manager.h b/code/nel/include/nel/3d/lod_character_manager.h index 4a25e8653..2cb151b58 100644 --- a/code/nel/include/nel/3d/lod_character_manager.h +++ b/code/nel/include/nel/3d/lod_character_manager.h @@ -201,7 +201,7 @@ public: /** Setup a correction matrix for Lighting. Normals are multiplied with this matrix before lighting. * This is important in Ryzom because models (and so Lods) are building with eye looking in Y<0. * But they are animated with eye looking in X>0. - * The default setup is hence a matrix wich do a RotZ+=90. + * The default setup is hence a matrix which do a RotZ+=90. * \see addRenderCharacterKey */ void setupNormalCorrectionMatrix(const CMatrix &normalMatrix); diff --git a/code/nel/include/nel/3d/particle_system.h b/code/nel/include/nel/3d/particle_system.h index d68fd1072..98012549d 100644 --- a/code/nel/include/nel/3d/particle_system.h +++ b/code/nel/include/nel/3d/particle_system.h @@ -459,7 +459,7 @@ public: void enableAccurateIntegration(bool enable = true) { _AccurateIntegration = enable; } bool isAccurateIntegrationEnabled(void) const { return _AccurateIntegration; } - /** the the time threshold and the max number of integration to perform, when accurate integration is activated. + /** the time threshold and the max number of integration to perform, when accurate integration is activated. * The default is 0.15 for time threshold and 2 for max NbIntegrations * \param canSlowDown : Allow the system to slow down in speed but to keep accuracy in its movement. * It is useful for critical situations where the framerate is very low. The default is true. diff --git a/code/nel/include/nel/3d/patch.h b/code/nel/include/nel/3d/patch.h index 3aebd8fc5..499201c66 100644 --- a/code/nel/include/nel/3d/patch.h +++ b/code/nel/include/nel/3d/patch.h @@ -1201,7 +1201,7 @@ private: */ CPatchDLMContext *_DLMContext; - /** The reference count for DLMContext. Each TileMaterial created add a reference. Each pointLight wich + /** The reference count for DLMContext. Each TileMaterial created add a reference. Each pointLight which * touch the patch too. */ sint _DLMContextRefCount; diff --git a/code/nel/include/nel/3d/ps_mesh.h b/code/nel/include/nel/3d/ps_mesh.h index 3cd29155f..21dd9dfae 100644 --- a/code/nel/include/nel/3d/ps_mesh.h +++ b/code/nel/include/nel/3d/ps_mesh.h @@ -316,7 +316,7 @@ public: /// Set the type of texture animation to use. None is the default. Setting a new value discard the previous change. void setTexAnimType(TTexAnimType type); - /// Get the the type of texture animation + /// Get the type of texture animation TTexAnimType getTexAnimType() const; //@} diff --git a/code/nel/include/nel/3d/ps_ribbon_base.h b/code/nel/include/nel/3d/ps_ribbon_base.h index acaac9a4a..2145c4ed4 100644 --- a/code/nel/include/nel/3d/ps_ribbon_base.h +++ b/code/nel/include/nel/3d/ps_ribbon_base.h @@ -62,7 +62,7 @@ public: TRibbonMode getRibbonMode() const { return _RibbonMode; } void setInterpolationMode(TInterpolationMode mode); TInterpolationMode getInterpolationMode() const { return _InterpolationMode; } - // Set the the coordinate system in which the trail will be created + // Set the coordinate system in which the trail will be created void setMatrixMode(TMatrixMode matrixMode); TMatrixMode getMatrixMode() const { return _MatrixMode; } ///@} @@ -79,7 +79,7 @@ public: void setSegDuration(TAnimationTime ellapsedTime); TAnimationTime getSegDuration(void) const { return _SegDuration; } - /** The the length in meter of the ribbon. This is used only if the ribbon mode is set to FixedSize. + /** The length in meter of the ribbon. This is used only if the ribbon mode is set to FixedSize. * These kind of ribbon are usually slower than variable size ribbons. * The default is one metter. */ diff --git a/code/nel/include/nel/3d/ps_util.h b/code/nel/include/nel/3d/ps_util.h index 6a8963e47..265bf2d5a 100644 --- a/code/nel/include/nel/3d/ps_util.h +++ b/code/nel/include/nel/3d/ps_util.h @@ -93,7 +93,7 @@ public: static void displayArrow(NL3D::IDriver *driver, const NLMISC::CVector &start, const NLMISC::CVector &v, float size, NLMISC::CRGBA col1, NLMISC::CRGBA col2); - /// display a string at the given world position. The The model matrix must be restored after this call + /// display a string at the given world position. The model matrix must be restored after this call static void print(NL3D::IDriver *driver, const std::string &text, CFontGenerator &fg, CFontManager &fm, const NLMISC::CVector &pos, float size, NLMISC::CRGBA col = NLMISC::CRGBA::White); diff --git a/code/nel/include/nel/3d/quad_tree.h b/code/nel/include/nel/3d/quad_tree.h index 5e81868f4..5f7120ab3 100644 --- a/code/nel/include/nel/3d/quad_tree.h +++ b/code/nel/include/nel/3d/quad_tree.h @@ -288,7 +288,7 @@ private:// Classes. bool BBoxNeverRescale; CQuadNode *Sons[4]; CBaseNode RootNode; // First element of the element list in this quad. - uint ListIndex; // [0,3]. index of wich list to follow in "Node.QuadNexts[]". + uint ListIndex; // [0,3]. index of which list to follow in "Node.QuadNexts[]". /* Topology of sons (top view: axe x/z): 0--1 | | diff --git a/code/nel/include/nel/3d/skeleton_model.h b/code/nel/include/nel/3d/skeleton_model.h index b2f13d256..21164749f 100644 --- a/code/nel/include/nel/3d/skeleton_model.h +++ b/code/nel/include/nel/3d/skeleton_model.h @@ -145,7 +145,7 @@ public: */ void detachSkeletonSon(CTransform *mi); - /** Force the skeletonModel to recompute at next render which skins to render, at wich pass. + /** Force the skeletonModel to recompute at next render which skins to render, at which pass. * If you call setOpacity()/setTransparency() on one of the skins binded to the skeleton, you should call this * method, else strange result may occurs. * NB: this is automatically called by bindSkin()/detachSkeletonSon() diff --git a/code/nel/include/nel/3d/transform.h b/code/nel/include/nel/3d/transform.h index 5aaa25ee0..eb2ad1e89 100644 --- a/code/nel/include/nel/3d/transform.h +++ b/code/nel/include/nel/3d/transform.h @@ -432,7 +432,7 @@ public: * of this mesh that are bound to this bone * NB: the instance must be skinned to the skeleton instance, BUT the result is not modified * by current bone world matrix (eg: no current scale influence) - * \param boneId: the id of the skeleton's bone (wich the instance is skinned to) + * \param boneId: the id of the skeleton's bone (which the instance is skinned to) * \param bbox: the bbox (in bone basis) filled if return is true * \return false if no vertices are bound to */ @@ -640,7 +640,7 @@ protected: */ virtual const std::vector *getSkinBoneUsage() const {return NULL;} /** Deriver must change this method if isSkinnable(). It return a list of sphere relative to each bone - * of the father skeleton. Use with getSkinBoneUsage() to know to wich bone this sphere apply + * of the father skeleton. Use with getSkinBoneUsage() to know to which bone this sphere apply * NB: if a sphere radius is -1, it means that the bone is not used (for any reason...) * default is to return NULL. */ diff --git a/code/nel/include/nel/3d/zone_lighter.h b/code/nel/include/nel/3d/zone_lighter.h index 83e4fdea5..9e376c336 100644 --- a/code/nel/include/nel/3d/zone_lighter.h +++ b/code/nel/include/nel/3d/zone_lighter.h @@ -278,7 +278,7 @@ public: NLMISC::CVector BoundingBoxVectors[8]; }; - // A hierachical heightfield + // A hierarchical heightfield class CHeightField { public: diff --git a/code/nel/include/nel/ligo/primitive.h b/code/nel/include/nel/ligo/primitive.h index 6438e017b..e185e1018 100644 --- a/code/nel/include/nel/ligo/primitive.h +++ b/code/nel/include/nel/ligo/primitive.h @@ -711,7 +711,7 @@ public: // Remove an alias from the list of alias in use (dynamic part only) void releaseAlias(IPrimitive *prim, uint32 dynamicAlias); - // Force the assignation of the specified alias the the primitive. If another primitive + // Force the assignation of the specified alias to the primitive. If another primitive // already hold the alias, this other primitive is assigned a new alias. void forceAlias(CPrimAlias *prim, uint32 alias); diff --git a/code/nel/include/nel/misc/array_2d.h b/code/nel/include/nel/misc/array_2d.h index 2c4d788b9..a9512af92 100644 --- a/code/nel/include/nel/misc/array_2d.h +++ b/code/nel/include/nel/misc/array_2d.h @@ -177,7 +177,7 @@ void CArray2D::getUpdateRects(sint moveOffsetX, sint moveOffsetY, std::vector { // the width to update uint width = std::min((uint) moveOffsetX, _Width); - // the the grid moved top or bottom, exclude this part + // the grid moved top or bottom, exclude this part sint height = _Height - abs(moveOffsetY); if (height > 0) { @@ -192,7 +192,7 @@ void CArray2D::getUpdateRects(sint moveOffsetX, sint moveOffsetY, std::vector { // the width to update uint width = std::min((uint) (- moveOffsetX), _Width); - // the the grid moved top or bottom. + // the grid moved top or bottom. sint height = _Height - abs(moveOffsetY); if (height > 0) { diff --git a/code/nel/include/nel/misc/config_file.h b/code/nel/include/nel/misc/config_file.h index 248afacc8..eb7239b14 100644 --- a/code/nel/include/nel/misc/config_file.h +++ b/code/nel/include/nel/misc/config_file.h @@ -188,7 +188,7 @@ public: std::string Name; TVarType Type; bool Root; // true if this var comes from the root document. false else. - bool Comp; // true if the the parser found a 'complex' var (ie an array) + bool Comp; // true if the parser found a 'complex' var (ie an array) bool FromLocalFile; // Used during cfg parsing. True if the var has been created from the currently parsed cfg std::vector IntValues; std::vector RealValues; diff --git a/code/nel/include/nel/misc/debug.h b/code/nel/include/nel/misc/debug.h index 673159485..f794e6fca 100644 --- a/code/nel/include/nel/misc/debug.h +++ b/code/nel/include/nel/misc/debug.h @@ -301,7 +301,7 @@ void setCrashAlreadyReported(bool state); * Example: *\code // Load a file and assert if the load failed. This example will work \b only in debug mode because in release mode, - // nlassert do nothing, the the load function will not be called... + // nlassert do nothing, the load function will not be called... nlassert(load("test.tga")); // If you want to do that anyway, you could call nlverify. In release mode, the assertion will not be tested but diff --git a/code/nel/include/nel/misc/path.h b/code/nel/include/nel/misc/path.h index f19050c90..a136161fc 100644 --- a/code/nel/include/nel/misc/path.h +++ b/code/nel/include/nel/misc/path.h @@ -588,7 +588,7 @@ struct CFile static bool createEmptyFile (const std::string& filename); /** - * Return a new filename that doesn't exists. It's used for screenshot filename for example. + * Return a new filename that doesn't exist. It's used for screenshot filename for example. * example: findNewFile("foobar.tga"); * will try foobar001.tga, if the file exists, try foobar002.tga and so on until it finds an unexistant file. */ @@ -700,7 +700,7 @@ struct CFile static bool createDirectoryTree(const std::string &dirname); /** Try to set the file access to read/write if not already set. - * return true if the file doesn't exists or if the file already have RW access. + * return true if the file doesn't exist or if the file already have RW access. * Work actually only on Windows and returns always true on other platforms. * \return true if RW access is granted */ diff --git a/code/nel/include/nel/misc/stl_block_allocator.h b/code/nel/include/nel/misc/stl_block_allocator.h index b61278e79..97486c20c 100644 --- a/code/nel/include/nel/misc/stl_block_allocator.h +++ b/code/nel/include/nel/misc/stl_block_allocator.h @@ -34,7 +34,7 @@ namespace NLMISC { * with list<>/set<> etc... node allocations. * * NB: if used with a vector<> or a deque<> (ie if allocate(..,n) is called with n>1), it's still work, - * but it's use malloc()/free() instead, so it is fully unuseful in this case :) + * but it's use malloc()/free() instead, so it is fully useless in this case :) * * CSTLBlockAllocator use a pointer on a CBlockMemory, so multiple containers can share the same * blockMemory, for maximum space/speed efficiency. diff --git a/code/nel/include/nel/misc/vector_2f.h b/code/nel/include/nel/misc/vector_2f.h index d044f4b22..e391f2c35 100644 --- a/code/nel/include/nel/misc/vector_2f.h +++ b/code/nel/include/nel/misc/vector_2f.h @@ -45,7 +45,7 @@ public: // Attributes. public: // Methods. /// @name Object. //@{ - /// Constructor wich do nothing. + /// Constructor which do nothing. CVector2f() {} /// Constructor. CVector2f(float _x, float _y) : x(_x), y(_y) {} diff --git a/code/nel/include/nel/sound/source_common.h b/code/nel/include/nel/sound/source_common.h index b1803d585..7781cfb02 100644 --- a/code/nel/include/nel/sound/source_common.h +++ b/code/nel/include/nel/sound/source_common.h @@ -45,7 +45,7 @@ public: ~CSourceCommon(); - /// Get the type the the source. + /// Get the type of the source. virtual TSOURCE_TYPE getType() const = 0; void setPriority( TSoundPriority pr); diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp index 5a9aa051b..e05e52e7c 100644 --- a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp +++ b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp @@ -1551,7 +1551,7 @@ bool CDriverD3D::setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool r if (_DisableHardwarePixelShader && _NbNeLTextureStages > 3) // yes, 3 is not a bug { - // If pixel shader are disabled, then can't emulate the texEnvColor feature with more than 2 stages. (only 2 constant available by using material emissive in addition to the the texture factor) + // If pixel shader are disabled, then can't emulate the texEnvColor feature with more than 2 stages. (only 2 constant available by using material emissive in addition to the texture factor) // Radeon with 3 stages cases : let the third stage to ensure availability of the EMBM feature // There is a special fix in CMaterial::isSupportedByDriver to force the number of stages to 2 for the radeons _NbNeLTextureStages = 2; diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp index f13d33c7b..b65cf5f28 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp @@ -1341,7 +1341,7 @@ void registerGlExtensions(CGlExtensions &ext) // VBHard swap without flush of the VAR. ext.NVStateVARWithoutFlush= GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV; else - // VBHard with unuseful flush of the VAR. + // VBHard with useless flush of the VAR. ext.NVStateVARWithoutFlush= GL_VERTEX_ARRAY_RANGE_NV; // Check NV_occlusion_query diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp index cc3d87788..583d3fff1 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp @@ -751,7 +751,7 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re _WindowHeight = height; /* The next step is to create a device context for the newly created pbuffer. To do this, - call the the function: */ + call to the function: */ _hDC = nwglGetPbufferDCARB( _PBuffer ); if (_hDC == NULL) { diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.h b/code/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.h index cd0afe2fa..1cb5e82c9 100644 --- a/code/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.h +++ b/code/nel/src/3d/driver/opengl/mac/cocoa_application_delegate.h @@ -16,13 +16,16 @@ #import -namespace NL3D +namespace NL3D { class CDriverGL; NSApplicationTerminateReply applicationShouldTerminate(CDriverGL*); } -@interface CocoaApplicationDelegate : NSObject +@interface CocoaApplicationDelegate : NSObject +#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 + +#endif { NL3D::CDriverGL* _driver; } diff --git a/code/nel/src/3d/landscape_vegetable_block.cpp b/code/nel/src/3d/landscape_vegetable_block.cpp index cf3b5d61d..7af995c57 100644 --- a/code/nel/src/3d/landscape_vegetable_block.cpp +++ b/code/nel/src/3d/landscape_vegetable_block.cpp @@ -242,7 +242,7 @@ void CLandscapeVegetableBlock::createVegetableIGForDistType(uint i, CVegetable // generate _Patch->generateTileVegetable(vegetIg, i, tms, tmt, vbCreateCtx); - // If the ig is empty, delete him. This optimize rendering because no unuseful ig are + // If the ig is empty, delete him. This optimize rendering because no useless ig are // tested for rendering. This speed up some 1/10 of ms... if(vegetIg->isEmpty()) { diff --git a/code/nel/src/3d/mesh.cpp b/code/nel/src/3d/mesh.cpp index 40cb58700..0f57a8816 100644 --- a/code/nel/src/3d/mesh.cpp +++ b/code/nel/src/3d/mesh.cpp @@ -1692,7 +1692,7 @@ void CMeshGeom::bkupOriginalSkinVertices() // Copy VBuffer content into Original vertices normals. if(_VBuffer.getVertexFormat() & CVertexBuffer::PositionFlag) { - // copy vertices from VBuffer. (NB: unuseful geomorphed vertices are still copied, but doesn't matter). + // copy vertices from VBuffer. (NB: useless geomorphed vertices are still copied, but doesn't matter). _OriginalSkinVertices.resize(numVertices); for(uint i=0; isetupFog(driver->getFogStart(), driver->getFogEnd(), CRGBA::Black); /* Light case: CVisualCollisionManager use a fakeLight to avoid ShadowMapping on backFaces of meshs - Hence must clean all lights, and enalbe only the Light0 in driver + Hence must clean all lights, and enable only the Light0 in driver */ // Use CRenderTrav::resetLightSetup() to do so, to reset its Cache information scene->getRenderTrav().resetLightSetup(); diff --git a/code/nel/src/3d/shape_bank.cpp b/code/nel/src/3d/shape_bank.cpp index b5735a071..9ad06f6fa 100644 --- a/code/nel/src/3d/shape_bank.cpp +++ b/code/nel/src/3d/shape_bank.cpp @@ -677,7 +677,7 @@ void CShapeBank::removeShapeCache(const std::string &shapeCacheName) void CShapeBank::reset() { - // Parse la map ShapeCacheNameToShapeCache pour supprimer tout les caches + // Parse map ShapeCacheNameToShapeCache to delete all caches TShapeCacheMap::iterator scmIt = ShapeCacheNameToShapeCache.begin(); while( scmIt != ShapeCacheNameToShapeCache.end() ) { diff --git a/code/nel/src/3d/skeleton_model.cpp b/code/nel/src/3d/skeleton_model.cpp index 527a6c815..8cd55ec3c 100644 --- a/code/nel/src/3d/skeleton_model.cpp +++ b/code/nel/src/3d/skeleton_model.cpp @@ -1849,7 +1849,7 @@ void CSkeletonModel::getLightHotSpotInWorld(CVector &modelPos, float &modelRadi } else { - /* Else return the skeleton pos. NB: this seems unuseful since bone 0 not computed means no Skins. + /* Else return the skeleton pos. NB: this seems useless since bone 0 not computed means no Skins. But lighting computation is still done and may use a VisualCollisionEntity. This system cache some infos according to position. This is why we must return a position near the skeleton (else cache crash each frame => slowdown...) diff --git a/code/nel/src/3d/texture_font.cpp b/code/nel/src/3d/texture_font.cpp index 0ff997282..26e6d1b43 100644 --- a/code/nel/src/3d/texture_font.cpp +++ b/code/nel/src/3d/texture_font.cpp @@ -217,7 +217,7 @@ void CTextureFont::doGenerate(bool async) sint x = ite->left(); sint y = ite->bottom(); - // Look in wich category is the rectangle + // Look in which category is the rectangle sint cat = 0; sint catTopY = 0; sint catBotY = NbLine[cat] * Categories[cat]; diff --git a/code/nel/src/ligo/transition.h b/code/nel/src/ligo/transition.h index 0518920a9..9fe7fe1f8 100644 --- a/code/nel/src/ligo/transition.h +++ b/code/nel/src/ligo/transition.h @@ -180,7 +180,7 @@ public: * \param config is the current lingo config file * \param errors is an error handler filled with error code and message if the method return false. * - * \return true if check success false if problem detected. Errors are reported in the the error[0]. + * \return true if check success false if problem detected. Errors are reported in the error[0]. */ bool check (const CZoneTemplate &zoneTemplate, uint transitionNumber, const CLigoConfig &config, CLigoError &errors) const; diff --git a/code/nel/src/logic/logic_state_machine.cpp b/code/nel/src/logic/logic_state_machine.cpp index c9612ebff..23251a1b5 100644 --- a/code/nel/src/logic/logic_state_machine.cpp +++ b/code/nel/src/logic/logic_state_machine.cpp @@ -279,14 +279,14 @@ void CLogicStateMachine::modifyVariable( string varName, string modifOperator, s if( f.isReading() ) { - // set the the logic state machine addr in each state + // set the logic state machine addr in each state map::iterator itStates; for( itStates = _States.begin(); itStates != _States.end(); ++itStates ) { (*itStates).second.setLogicStateMachine( this ); } - // set the the logic state machine addr in each conditions + // set the logic state machine addr in each conditions map::iterator itCond; for( itCond = _Conditions.begin(); itCond != _Conditions.end(); ++itCond ) { diff --git a/code/nel/src/misc/co_task.cpp b/code/nel/src/misc/co_task.cpp index ca0a7fe58..1880be06c 100644 --- a/code/nel/src/misc/co_task.cpp +++ b/code/nel/src/misc/co_task.cpp @@ -172,7 +172,7 @@ namespace NLMISC * safe to use with NeL DLL. * For windows platform, this singleton also hold the * fiber pointer of the current thread. This is needed because - * of the bad design the the fiber API before Windows XP. + * of the bad design of the fiber API before Windows XP. */ class CCurrentCoTask { diff --git a/code/nel/src/misc/sheet_id.cpp b/code/nel/src/misc/sheet_id.cpp index 2d0f1d192..0eaad3a7a 100644 --- a/code/nel/src/misc/sheet_id.cpp +++ b/code/nel/src/misc/sheet_id.cpp @@ -192,7 +192,7 @@ void CSheetId::loadSheetId () removednbfiles++; } } - nlinfo ("SHEETID: Removed %d files on %d from CSheetId because these files doesn't exists", removednbfiles, nbfiles); + nlinfo ("SHEETID: Removed %d files on %d from CSheetId because these files don't exist", removednbfiles, nbfiles); } // Convert the map to one big string and 1 static map (id to name) diff --git a/code/nel/src/net/module_gateway.cpp b/code/nel/src/net/module_gateway.cpp index 3a608413f..9f838afd1 100644 --- a/code/nel/src/net/module_gateway.cpp +++ b/code/nel/src/net/module_gateway.cpp @@ -1608,7 +1608,7 @@ namespace NLNET pluggedModule->getModuleName().c_str(), pluggedModule->getModuleId()); - // A module has just been plugged here, we need to disclose it the the + // A module has just been plugged here, we need to disclose it to the // other module, and disclose other module to it. // create a proxy for this module diff --git a/code/nel/src/net/module_l5_transport.cpp b/code/nel/src/net/module_l5_transport.cpp index c022150ee..76d5cdd7b 100644 --- a/code/nel/src/net/module_l5_transport.cpp +++ b/code/nel/src/net/module_l5_transport.cpp @@ -457,7 +457,7 @@ namespace NLNET TRouteMap::iterator it(_Routes.find(sid)); if (it == _Routes.end()) { - nlwarning("onRemoveTransport : can't find a route the the transport %hu on service %u", + nlwarning("onRemoveTransport : can't find a route to the transport %hu on service %u", desc.TransportId, sid.get()); return; diff --git a/code/nel/src/net/module_local_gateway.cpp b/code/nel/src/net/module_local_gateway.cpp index 3c4e943e4..1cbf60d8e 100644 --- a/code/nel/src/net/module_local_gateway.cpp +++ b/code/nel/src/net/module_local_gateway.cpp @@ -380,7 +380,7 @@ namespace NLNET void onModulePlugged(IModule *pluggedModule) { - // A module has just been plugged here, we need to disclose it the the + // A module has just been plugged here, we need to disclose it to the // other module, and disclose other module to it. // create a proxy for this module diff --git a/code/nel/src/pacs/global_retriever.h b/code/nel/src/pacs/global_retriever.h index d264b8865..c5451f924 100644 --- a/code/nel/src/pacs/global_retriever.h +++ b/code/nel/src/pacs/global_retriever.h @@ -64,7 +64,7 @@ public: }; /** - * The global position in the the global retriever. + * The global position in the global retriever. * Contains an instance id and a local position within the instance. * \author Benjamin Legros * \author Nevrax France diff --git a/code/nel/src/pacs/retriever_instance.h b/code/nel/src/pacs/retriever_instance.h index 8dd35c705..db0b86aee 100644 --- a/code/nel/src/pacs/retriever_instance.h +++ b/code/nel/src/pacs/retriever_instance.h @@ -217,7 +217,7 @@ public: * instances have been built. */ void initEdgeQuad(CGlobalRetriever &gr); - /// link the edge quad of the interior with the the landscape instances + /// link the edge quad of the interior with the landscape instances void linkEdgeQuad(CGlobalRetriever &gr); /// Builds the instance. diff --git a/code/nel/tools/3d/build_clodtex/lod_texture_builder.cpp b/code/nel/tools/3d/build_clodtex/lod_texture_builder.cpp index e3d4abba9..c51ec7f46 100644 --- a/code/nel/tools/3d/build_clodtex/lod_texture_builder.cpp +++ b/code/nel/tools/3d/build_clodtex/lod_texture_builder.cpp @@ -24,7 +24,7 @@ using namespace NL3D; // *************************************************************************** -// Quality factor. Usefull to get maximum of interseting values in the range 0..255. +// Quality factor. Useful to get maximum of interseting values in the range 0..255. #define NL_LTB_MAX_DISTANCE_QUALITY_FACTOR 0.05f // The bigger, the lower the influence of the normal is. must be >=0 #define NL_LTB_NORMAL_BIAS 1.f diff --git a/code/nel/tools/3d/build_clodtex/lod_texture_builder.h b/code/nel/tools/3d/build_clodtex/lod_texture_builder.h index eba2beb13..cc88bf113 100644 --- a/code/nel/tools/3d/build_clodtex/lod_texture_builder.h +++ b/code/nel/tools/3d/build_clodtex/lod_texture_builder.h @@ -71,7 +71,7 @@ private: { // Pos/Normal CPixelInfo P; - // From wich texture (materialId) does this sample come from? + // From which texture (materialId) does this sample come from? uint MaterialId; // The UV of this sample NLMISC::CUV UV; diff --git a/code/nel/tools/3d/build_interface/main.cpp b/code/nel/tools/3d/build_interface/main.cpp index 2e6452f39..b9e9b44f3 100644 --- a/code/nel/tools/3d/build_interface/main.cpp +++ b/code/nel/tools/3d/build_interface/main.cpp @@ -319,7 +319,7 @@ int main(int nNbArg, char **ppArgs) UVMax[i].U = (float)x+AllMaps[i]->getWidth(); UVMax[i].V = (float)y+AllMaps[i]->getHeight(); - /* // Do not remove this is usefull for debugging + /* // Do not remove this is useful for debugging { NLMISC::COFile outTga; string fmtName = ppArgs[1]; diff --git a/code/nel/tools/3d/object_viewer/attrib_dlg.h b/code/nel/tools/3d/object_viewer/attrib_dlg.h index d543e7924..e38b78b69 100644 --- a/code/nel/tools/3d/object_viewer/attrib_dlg.h +++ b/code/nel/tools/3d/object_viewer/attrib_dlg.h @@ -106,7 +106,7 @@ public: */ void enableMemoryScheme(bool enabled = true) { _DisableMemoryScheme = !enabled; } - /** tells wether memory schemes are enables + /** tells whether memory schemes are enables * \see enableMemoryScheme() */ bool isMemorySchemeEnabled() const { return !_DisableMemoryScheme; } @@ -177,14 +177,14 @@ protected: virtual CEditAttribDlg *createConstantValueDlg() = 0; - // tells wether the scheme supports custom input + // tells whether the scheme supports custom input virtual bool hasSchemeCustomInput(void) const = 0; // retrieve the scheme input id virtual NL3D::CPSInputType getSchemeInput(void) const = 0; // set the scheme input id virtual void setSchemeInput(const NL3D::CPSInputType &input) = 0; - // tells wether the scheme input value is clamped or not + // tells whether the scheme input value is clamped or not virtual bool isSchemeClamped(void) const = 0; // clamp / unclamp the scheme virtual void clampScheme(bool clamped = true) = 0; diff --git a/code/nel/tools/3d/object_viewer/bound_checker.h b/code/nel/tools/3d/object_viewer/bound_checker.h index c36070bcf..9ca71eced 100644 --- a/code/nel/tools/3d/object_viewer/bound_checker.h +++ b/code/nel/tools/3d/object_viewer/bound_checker.h @@ -46,7 +46,7 @@ public: // get the upper bound T getUpperBound(void) const { return _UpperBound; } - // test wether the upper bound is excluded of the test + // test whether the upper bound is excluded of the test bool isUpperBoundExcluded(void) const { return _UpperBoundExcluded; @@ -68,7 +68,7 @@ public: // get the lower bound T getLowerBound(void) const { return _LowerBound; } - // test wether the lower bound is excluded of the test + // test whether the lower bound is excluded of the test bool isLowerBoundExcluded(void) const { return _LowerBoundExcluded; diff --git a/code/nel/tools/3d/object_viewer/located_properties.h b/code/nel/tools/3d/object_viewer/located_properties.h index 37ce0cb5b..ed5a222a5 100644 --- a/code/nel/tools/3d/object_viewer/located_properties.h +++ b/code/nel/tools/3d/object_viewer/located_properties.h @@ -104,7 +104,7 @@ protected: void set(const uint32 &v) { // if the max new size is lower than the current number of instance, we must suppress item - // in the the CParticleTreeCtrl + // in the CParticleTreeCtrl if (v < Located->getSize()) { diff --git a/code/nel/tools/3d/object_viewer/object_viewer_interface.h b/code/nel/tools/3d/object_viewer/object_viewer_interface.h index 1aa4ed258..9811f3cbb 100644 --- a/code/nel/tools/3d/object_viewer/object_viewer_interface.h +++ b/code/nel/tools/3d/object_viewer/object_viewer_interface.h @@ -59,7 +59,7 @@ public: // Init the UI virtual bool initUI (HWND parent=NULL) = 0; - // Test wether an instance of the viewer is running + // Test whether an instance of the viewer is running virtual bool isInstanceRunning() = 0; // Go. It shouldn't be called if there's an instance of the viewer that is running. diff --git a/code/nel/tools/3d/object_viewer/particle_tree_ctrl.cpp b/code/nel/tools/3d/object_viewer/particle_tree_ctrl.cpp index 8eca57843..7ebbe4726 100644 --- a/code/nel/tools/3d/object_viewer/particle_tree_ctrl.cpp +++ b/code/nel/tools/3d/object_viewer/particle_tree_ctrl.cpp @@ -426,7 +426,7 @@ void CParticleTreeCtrl::OnRButtonDown(UINT nFlags, CPoint point) { _LastClickedPS->setCurrentEditedElement(NULL); } - // test wether there is an item under that point + // test whether there is an item under that point UINT flags; HTREEITEM item = this->HitTest(point, &flags); if (item) diff --git a/code/nel/tools/3d/object_viewer/particle_workspace.h b/code/nel/tools/3d/object_viewer/particle_workspace.h index 466c8cac3..d541e664d 100644 --- a/code/nel/tools/3d/object_viewer/particle_workspace.h +++ b/code/nel/tools/3d/object_viewer/particle_workspace.h @@ -201,9 +201,9 @@ public: * All nodes are in the 'unloaded" state, so it is to the caller to load them by calling load() on their node */ void load() throw(NLMISC::EStream); - // Test wether the structure of the workspace has been modified (does not test if ps inside the workspace have been modified) + // Test whether the structure of the workspace has been modified (does not test if ps inside the workspace have been modified) bool isModified() const { return _Modified; } - // Test wether the content of the workspace has ben modified + // Test whether the content of the workspace has ben modified bool isContentModified() const; void touch() { setModifiedFlag(true); } void clearModifiedFlag() { setModifiedFlag(false); } diff --git a/code/nel/tools/3d/object_viewer/vegetable_list_box.cpp b/code/nel/tools/3d/object_viewer/vegetable_list_box.cpp index ce508f4a6..49414b79e 100644 --- a/code/nel/tools/3d/object_viewer/vegetable_list_box.cpp +++ b/code/nel/tools/3d/object_viewer/vegetable_list_box.cpp @@ -56,7 +56,7 @@ void CVegetableListBox::OnRButtonDown(UINT nFlags, CPoint point) CMenu* subMenu; menu.LoadMenu(IDR_VEGETABLE_MENU); - // test wether there is an item under that point + // test whether there is an item under that point BOOL bout; uint item = this->ItemFromPoint(point, bout); if (!bout) diff --git a/code/nel/tools/3d/object_viewer_qt/src/bin_op_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/bin_op_dialog.cpp index 0093f6aa1..25d7b703a 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/bin_op_dialog.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/bin_op_dialog.cpp @@ -39,13 +39,7 @@ CBinOpDialog::CBinOpDialog(QWidget *widget1, QWidget *widget2, QWidget *parent) setWindowTitle(tr("Bin operator")); _comboBox->clear(); - _comboBox->insertItems(0, QStringList() - << tr("SelectArg1") - << tr("SelectArg2") - << tr("Modulate") - << tr("Add") - << tr("Subtract")); - + qobject_cast(widget1)->setTitle(tr("Arg1")); qobject_cast(widget2)->setTitle(tr("Arg2")); connect(_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setNewOp(int))); diff --git a/code/nel/tools/3d/object_viewer_qt/src/bin_op_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/bin_op_dialog.h index 67de55f6a..d95da0554 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/bin_op_dialog.h +++ b/code/nel/tools/3d/object_viewer_qt/src/bin_op_dialog.h @@ -96,14 +96,28 @@ public: _AttrbDlg[k]->setSchemeWrapper(&_SchemeWrapper[k]) ; _AttrbDlg[k]->init(); } + + static const char * const operators[] = + { + QT_TR_NOOP("Select Arg1"), + QT_TR_NOOP("Select Arg2"), + QT_TR_NOOP("Modulate"), + QT_TR_NOOP("Add"), + QT_TR_NOOP("Subtract"), + 0 + }; + _comboBox->blockSignals(true); for (k = 0 ; k < (uint) NL3D::CPSBinOp::last ; ++k) { if (_EditedScheme->supportOp( (NL3D::CPSBinOp::BinOp) k)) { + _comboBox->insertItem(_comboBox->count(), operators[k]); + if ((uint) _EditedScheme->getOp() == k) _comboBox->setCurrentIndex(k); } } + _comboBox->blockSignals(false); } ~CBinOpDialogT() diff --git a/code/nel/tools/3d/object_viewer_qt/src/emitter_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/emitter_page.cpp index c7e4da53f..9a8d3191f 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/emitter_page.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/emitter_page.cpp @@ -156,6 +156,8 @@ void CEmitterPage::setEditedItem(CWorkspaceNode *ownerNode, NL3D::CPSLocatedBind _ui.radiusLabel->hide(); } + _ui.forceConsistentCheckBox->setChecked(_Emitter->isConsistentEmissionEnabled()); + _ui.directionComboBox->blockSignals(true); if (_Emitter->isSpeedBasisEmissionEnabled()) { @@ -196,7 +198,7 @@ void CEmitterPage::setEditedItem(CWorkspaceNode *ownerNode, NL3D::CPSLocatedBind _ui.bypassAutoLODCheckBox->setChecked(_Emitter->getBypassAutoLOD()); } else - _ui.bypassAutoLODCheckBox->setEnabled(true); + _ui.bypassAutoLODCheckBox->setEnabled(false); } void CEmitterPage::setEmittedType(int index) @@ -245,7 +247,7 @@ void CEmitterPage::setTypeOfEmission(int index) void CEmitterPage::setConsistentEmission(bool state) { - if (_Emitter-> isConsistentEmissionEnabled() == state) return; + if (_Emitter->isConsistentEmissionEnabled() == state) return; _Emitter->enableConsistenEmission(state); updateModifiedFlag(); } diff --git a/code/nel/tools/3d/object_viewer_qt/src/located_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/located_page.cpp index 7956a66c8..d6b5f6eaa 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/located_page.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/located_page.cpp @@ -241,7 +241,7 @@ void CLocatedPage::updateTriggerOnDeath(void) void CLocatedPage::CMaxNbParticlesWrapper::set(const uint32 &v) { // if the max new size is lower than the current number of instance, we must suppress item - // in the the CParticleTreeCtrl + // in the CParticleTreeCtrl if (v < Located->getSize()) { nlassert(Node); diff --git a/code/nel/tools/3d/object_viewer_qt/src/particle_node.h b/code/nel/tools/3d/object_viewer_qt/src/particle_node.h index 85293d432..e8916706a 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/particle_node.h +++ b/code/nel/tools/3d/object_viewer_qt/src/particle_node.h @@ -252,10 +252,10 @@ public: /// All nodes are in the 'unloaded" state, so it is to the caller to load them by calling load() on their node void load() throw(NLMISC::EStream); - /// Test wether the structure of the workspace has been modified (does not test if ps inside the workspace have been modified) + /// Test whether the structure of the workspace has been modified (does not test if ps inside the workspace have been modified) bool isModified() const { return _Modified; } - /// Test wether the content of the workspace has ben modified + /// Test whether the content of the workspace has ben modified bool isContentModified() const; void touch() { setModifiedFlag(true); } void clearModifiedFlag() { setModifiedFlag(false); } diff --git a/code/nel/tools/3d/tile_edit/View.cpp b/code/nel/tools/3d/tile_edit/View.cpp index a7c91fbbd..0271e1db8 100644 --- a/code/nel/tools/3d/tile_edit/View.cpp +++ b/code/nel/tools/3d/tile_edit/View.cpp @@ -1094,7 +1094,7 @@ void CTView::OnDropFiles(HDROP hDropInfo) { Browse *parent = (Browse*)this->GetParent(); char FileName[256]; - int count=DragQueryFile(hDropInfo,0xffffffff,FileName,256); //count = nombre de fichiers dans le drop + int count=DragQueryFile(hDropInfo,0xffffffff,FileName,256); //count = files number in drop queue POINT pos; @@ -1491,9 +1491,10 @@ LRESULT CTView::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) _chdir (LastPath.c_str()); CFileDialog load(true, NULL, LastPath.c_str(), OFN_ENABLESIZING | OFN_ALLOWMULTISELECT, "Targa bitmap (*.tga)|*.tga|All files (*.*)|*.*||",NULL); - load.m_ofn.lpstrFile = new char[10000]; //le buffer contient la list de tous les noms de fichier + load.m_ofn.lpstrFile = new char[10000]; // buffer contains filenames list load.m_ofn.lpstrFile[0] = 0; - //avec 10ko on devrait tranquille ... si l'ensemble des noms des fichiers depassent 10000 cara, l'insertion n'a pas lieu + // with 10 KB we should be large enough... + // if all files are exceeding 10000 characters, insert would be skipped load.m_ofn.nMaxFile = 10000-1; if (load.DoModal()==IDOK) { diff --git a/code/nel/tools/3d/tile_edit_qt/pic/Pic_Manage.c b/code/nel/tools/3d/tile_edit_qt/pic/Pic_Manage.c index 4765809ff..6efaf0f03 100644 --- a/code/nel/tools/3d/tile_edit_qt/pic/Pic_Manage.c +++ b/code/nel/tools/3d/tile_edit_qt/pic/Pic_Manage.c @@ -96,7 +96,7 @@ unsigned long PIC_Load(char* FileName, unsigned char Quantize) if ( !strcmp(ext,"JPG") ) { type=1; - } + } else if ( !strcmp(ext,"TGA") ) { type=2; diff --git a/code/nel/tools/3d/zone_check_bind/zone_check_bind.cpp b/code/nel/tools/3d/zone_check_bind/zone_check_bind.cpp index 399900346..8ed8be957 100644 --- a/code/nel/tools/3d/zone_check_bind/zone_check_bind.cpp +++ b/code/nel/tools/3d/zone_check_bind/zone_check_bind.cpp @@ -109,7 +109,7 @@ static CZone *LoadZone(uint16 xPos, uint16 yPos, std::string zoneExt) } //=========================================================================================================================== -/** Test wether 2 vertices could be welded +/** Test whether 2 vertices could be welded */ static inline bool CanWeld(const CVector &v1, const CVector &v2, float weldThreshold) { @@ -241,9 +241,9 @@ static uint CheckZone(std::string middleZoneFile, float weldThreshold, float mid } } - //////////////////////////////////////////////// - // check wether each patch is correctly bound // - //////////////////////////////////////////////// + ///////////////////////////////////////////////// + // check whether each patch is correctly bound // + ///////////////////////////////////////////////// for (l = 0; l < zoneInfos[0].Patchs.size(); ++l) { diff --git a/code/nel/tools/3d/zone_welder/internal_weld.cpp b/code/nel/tools/3d/zone_welder/internal_weld.cpp index 4b13838c3..4af2957a7 100644 --- a/code/nel/tools/3d/zone_welder/internal_weld.cpp +++ b/code/nel/tools/3d/zone_welder/internal_weld.cpp @@ -151,7 +151,7 @@ void bind_1_4 (std::vector &zoneInfos, uint patch, uint edge, uint p // *************************************************************************** -/** Test wether 2 vertices could be welded */ +/** Test whether 2 vertices could be welded */ static inline bool CanWeld(const CVector &v1, const CVector &v2, float weldThreshold) { @@ -305,9 +305,9 @@ void CleanZone ( std::vector &zoneInfos, uint zoneId, const CAABBoxE } } - //////////////////////////////////////////////// - // check wether each patch is correctly bound // - //////////////////////////////////////////////// + ///////////////////////////////////////////////// + // check whether each patch is correctly bound // + ///////////////////////////////////////////////// uint pass = 0; while (1) { diff --git a/code/nel/tools/3d/zone_welder/zone_welder.cpp b/code/nel/tools/3d/zone_welder/zone_welder.cpp index 31610f68e..9e0d94e37 100644 --- a/code/nel/tools/3d/zone_welder/zone_welder.cpp +++ b/code/nel/tools/3d/zone_welder/zone_welder.cpp @@ -142,7 +142,7 @@ bool getPatchAndEdge(const std::vector& patchs, if(patchs[ptch].BaseVertices[i] == baseVertex1) { #if WELD_LOG - fprintf(fdbg,"patch %d contient bv %d : %d %d %d %d\n", + fprintf(fdbg,"patch %d continent bv %d : %d %d %d %d\n", ptch, baseVertex1, patchs[ptch].BaseVertices[0], diff --git a/code/nel/tools/logic/logic_editor_dll/ConditionsView.cpp b/code/nel/tools/logic/logic_editor_dll/ConditionsView.cpp index 231371c88..b36a11151 100644 --- a/code/nel/tools/logic/logic_editor_dll/ConditionsView.cpp +++ b/code/nel/tools/logic/logic_editor_dll/ConditionsView.cpp @@ -351,7 +351,8 @@ void CConditionsView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint) break; } - } while (subPos == NULL); + } + while (subPos == NULL); if (pNode == NULL) break; diff --git a/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp b/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp index 215dafa9e..50dcf910a 100644 --- a/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp +++ b/code/nel/tools/misc/make_sheet_id/make_sheet_id.cpp @@ -238,7 +238,7 @@ void makeId( list& dirs ) if( hFind == INVALID_HANDLE_VALUE ) { nlwarning ("Invalid File Handle"); - } + } else { do diff --git a/code/ryzom/client/src/actions.cpp b/code/ryzom/client/src/actions.cpp index 2dc381151..f6b24f5c5 100644 --- a/code/ryzom/client/src/actions.cpp +++ b/code/ryzom/client/src/actions.cpp @@ -31,7 +31,7 @@ extern CEventsListener EventsListener; // GLOBAL // //////////// -// Hierachical timer +// Hierarchical timer H_AUTO_DECL ( RZ_Client_Actions_Context_Mngr_Update ) static bool getParam (CBaseAction::CParameter::TType type, ucstring ¶mName, ucstring ¶mValue, const std::string &argu, uint paramId); diff --git a/code/ryzom/client/src/attack.h b/code/ryzom/client/src/attack.h index b63bdbef1..a29eb0e52 100644 --- a/code/ryzom/client/src/attack.h +++ b/code/ryzom/client/src/attack.h @@ -41,9 +41,9 @@ public: const CCreatureAttackSheet *Sheet; // anim fx set for attack part CAnimationFXSet AttackFXSet; - // anim fx set for custom projectile part (wether custom projectile is used is told in 'Sheet'); + // anim fx set for custom projectile part (whether custom projectile is used is told in 'Sheet'); CAnimationFXSet ProjectileFXSet; - // anim fx set for custom impact part (wether custom impact is used is told in 'Sheet'); + // anim fx set for custom impact part (whether custom impact is used is told in 'Sheet'); CAnimationFXSet ImpactFXSet; public: // ctor diff --git a/code/ryzom/client/src/cdb_branch.cpp b/code/ryzom/client/src/cdb_branch.cpp index ece4866c0..06501e940 100644 --- a/code/ryzom/client/src/cdb_branch.cpp +++ b/code/ryzom/client/src/cdb_branch.cpp @@ -956,7 +956,7 @@ void CCDBNodeBranch::removeBranchInfoIt(TObsList::iterator it) //----------------------------------------------- -// Usefull for find +// Useful for find //----------------------------------------------- class CCDBNodeBranchComp : public std::binary_function { diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp index 37260665b..734d9778e 100644 --- a/code/ryzom/client/src/character_cl.cpp +++ b/code/ryzom/client/src/character_cl.cpp @@ -2075,13 +2075,13 @@ double CCharacterCL::computeSpeed() // Compute and return the speed factor to apply to the animation. // \param speedToDest : evaluted speed to destination. // \return double : the speed factor to use for the current animation. -// \todo GUIGUI : revoir les histoire de scale, faire ca mieux. +// \todo GUIGUI : review this scale problem and optimize it. //----------------------------------------------- double CCharacterCL::computeSpeedFactor(double speedToDest) { double speedFactor = 1.0; - // \todo GUIGUI : faire cette histoire de emote beaucoup mieux, C NULL. + // \todo GUIGUI : optimize emotes, currently it's badly designed. const CAnimationState *animStatePtr; // If the current animation is an emote, get the right animation state. if(animState(MOVE) == CAnimationStateSheet::Emote) @@ -5493,7 +5493,7 @@ void CCharacterCL::updateStages() if(it->second.isPresent(PROPERTY_POSITION)) { somePosFoundEarly= true; - // then it's cool we can set the new accurate interval to the prec stage wich has a pos + // then it's cool we can set the new accurate interval to the prec stage which has a pos if(itPosPrec!=_Stages._StageSet.end()) { uint dgc= it->first - itPosPrec->first; @@ -5713,7 +5713,7 @@ void CCharacterCL::updateStages() float maxSpeed= (float)getMaxSpeed(); if(maxSpeed>0) { - // compute at wich time the first move should begin so it doesn't have to accelerate + // compute at which time the first move should begin so it doesn't have to accelerate _RunStartTimeNoPop= fpTime - d2fp/maxSpeed; } } diff --git a/code/ryzom/client/src/client.cpp b/code/ryzom/client/src/client.cpp index 86b182228..8eea73241 100644 --- a/code/ryzom/client/src/client.cpp +++ b/code/ryzom/client/src/client.cpp @@ -1,4 +1,3 @@ - // Ryzom - MMORPG Framework // Copyright (C) 2010 Winch Gate Property Limited // @@ -114,9 +113,9 @@ void quitCrashReport () #ifndef NL_OS_WINDOWS static void sigHandler(int Sig) { - // redirect the signal for the next time - signal(Sig, sigHandler); - nlwarning("Ignoring signal SIGPIPE"); + // redirect the signal for the next time + signal(Sig, sigHandler); + nlwarning("Ignoring signal SIGPIPE"); } #endif diff --git a/code/ryzom/client/src/connection.cpp b/code/ryzom/client/src/connection.cpp index 978018bff..f0694cd47 100644 --- a/code/ryzom/client/src/connection.cpp +++ b/code/ryzom/client/src/connection.cpp @@ -1561,7 +1561,7 @@ public: static volatile bool isMainlandCharacter = false; // TMP until we can get this info if (isMainlandCharacter) { - nlassert(0); // utiliser id="message_box" !!! + nlassert(0); // use id="message_box" !!! if (AvailablePatchs != 0) { im->messageBoxWithHelp(CI18N::get("uiBGD_MainlandCharFullPatchNeeded"), "ui:outgame"); diff --git a/code/ryzom/client/src/continent.h b/code/ryzom/client/src/continent.h index 3c0aebb07..c6582dd1b 100644 --- a/code/ryzom/client/src/continent.h +++ b/code/ryzom/client/src/continent.h @@ -242,7 +242,7 @@ public: /// This will remove extra rsc used by the continent (fog maps ..) void unselect(); - /** Test wether the next call to updateStreamable will be blocking. + /** Test whether the next call to updateStreamable will be blocking. * This happen for example when the player is too near of a village and when asynchronous loading is not sufficient. * \param pos player position */ diff --git a/code/ryzom/client/src/continent_manager.cpp b/code/ryzom/client/src/continent_manager.cpp index a9e8b3cb9..ec2a03f69 100644 --- a/code/ryzom/client/src/continent_manager.cpp +++ b/code/ryzom/client/src/continent_manager.cpp @@ -246,7 +246,7 @@ void CContinentManager::load () //----------------------------------------------- // select : // Select continent from a name. -// \param const string &name : name of the contient to select. +// \param const string &name : name of the continent to select. //----------------------------------------------- void CContinentManager::select(const string &name, const CVectorD &pos, NLMISC::IProgressCallback &progress) { diff --git a/code/ryzom/client/src/demo.cpp b/code/ryzom/client/src/demo.cpp index 8aa37e4d2..18ce7d5ea 100644 --- a/code/ryzom/client/src/demo.cpp +++ b/code/ryzom/client/src/demo.cpp @@ -42,7 +42,7 @@ using namespace std; // GLOBAL // //////////// -// Hierachical timer +// Hierarchical timer H_AUTO_DECL ( RZ_Client_Update_Demo ) /////////////// diff --git a/code/ryzom/client/src/entity_animation_manager.cpp b/code/ryzom/client/src/entity_animation_manager.cpp index 0e7e3ac7a..b84a086e6 100644 --- a/code/ryzom/client/src/entity_animation_manager.cpp +++ b/code/ryzom/client/src/entity_animation_manager.cpp @@ -61,7 +61,7 @@ extern NL3D::UScene * Scene; // GLOBAL // //////////// -// Hierachical timer +// Hierarchical timer H_AUTO_DECL ( RZ_Client_Entity_Animation_Mngr ) //////////////////// diff --git a/code/ryzom/client/src/entity_cl.cpp b/code/ryzom/client/src/entity_cl.cpp index bacb99464..449127b71 100644 --- a/code/ryzom/client/src/entity_cl.cpp +++ b/code/ryzom/client/src/entity_cl.cpp @@ -3231,11 +3231,11 @@ void CEntityCL::updateCastShadowMap() void CEntityCL::updateShadowMapProperties() { /* - Choose the z clamp direction wether or not the player is on "interior" stuff. + Choose the z clamp direction whether or not the player is on "interior" stuff. In "interior" stuff, the ZClamp direction is lesser, to avoid some problems of "cast shadow behind the walls" - Also choose the MaxDepth of shadow map wether or not the player is on "interior" stuff. + Also choose the MaxDepth of shadow map whether or not the player is on "interior" stuff. In "interior" stuff, the MaxDepth is lesser to, to avoid some problems with the "bud": when the player go up stairs and when in the "bud", the shadow still appears on landscape */ diff --git a/code/ryzom/client/src/forage_source_cl.cpp b/code/ryzom/client/src/forage_source_cl.cpp index 2f0aa8dda..a62509aab 100644 --- a/code/ryzom/client/src/forage_source_cl.cpp +++ b/code/ryzom/client/src/forage_source_cl.cpp @@ -359,7 +359,7 @@ NLMISC_VARIABLE( float, ForageSourceUP3, "" ); */ void CForageSourceCL::updateVisualPropertyBars(const NLMISC::TGameCycle &/* gameCycle */, const sint64 &prop) { - // NB: forage don't use CBarManager for 2 reasons: unusefull (forage bars exist only through VP), + // NB: forage don't use CBarManager for 2 reasons: useless (forage bars exist only through VP), // and complicated since updated at each frame on client (because of smooth transition code below) bool setBarsNow = (_BarDestValues[0] == BarNotInit); diff --git a/code/ryzom/client/src/gateway_fec_transport.cpp b/code/ryzom/client/src/gateway_fec_transport.cpp index 80bf238cd..f660cb793 100644 --- a/code/ryzom/client/src/gateway_fec_transport.cpp +++ b/code/ryzom/client/src/gateway_fec_transport.cpp @@ -521,7 +521,7 @@ public: static CGatewayFEClientTransport *getCurrentTransport() { #if defined(RZ_CLIENT_DRONE) - // the current transport is set the the current context of the client drone + // the current transport is set to the current context of the client drone if (CSimulatedClient::currentContext() == NULL) return NULL; if (CSimulatedClient::currentContext()->getGatewayTransport() == NULL) diff --git a/code/ryzom/client/src/hair_set.h b/code/ryzom/client/src/hair_set.h index 3d878880e..24621605a 100644 --- a/code/ryzom/client/src/hair_set.h +++ b/code/ryzom/client/src/hair_set.h @@ -50,7 +50,7 @@ public: */ sint getHairItemId(EGSPD::CPeople::TPeople people, uint index) const; - // Tells wether this id in the sheet manager is the id of a hair item + // Tells whether this id in the sheet manager is the id of a hair item bool isHairItemId(uint id) const; // Gives the people for this hair id in the sheet manager, or unknown if not found diff --git a/code/ryzom/client/src/interface_v3/action_handler_help.cpp b/code/ryzom/client/src/interface_v3/action_handler_help.cpp index 6e6628b30..3c2e1c18e 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_help.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_help.cpp @@ -281,7 +281,7 @@ CInterfaceGroup *CInterfaceHelp::activateNextWindow(CDBCtrlSheet *elt, sint forc // if an active window is not in KeepMode, get it. for(i=0;i<_ActiveWindows.size();i++) { - // must also test forceKeep for special Action Help wich open Brick Help + // must also test forceKeep for special Action Help which open Brick Help if(!_InfoWindows[_ActiveWindows[i]].KeepMode && forceKeepWindow!=(sint)_ActiveWindows[i]) { newIndexWindow= _ActiveWindows[i]; @@ -2056,7 +2056,7 @@ void getItemText (CDBCtrlSheet *item, ucstring &itemText, const CItemSheet*pIS) // *************************************************************************** static void setupEnchantedItem(CSheetHelpSetup &setup, ucstring &itemText) { - // if don't find the tag in the text (eg: if not usefull), no-op + // if don't find the tag in the text (eg: if not useful), no-op static const ucstring enchantTag("%enchantment"); if( itemText.find(enchantTag) == ucstring::npos ) return; @@ -2147,7 +2147,7 @@ static void setupRawMaterialStats(CSheetHelpSetup &setup) } // force reset, but try to keep the precedent selection - // (usefull to test same item-part from different MPs) + // (useful to test same item-part from different MPs) sint32 precSel= pCB->getSelection(); pCB->setSelection(1); pCB->setSelection(0); @@ -3126,7 +3126,7 @@ void setupSabrinaPhraseHelp(CSheetHelpSetup &setup, const CSPhraseCom &phrase, u // get the phraseText ucstring phraseText; // if required, add the .sphrase requirements. - // NB: don't add if from bot chat validation (unsusefull cause already filtered by server) + // NB: don't add if from bot chat validation (useless cause already filtered by server) pPM->buildPhraseDesc(phraseText, phrase, phraseSheetId, !setup.FromBotChat); diff --git a/code/ryzom/client/src/interface_v3/action_handler_help.h b/code/ryzom/client/src/interface_v3/action_handler_help.h index cd0058508..7430ee8cf 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_help.h +++ b/code/ryzom/client/src/interface_v3/action_handler_help.h @@ -30,7 +30,7 @@ class CSheetHelpSetup public: CInterfaceGroup *HelpWindow; CDBCtrlSheet *SrcSheet; // the sheet for which info should be displayed (outside of the help window) - CDBCtrlSheet *DestSheet; // copy of the the sheet for which info are asked (this sheet is in the help window, the source sheet is copied in it) + CDBCtrlSheet *DestSheet; // copy of the sheet for which info are asked (this sheet is in the help window, the source sheet is copied in it) std::string ViewText; // id of the text inside the help window that receive infos about the sheet std::string ViewTextID; // id of the text_id inside the help window that receive infos about the sheet (for dynamic infos -> missions) std::string ScrollTextGroup; // name of the group that contains the description text diff --git a/code/ryzom/client/src/interface_v3/action_phrase_faber.cpp b/code/ryzom/client/src/interface_v3/action_phrase_faber.cpp index bb4b72ecc..76b60ade1 100644 --- a/code/ryzom/client/src/interface_v3/action_phrase_faber.cpp +++ b/code/ryzom/client/src/interface_v3/action_phrase_faber.cpp @@ -689,7 +689,7 @@ void CActionPhraseFaber::startMpSelection(uint itemReqLine, uint mpSlot) } } - // Filter the selection wether it is an itemPart or specificItem reqiurement + // Filter the selection whether it is an itemPart or specificItem reqiurement if(mpBuild.RequirementType==CMPBuild::ItemPartReq) { CItemSheet *itemBuilt= dynamic_cast(SheetMngr.get(_ExecuteFromItemPlanBrick->FaberPlan.ItemBuilt)); diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_mission.h b/code/ryzom/client/src/interface_v3/bot_chat_page_mission.h index e58b25c95..330f44fcd 100644 --- a/code/ryzom/client/src/interface_v3/bot_chat_page_mission.h +++ b/code/ryzom/client/src/interface_v3/bot_chat_page_mission.h @@ -48,7 +48,7 @@ public: void setMissionClientType(MISSION_DESC::TClientMissionType mType) {_MType= mType;} private: - // an observer to update big mission list from littles pages in serveur database + // an observer to update big mission list from littles pages in server database CHugeListObs _MissionPagesObs; CDBCtrlSheet *_CurrSel; MISSION_DESC::TClientMissionType _MType; diff --git a/code/ryzom/client/src/interface_v3/chat_filter.h b/code/ryzom/client/src/interface_v3/chat_filter.h index d288d9867..7524d6c7f 100644 --- a/code/ryzom/client/src/interface_v3/chat_filter.h +++ b/code/ryzom/client/src/interface_v3/chat_filter.h @@ -69,7 +69,7 @@ public: bool isListeningPeopleList(CPeopleList *pl) const; //@} - // For ChatGroup, usefull to know for wich chat it is destinated + // For ChatGroup, useful to know for which chat it is destinated CChatGroup::TGroupType FilterType; // If FilterType==CChatGroup::dyn_chat, gives the index of dynchat uint32 DynamicChatDbIndex; diff --git a/code/ryzom/client/src/interface_v3/ctrl_scroll.h b/code/ryzom/client/src/interface_v3/ctrl_scroll.h index b51853466..5f80598a8 100644 --- a/code/ryzom/client/src/interface_v3/ctrl_scroll.h +++ b/code/ryzom/client/src/interface_v3/ctrl_scroll.h @@ -51,7 +51,7 @@ public: sint32 moveTrackY (sint32 dy); /** Move the Target Ofs with a Delta, and recompute TrackPos from this Ofs. - * Usefull for finer controled group scrolling when the list is very big (with mouseWheel or scroll buttons) + * Useful for finer controled group scrolling when the list is very big (with mouseWheel or scroll buttons) */ void moveTargetX (sint32 dx); void moveTargetY (sint32 dy); diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.h b/code/ryzom/client/src/interface_v3/dbctrl_sheet.h index 3134ec5c3..5f4425419 100644 --- a/code/ryzom/client/src/interface_v3/dbctrl_sheet.h +++ b/code/ryzom/client/src/interface_v3/dbctrl_sheet.h @@ -667,7 +667,7 @@ protected: uint32 _PackedArmourColor; - // For an Item only. Usefull for LeftHand Filtering: must have a pointer to the right hand + // For an Item only. Useful for LeftHand Filtering: must have a pointer to the right hand CDBCtrlSheet *_OtherHandItemFilter; // This String is optional and usage dependent for Item, Macro, or Sentence diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h index bb1a346a3..d0edc49d9 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h +++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h @@ -74,7 +74,7 @@ public: virtual void sort() { } void needToSort() { _NeedToSort = true; invalidateCoords(); } - /** (usefull for list only) Force the validity of an element, even if its sheetId==0 + /** (useful for list only) Force the validity of an element, even if its sheetId==0 * (empty slot displayed instead) * NB: invalidateCoords() called if state is changed */ diff --git a/code/ryzom/client/src/interface_v3/group_container.h b/code/ryzom/client/src/interface_v3/group_container.h index bde10127b..43ae9f1db 100644 --- a/code/ryzom/client/src/interface_v3/group_container.h +++ b/code/ryzom/client/src/interface_v3/group_container.h @@ -585,7 +585,7 @@ protected: IActionHandler *_AHOnBeginMove; CStringShared _AHOnBeginMoveParams; - // action handler to test wether the windows can be deactivated (when the close button is pressed) + // action handler to test whether the windows can be deactivated (when the close button is pressed) IActionHandler *_AHOnDeactiveCheck; CStringShared _AHOnDeactiveCheckParams; diff --git a/code/ryzom/client/src/interface_v3/group_html.cpp b/code/ryzom/client/src/interface_v3/group_html.cpp index 00caed7e7..43ff1ca75 100644 --- a/code/ryzom/client/src/interface_v3/group_html.cpp +++ b/code/ryzom/client/src/interface_v3/group_html.cpp @@ -367,7 +367,8 @@ void dolibcurltest() addImageDownload("http://www.ryzom.com/fr/"); addImageDownload("http://www.ryzom.com/de/"); - do { + do + { checkImageDownload(); nlwarning("continue to sleep"); nlSleep(300); diff --git a/code/ryzom/client/src/interface_v3/group_in_scene.h b/code/ryzom/client/src/interface_v3/group_in_scene.h index 3a734ff46..76c0f03e7 100644 --- a/code/ryzom/client/src/interface_v3/group_in_scene.h +++ b/code/ryzom/client/src/interface_v3/group_in_scene.h @@ -50,7 +50,7 @@ public: // Position of the group in world space NLMISC::CVector Position; - // usefull only if getUserScale()==true + // useful only if getUserScale()==true float Scale; void setUserScale(bool us); diff --git a/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp index 0209d3694..85238ad7d 100644 --- a/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp +++ b/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp @@ -863,7 +863,7 @@ void CGroupInSceneBubbleManager::dynChatOpen (uint32 nBotUID, uint32 nBotName, c nlassert( (DynStrs.size() >= 1) && (DynStrs.size() <= 9)); CInterfaceManager *pIM = CInterfaceManager::getInstance(); - // If the character doesn't exists in view field -> do not display the bubble + // If the character doesn't exist in view field -> do not display the bubble CEntityCL *pEntity = EntitiesMngr.getEntityByCompressedIndex(nBotUID); if (ClientCfg.Local) pEntity = EntitiesMngr.entity(1); diff --git a/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp b/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp index f68fded1e..5da9794cc 100644 --- a/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp +++ b/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp @@ -999,7 +999,7 @@ void CGroupInSceneUserInfo::updateDynamicData () // or directly from the forage source else { - // NB: forage don't use CBarManager for 2 reasons: unusefull (forage bars exist only through VP), + // NB: forage don't use CBarManager for 2 reasons: useless (forage bars exist only through VP), // and complicated since updated at each frame on client (because of smooth transition code) CForageSourceCL *forageSource = static_cast(_Entity); barInfo.Score[SCORES::hit_points]= forageSource->getTimeBar(); // Map TimeBar to HP diff --git a/code/ryzom/client/src/interface_v3/guild_manager.cpp b/code/ryzom/client/src/interface_v3/guild_manager.cpp index 8ecf90a96..c9bb4ec01 100644 --- a/code/ryzom/client/src/interface_v3/guild_manager.cpp +++ b/code/ryzom/client/src/interface_v3/guild_manager.cpp @@ -907,7 +907,7 @@ class CAHGuildSheetMenuOpen : public IActionHandler return; } - // *** Check with the grade of the local player wich types of actions we can do on the player selected + // *** Check with the grade of the local player which types of actions we can do on the player selected // enable or disable menu entries if (pGM->isProxy()) diff --git a/code/ryzom/client/src/interface_v3/input_handler_manager.cpp b/code/ryzom/client/src/interface_v3/input_handler_manager.cpp index 023bc2246..1d755dd56 100644 --- a/code/ryzom/client/src/interface_v3/input_handler_manager.cpp +++ b/code/ryzom/client/src/interface_v3/input_handler_manager.cpp @@ -49,7 +49,7 @@ using namespace NLMISC; extern CActionsManager Actions; extern CActionsManager EditActions; -// Hierachical timer +// Hierarchical timer H_AUTO_DECL ( RZ_Client_Pump_Events ) CInputHandlerManager* CInputHandlerManager::_Instance = NULL; diff --git a/code/ryzom/client/src/interface_v3/interface_element.h b/code/ryzom/client/src/interface_v3/interface_element.h index 86d61afd0..c77fc41b6 100644 --- a/code/ryzom/client/src/interface_v3/interface_element.h +++ b/code/ryzom/client/src/interface_v3/interface_element.h @@ -469,7 +469,7 @@ public: /** This is called before the config loading begins. This is the place to restore default state for config info. */ virtual void onLoadConfig() {} - /** Tells wether that element wants to save info in a config stream. If this returns true, then serialConfig + /** Tells whether that element wants to save info in a config stream. If this returns true, then serialConfig * is called. */ virtual bool wantSerialConfig() const { return false; } diff --git a/code/ryzom/client/src/interface_v3/interface_manager.h b/code/ryzom/client/src/interface_v3/interface_manager.h index cd3ad23ba..ced23130f 100644 --- a/code/ryzom/client/src/interface_v3/interface_manager.h +++ b/code/ryzom/client/src/interface_v3/interface_manager.h @@ -444,7 +444,7 @@ public: /** * add an observer to a database entry * \param observer : pointer on the observer - * \param id : the thext id of the element to observe + * \param id : the text id of the element to observe * \return true if success */ bool addDBObserver (ICDBNode::IPropertyObserver* observer, ICDBNode::CTextId id); @@ -452,7 +452,7 @@ public: /** * add an observer to a database entry * \param observer : pointer on the observer - * \param id : the thext id of the element to observe + * \param id : the text id of the element to observe * \return true if success */ bool addDBObserver (ICDBNode::IPropertyObserver* observer, const std::string& id) diff --git a/code/ryzom/client/src/interface_v3/lua_ihm.cpp b/code/ryzom/client/src/interface_v3/lua_ihm.cpp index 488d8d2fc..3833b457e 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm.cpp +++ b/code/ryzom/client/src/interface_v3/lua_ihm.cpp @@ -2678,7 +2678,7 @@ int CLuaIHM::runExprAndPushResult(CLuaState &ls, const std::string &expr) case CInterfaceExprValue::String: { ucstring ucstr= value.getUCString(); - // Yoyo: dynamically decide wether must return a string or a ucstring + // Yoyo: dynamically decide whether must return a string or a ucstring bool mustUseUCString= false; for (uint i = 0; i < ucstr.size (); i++) { diff --git a/code/ryzom/client/src/interface_v3/macrocmd_manager.cpp b/code/ryzom/client/src/interface_v3/macrocmd_manager.cpp index 64228ede7..352d0ca0d 100644 --- a/code/ryzom/client/src/interface_v3/macrocmd_manager.cpp +++ b/code/ryzom/client/src/interface_v3/macrocmd_manager.cpp @@ -217,7 +217,8 @@ void CMacroCmdManager::initInGame() for (nOpt = 0; nOpt < 3; nOpt++) { i = 0; - do { + do + { sTmp = pIO->getValStr(prefix[nOpt]+NLMISC::toString(i)); if (!sTmp.empty()) { @@ -225,7 +226,8 @@ void CMacroCmdManager::initInGame() wheretostock[nOpt]->push_back(nTexId); } ++i; - } while (!sTmp.empty()); + } + while (!sTmp.empty()); } } diff --git a/code/ryzom/client/src/interface_v3/obs_huge_list.h b/code/ryzom/client/src/interface_v3/obs_huge_list.h index 3c19be480..04ab62ad7 100644 --- a/code/ryzom/client/src/interface_v3/obs_huge_list.h +++ b/code/ryzom/client/src/interface_v3/obs_huge_list.h @@ -104,7 +104,7 @@ public: // Clean local db if botchat que the botchat session id void start(); - // Check wether download has finished + // Check whether download has finished bool isDownloadComplete() const { return _DownloadComplete; } uint16 getSessionID () { nlassert((uint) _Category < ListTypeCount); return _CurrentSessionNb; } diff --git a/code/ryzom/client/src/interface_v3/req_skill_formula.cpp b/code/ryzom/client/src/interface_v3/req_skill_formula.cpp index 3e20b5a3a..f97bae7a9 100644 --- a/code/ryzom/client/src/interface_v3/req_skill_formula.cpp +++ b/code/ryzom/client/src/interface_v3/req_skill_formula.cpp @@ -41,7 +41,7 @@ bool CSkillValue::andWith(const CSkillValue &sv) // else if the skills are one same branch else if(pSM->areSkillOnSameBranch(Skill, sv.Skill)) { - // The skillvalue are compatible if the the ancestor skill has a lesser value than the son + // The skillvalue are compatible if the ancestor skill has a lesser value than the son if(pSM->isSkillAncestor(Skill, sv.Skill)) { if(Value<=sv.Value) @@ -80,7 +80,7 @@ bool CSkillValue::orWith(const CSkillValue &sv) // else if the skills are one same branch else if(pSM->areSkillOnSameBranch(Skill, sv.Skill)) { - // The skillvalue are compatible if the the ancestor skill has a lesser value than the son + // The skillvalue are compatible if the ancestor skill has a lesser value than the son if(pSM->isSkillAncestor(Skill, sv.Skill)) { if(Value<=sv.Value) diff --git a/code/ryzom/client/src/interface_v3/sphrase_manager.cpp b/code/ryzom/client/src/interface_v3/sphrase_manager.cpp index e25900f91..8058e41da 100644 --- a/code/ryzom/client/src/interface_v3/sphrase_manager.cpp +++ b/code/ryzom/client/src/interface_v3/sphrase_manager.cpp @@ -1723,7 +1723,7 @@ sint CSPhraseManager::getPhraseSuccessRate(TSuccessTable st, const CSPhraseCom & CSBrickSheet *rootBrick= pBM->getBrick(phrase.Bricks[0]); if(rootBrick && rootBrick->isCombat()) { - // this to avoid problem with the default attack wich has a 0 cost... + // this to avoid problem with the default attack which has a 0 cost... costSum= max(costSum, getRightHandEffectiveLevel()); } diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp index cd27fd00b..877c2963e 100644 --- a/code/ryzom/client/src/login_patch.cpp +++ b/code/ryzom/client/src/login_patch.cpp @@ -3636,7 +3636,8 @@ void CInstallThread::run() pPM->renameFile(patchName, sourceName); pPM->applyDate(sourceName, lastFileDate); } - } catch ( const std::exception& e) + } + catch ( const std::exception& e) { nlwarning("%s", e.what()); pPM->setState(true, ucstring(e.what()) ); @@ -3668,27 +3669,31 @@ void CInstallThread::run() NLMISC::CFile::deleteFile(vFiles[i]); } // Delete all directory from tmp directory - do { + do + { vFiles.clear(); CPath::getPathContent(install, true, true, false, vFiles); for (uint32 i = 0; i < vFiles.size(); ++i) { NLMISC::CFile::deleteDirectory(vFiles[i]); } - } while ( !vFiles.empty() ); + } + while ( !vFiles.empty() ); // delete tmp directory NLMISC::CFile::deleteDirectory(install); // delete libtorrent_logs directory if exist (not activate) if (NLMISC::CFile::fileExists("libtorrent_logs")) { - do { + do + { vFiles.clear(); CPath::getPathContent("libtorrent_logs", true, true, false, vFiles); for (uint32 i = 0; i < vFiles.size(); ++i) { NLMISC::CFile::deleteDirectory(vFiles[i]); } - } while ( !vFiles.empty() ); + } + while ( !vFiles.empty() ); NLMISC::CFile::deleteDirectory("libtorrent_logs"); } diff --git a/code/ryzom/client/src/login_patch.h b/code/ryzom/client/src/login_patch.h index 3e6abc8cf..07b2e9486 100644 --- a/code/ryzom/client/src/login_patch.h +++ b/code/ryzom/client/src/login_patch.h @@ -440,7 +440,7 @@ private: std::string CurrentFile; - // Usefull pathes and names + // Useful pathes and names /// Now deprecated : the launcher is the client ryzom std::string RyzomFilename; @@ -450,7 +450,7 @@ private: std::string ClientPatchPath; std::string ClientDataPath; - /// Output usefull information for debugging in the log file + /// Output useful information for debugging in the log file bool VerboseLog; bool MustLaunchBatFile; // And then relaunch ryzom diff --git a/code/ryzom/client/src/misc.cpp b/code/ryzom/client/src/misc.cpp index 7fc84f4e5..7d0db393f 100644 --- a/code/ryzom/client/src/misc.cpp +++ b/code/ryzom/client/src/misc.cpp @@ -622,7 +622,7 @@ SPropVisualB buildPropVisualB(const CGenderInfo &genderInfo) //----------------------------------------------- // isUserColorSupported : -// Test wether user color is supported for this equipment +// Test whether user color is supported for this equipment //----------------------------------------------- bool isUserColorSupported(const CPlayerSheet::CEquipment &equip) { @@ -639,7 +639,7 @@ bool isUserColorSupported(const CPlayerSheet::CEquipment &equip) //----------------------------------------------- // isUserColorSupported : -// Test wether user color is supported for a given visual slot +// Test whether user color is supported for a given visual slot //----------------------------------------------- bool isUserColorSupported(const CPlayerSheet &playerSheet, SLOTTYPE::EVisualSlot vs) { @@ -807,14 +807,14 @@ void getSeedsFromDB(CSeeds &dest) { CInterfaceManager *im =CInterfaceManager::getInstance(); nlctassert(sizeof(CSeeds::TUInt) == 4); // excpect that the number of each seed type is encoded on 32 bits - // if this assert at compile, change the following code + // if this assert at compile, change the following code string ls = im->getDefine("money_1"); string ms = im->getDefine("money_2"); string bs = im->getDefine("money_3"); string vbs = im->getDefine("money_4"); dest = CSeeds(im->getDbProp(ls)->getValue32(), - im->getDbProp(ms)->getValue32(), + im->getDbProp(ms)->getValue32(), im->getDbProp(bs)->getValue32(), im->getDbProp(vbs)->getValue32()); } // getSeedsFromDB // @@ -1434,7 +1434,6 @@ void makeInstanceTransparent(UInstance &inst, uint8 opacity, bool disableZWrite) } matInst.setAlphaTestThreshold(matShape.getAlphaTestThreshold()*((float)opacity)/255.0f); - } } @@ -1467,7 +1466,7 @@ void setVideoMode(const UDriver::CMode &mode) uint32 posX = 0; uint32 posY = 0; - + if (Driver->getCurrentScreenMode(screenMode)) { // position is not saved in config so center the window diff --git a/code/ryzom/client/src/misc.h b/code/ryzom/client/src/misc.h index 7a4dff95f..77e1df221 100644 --- a/code/ryzom/client/src/misc.h +++ b/code/ryzom/client/src/misc.h @@ -135,7 +135,7 @@ sint getColorIndex(const CGenderInfo &genderInfo, SLOTTYPE::EVisualSlot slot); SPropVisualA buildPropVisualA(const CGenderInfo &genderInfo); SPropVisualB buildPropVisualB(const CGenderInfo &genderInfo); -// Test wether user color is supported for a given visual slot +// Test whether user color is supported for a given visual slot bool isUserColorSupported(const CPlayerSheet &playerSheet, SLOTTYPE::EVisualSlot vs); SPropVisualA buildPropVisualA(const CPlayerSheet &playerSheet); SPropVisualB buildPropVisualB(const CPlayerSheet &playerSheet); diff --git a/code/ryzom/client/src/motion/user_controls.cpp b/code/ryzom/client/src/motion/user_controls.cpp index 0ab04ae10..8b20ae026 100644 --- a/code/ryzom/client/src/motion/user_controls.cpp +++ b/code/ryzom/client/src/motion/user_controls.cpp @@ -59,7 +59,7 @@ extern CEventsListener EventsListener; // Inputs Manager // User Controls (mouse, keyboard, interfaces, ...) CUserControls UserControls; -// Hierachical timer +// Hierarchical timer H_AUTO_DECL ( RZ_Client_User_Controls_Update ) diff --git a/code/ryzom/client/src/net_manager.cpp b/code/ryzom/client/src/net_manager.cpp index d5cc16a33..b20c3b3f7 100644 --- a/code/ryzom/client/src/net_manager.cpp +++ b/code/ryzom/client/src/net_manager.cpp @@ -120,7 +120,7 @@ bool serverReceivedReady = false; static const std::string PLAYER_EXCHANGE_INVITATION_DIALOG = "ui:interface:accept_trade_invitation"; -// Hierachical timer +// Hierarchical timer H_AUTO_DECL ( RZ_Client_Net_Mngr_Update ) //////////// diff --git a/code/ryzom/client/src/network_connection.h b/code/ryzom/client/src/network_connection.h index 8e7344ceb..755994275 100644 --- a/code/ryzom/client/src/network_connection.h +++ b/code/ryzom/client/src/network_connection.h @@ -68,7 +68,7 @@ namespace CLFECOMMON class CActionGenericMultiPart; } -// Hierachical timer +// Hierarchical timer H_AUTO_DECL ( RZ_Client_Network_Connection_Set_Reference_Position ) //#define MEASURE_FE_SENDING diff --git a/code/ryzom/client/src/outpost.cpp b/code/ryzom/client/src/outpost.cpp index ebbf33db9..5adadf67b 100644 --- a/code/ryzom/client/src/outpost.cpp +++ b/code/ryzom/client/src/outpost.cpp @@ -52,7 +52,7 @@ COutpost::COutpost(const COutpost &other) // *************************************************************************** bool COutpost::setupOutpost(const CContinentParameters::CZC &zone, sint32 outpostId, CVillage *village) { - // Yoyo. legacy code. should no more be needed now. Still let for check (usefull?) + // Yoyo. legacy code. should no more be needed now. Still let for check (useful?) NLMISC::CVector2f zonePos; if (!getPosFromZoneName(zone.Name, zonePos)) { diff --git a/code/ryzom/client/src/player_cl.cpp b/code/ryzom/client/src/player_cl.cpp index e757aaf6d..9dfe6e12f 100644 --- a/code/ryzom/client/src/player_cl.cpp +++ b/code/ryzom/client/src/player_cl.cpp @@ -689,7 +689,7 @@ void CPlayerCL::computeAnimSet() //----------------------------------------------- // updateVisualPropertyVpa : // Update the Visual Property A. -// \todo GUIGUI : utiliser l'enum gender. +// \todo GUIGUI : use gender enum //----------------------------------------------- void CPlayerCL::updateVisualPropertyVpa(const NLMISC::TGameCycle &/* gameCycle */, const sint64 &prop) { diff --git a/code/ryzom/client/src/player_r2_cl.cpp b/code/ryzom/client/src/player_r2_cl.cpp index 504aa6887..8c5619a34 100644 --- a/code/ryzom/client/src/player_r2_cl.cpp +++ b/code/ryzom/client/src/player_r2_cl.cpp @@ -425,7 +425,7 @@ void CPlayerR2CL::equip(SLOTTYPE::EVisualSlot slot, uint index, uint color) //----------------------------------------------- // updateVisualPropertyVpa : // Update the Visual Property A. -// \todo GUIGUI : utiliser l'enum gender. +// \todo GUIGUI : use gender enum. //----------------------------------------------- void CPlayerR2CL::updateVisualPropertyVpa(const NLMISC::TGameCycle &/* gameCycle */, const sint64 &prop) { diff --git a/code/ryzom/client/src/precipitation_clip_grid.cpp b/code/ryzom/client/src/precipitation_clip_grid.cpp index 6bf8cfda0..7eac4d895 100644 --- a/code/ryzom/client/src/precipitation_clip_grid.cpp +++ b/code/ryzom/client/src/precipitation_clip_grid.cpp @@ -492,7 +492,7 @@ void CPrecipitationClipGrid::updateGrid(const NLMISC::CVector &/* userPos */, NL { // the width to update uint width = std::min((uint) offsetX, _Size + 1); - // the the grid moved top or bottom, exclude this part + // the grid moved top or bottom, exclude this part sint height = _Size + 1 - abs(offsetY); if (height > 0) { @@ -504,7 +504,7 @@ void CPrecipitationClipGrid::updateGrid(const NLMISC::CVector &/* userPos */, NL { // the width to update uint width = std::min((uint) (- offsetX), _Size + 1); - // the the grid moved top or bottom, exclude + // the grid moved top or bottom, exclude sint height = _Size + 1 - abs(offsetY); if (height > 0) { diff --git a/code/ryzom/client/src/precipitation_clip_grid.h b/code/ryzom/client/src/precipitation_clip_grid.h index 7292f3ece..b51d06b51 100644 --- a/code/ryzom/client/src/precipitation_clip_grid.h +++ b/code/ryzom/client/src/precipitation_clip_grid.h @@ -139,7 +139,7 @@ void CArray2D::getUpdateRects(sint moveOffsetX, sint moveOffsetY, std::vector { // the width to update uint width = std::min((uint) moveOffsetX, _Width); - // the the grid moved top or bottom, exclude this part + // the grid moved top or bottom, exclude this part sint height = _Height - abs(moveOffsetY); if (height > 0) { @@ -155,7 +155,7 @@ void CArray2D::getUpdateRects(sint moveOffsetX, sint moveOffsetY, std::vector { // the width to update uint width = std::min((uint) (- moveOffsetX), _Width); - // the the grid moved top or bottom. + // the grid moved top or bottom. sint height = _Height - abs(moveOffsetY); if (height > 0) { diff --git a/code/ryzom/client/src/r2/displayer_visual_group.h b/code/ryzom/client/src/r2/displayer_visual_group.h index 1c8381421..48c104c04 100644 --- a/code/ryzom/client/src/r2/displayer_visual_group.h +++ b/code/ryzom/client/src/r2/displayer_visual_group.h @@ -101,7 +101,7 @@ public: */ void setContextualVisibilityActive(bool active); bool getContextualVisibilityActive() const { return _ContextualVisibilityActive; } - /** If contextual is enabled, tells wether this object is visible with current context + /** If contextual is enabled, tells whether this object is visible with current context * Actually when one entity uses that road / region */ bool isContextuallyVisible(); diff --git a/code/ryzom/client/src/r2/dmc/client_edition_module.cpp b/code/ryzom/client/src/r2/dmc/client_edition_module.cpp index b9f2aee4c..785a0994d 100644 --- a/code/ryzom/client/src/r2/dmc/client_edition_module.cpp +++ b/code/ryzom/client/src/r2/dmc/client_edition_module.cpp @@ -575,11 +575,11 @@ bool CClientEditionModule::onProcessModuleMessage(IModuleProxy *senderModuleProx CScenarioValidator::TValues values; std::string md5, signature; - if ( sv.setScenarioToLoad("data/r2_buffer.dat", values, md5, signature, true) + if ( sv.setScenarioToLoad("save/r2_buffer.dat", values, md5, signature, true) && !md5.empty() && CScenarioValidator::AutoSaveSignature == signature) { - data = _Client->getComLuaModule().loadLocal("data/r2_buffer.dat", values); + data = _Client->getComLuaModule().loadLocal("save/r2_buffer.dat", values); } else { @@ -1099,10 +1099,10 @@ void CClientEditionModule::startingScenario(class NLNET::IModuleProxy * /* serve std::string md5, signature; R2::getEditor().getLua().executeScriptNoThrow("r2.Translator.initStartingActIndex()"); - sv.setScenarioToLoad("data/r2_buffer.dat", values, md5, signature, true); + sv.setScenarioToLoad("save/r2_buffer.dat", values, md5, signature, true); _LastReadHeader = values; uint32 lastActIndex = _StartingActIndex; - CObject* hlScenario2 = _Client->getComLuaModule().loadLocal("data/r2_buffer.dat", _LastReadHeader); + CObject* hlScenario2 = _Client->getComLuaModule().loadLocal("save/r2_buffer.dat", _LastReadHeader); _StartingActIndex = lastActIndex; if (hlScenario2) { @@ -1206,7 +1206,7 @@ bool CClientEditionModule::requestStartScenario() CEditor::connexionMsg("uimR2EDGoToDMMode"); - R2::getEditor().getLua().executeScriptNoThrow("r2.Version.save(\"data/r2_buffer.dat\")"); + R2::getEditor().getLua().executeScriptNoThrow("r2.Version.save(\"save/r2_buffer.dat\")"); CShareServerEditionItfProxy proxy(_ServerEditionProxy); proxy.startingScenario(this); return true; @@ -2472,7 +2472,7 @@ void CClientEditionModule::loadScenarioSucceded(const std::string& filename, con } if (CFile::fileExists(filename)) { - CFile::copyFile("data/r2_buffer.dat", filename.c_str()); + CFile::copyFile("save/r2_buffer.dat", filename.c_str()); } } diff --git a/code/ryzom/client/src/r2/dmc/client_edition_module.h b/code/ryzom/client/src/r2/dmc/client_edition_module.h index 9ea4a2a6e..0e0f045f3 100644 --- a/code/ryzom/client/src/r2/dmc/client_edition_module.h +++ b/code/ryzom/client/src/r2/dmc/client_edition_module.h @@ -260,7 +260,7 @@ Update the dm commands that are enable on the current target. Tbe bitfield returned let us know if the selected target is a botobject, if it is grouped, if we can incarnate him and so. - dssTarget: without parameter ask the server to update the list of command that are enable on the selected target - onProcessModuleMessage with "NPC_APROP" message: return a bitfield that let know animation property of the selected entity -- CDynamicMapClient::onNpcAnimationTargeted: translate the bitfield given by the "NPC_APROP" message to known wich are the allowed action +- CDynamicMapClient::onNpcAnimationTargeted: translate the bitfield given by the "NPC_APROP" message to known which are the allowed action - r2:updateAnimBarActions: called by CDynamicMapClient::onNpcAnimationTargeted, update the anim bar that contains action that can be done on the selecte npc The DM can push button on the anim bar to do some DM functions like kill an npc, kill a group, despawn, heal, control, speak as @@ -571,7 +571,7 @@ public: //! For some messages, data are cut in small message then send to DSS via SBS. //! Fragmentation enable to implement a progression bar. //! Communication via SBS disable bandwith limitation caused by FS - //! Using sendMsgToDss is usefull only for big message like uploading Scenario or uploading runtime scenario + //! Using sendMsgToDss is useful only for big message like uploading Scenario or uploading runtime scenario //! { /*! Cut a messag in small chunk then send it to DSS via SBS. \param msg The message that will be cut in small chunk an send via sbs. @@ -635,7 +635,7 @@ public: //// Test Mode to edition mode ///////////////////////////////////////////////////// - //! Ask the the stop of the Animation / Test. Send a message to AIS to unload data. + //! Ask the stop of the Animation / Test. Send a message to AIS to unload data. void requestStopTest(); /*! Ask the connection to an edition session. @@ -743,7 +743,7 @@ public: Called withou param this function update the DM action bar. Called with as parameter DESPAWN_NPC, ADD_HP, KILL_NPC, ADD_HP, GRP_KILL, GRP_HEAL, CONTROL, STOP_CONTROL, TALK_AS, STOP_TALK it launch DM function \see CClientEditionModule for more info - \parm args a list of optional argument may be empty or one of "DESPAWN_NPC" "ADD_HP" "KILL_NPC" "ADD_HP" "GRP_KILL" "GRP_HEAL" "CONTROL" "STOP_CONTROL" "TALK_AS" "STOP_TALK". Multi param could be usefull for setting the aggro distance (NIY). + \parm args a list of optional argument may be empty or one of "DESPAWN_NPC" "ADD_HP" "KILL_NPC" "ADD_HP" "GRP_KILL" "GRP_HEAL" "CONTROL" "STOP_CONTROL" "TALK_AS" "STOP_TALK". Multi param could be useful for setting the aggro distance (NIY). */ void dssTarget( std::vector& args); @@ -896,7 +896,7 @@ public: This system enables to register class definition by registerGenerator. Then the call to newComponent generates a CObjectTable using the template that have been save by registerGenerator. The method getPropertyValue on a CObjectTable first look in the table of the object. Then in the palette. Then in its default value of the property then an thoses of his parents. - The function getPropertyList enables to know all properties of an object (usefull for debug) + The function getPropertyList enables to know all properties of an object (useful for debug) You can add an palette Element to the editor by addPaletteElement. A palette element is like a template that you clone and put in the scene. Palette element are mainly defined in r2_palette.lua (binding is done via CComLuaModule diff --git a/code/ryzom/client/src/r2/editor.cpp b/code/ryzom/client/src/r2/editor.cpp index b58e9262f..8d3a314e3 100644 --- a/code/ryzom/client/src/r2/editor.cpp +++ b/code/ryzom/client/src/r2/editor.cpp @@ -3052,7 +3052,7 @@ void CEditor::reset() TAccessMode oldAccessMode = _AccessMode; if (_Mode == EditionMode) { - R2::getEditor().getLua().executeScriptNoThrow("r2.Version.save(\"data/r2_buffer.dat\")"); + R2::getEditor().getLua().executeScriptNoThrow("r2.Version.save(\"save/r2_buffer.dat\")"); } release(); clearDebugWindow(); @@ -4726,12 +4726,12 @@ void CEditor::autoSave() } } - if (CFile::fileExists("data/r2_buffer.dat")) + if (CFile::fileExists("save/r2_buffer.dat")) { - CFile::copyFile("autosave_01.r2", "data/r2_buffer.dat"); + CFile::copyFile("autosave_01.r2", "save/r2_buffer.dat"); } - R2::getEditor().getLua().executeScriptNoThrow("r2.Version.save(\"data/r2_buffer.dat\")"); + R2::getEditor().getLua().executeScriptNoThrow("r2.Version.save(\"save/r2_buffer.dat\")"); } @@ -5257,11 +5257,11 @@ void CEditor::onEditionModeDisconnected() delete _NewScenario; _NewScenario = NULL; CHECK_EDITOR - // Usefull only for the pionner that does not do requestTranslateFeatures() + // Useful only for the pionner that does not do requestTranslateFeatures() // Because avec using the button the currentScenario = 0 try { - R2::getEditor().getLua().executeScript("r2.Version.save(\"data/r2_buffer.dat\")"); + R2::getEditor().getLua().executeScript("r2.Version.save(\"save/r2_buffer.dat\")"); } catch (const std::exception& e) { diff --git a/code/ryzom/client/src/r2/editor.h b/code/ryzom/client/src/r2/editor.h index 5aac2e786..d909a9980 100644 --- a/code/ryzom/client/src/r2/editor.h +++ b/code/ryzom/client/src/r2/editor.h @@ -722,7 +722,7 @@ private: bool _WaitScenarioScreenActive; // the 'wait scenario' screen is being displayed bool _EditionModeDisconnectedFlag; CObject *_NewScenario; // new scenario that will be updated just after the wait screen is over - uint32 _NewScenarioInitialAct;// the start at wich the user start an edition session (can be ~= from 1 after a test session) + uint32 _NewScenarioInitialAct;// the start at which the user start an edition session (can be ~= from 1 after a test session) bool _PostponeScenarioUpdated; // Contextual selection diff --git a/code/ryzom/client/src/r2/tool_choose_pos.cpp b/code/ryzom/client/src/r2/tool_choose_pos.cpp index 7637322ee..966b54d5a 100644 --- a/code/ryzom/client/src/r2/tool_choose_pos.cpp +++ b/code/ryzom/client/src/r2/tool_choose_pos.cpp @@ -308,7 +308,7 @@ void CToolChoosePos::updateBeforeRender() } // see if all pos are accessible and update the _Valid flag // NB NICO : THE FOLLOWING CODE IS WORKING BUT - // see with others if it's usefull to check this type of collisions + // see with others if it's useful to check this type of collisions // finally -> since check is never done, limited/no interest ... /* if (shown && entity->getPrimitive()) diff --git a/code/ryzom/client/src/r2/tool_draw_prim.cpp b/code/ryzom/client/src/r2/tool_draw_prim.cpp index 981d942af..be0fdacf7 100644 --- a/code/ryzom/client/src/r2/tool_draw_prim.cpp +++ b/code/ryzom/client/src/r2/tool_draw_prim.cpp @@ -298,7 +298,7 @@ void CToolDrawPrim::doUpdateBeforeRender() nlassert(0); break; } - // If there are at least 3 vertices and the primitive is a region, then see wether mouse + // If there are at least 3 vertices and the primitive is a region, then see whether mouse // is near the first vertex -> in this case, propose to the user to close the primitive // If landscape is intersected too, then the vertex must be nearer then the first vertex if (_PrimType == Region && _NumPoints >= 3) diff --git a/code/ryzom/client/src/sheet_manager.h b/code/ryzom/client/src/sheet_manager.h index c0ba386a2..1a3b64a23 100644 --- a/code/ryzom/client/src/sheet_manager.h +++ b/code/ryzom/client/src/sheet_manager.h @@ -192,7 +192,7 @@ public: sint nbHairColor() {return _NbHairColor;} - /// Get all sheets (usefull for other managers (skill, brick, ...)) + /// Get all sheets (useful for other managers (skill, brick, ...)) // @{ const TEntitySheetMap & getSheets() { return _EntitySheetContainer; } // @} diff --git a/code/ryzom/client/src/stage.cpp b/code/ryzom/client/src/stage.cpp index 01d2c4c1a..611fc7d12 100644 --- a/code/ryzom/client/src/stage.cpp +++ b/code/ryzom/client/src/stage.cpp @@ -184,7 +184,7 @@ CStage *CStageSet::addStage(NLMISC::TGameCycle gameCycle, uint property, sint64 // New Stage and before the first one. if(gameCycle < gcFirst) // Could be egal if we do not replace the property in the case the property already exist too. { - // Game Cycle to early -> put the property in the first one instead (but do not replace the the property in the first 1 if already exist). + // Game Cycle to early -> put the property in the first one instead (but do not replace the property in the first 1 if already exist). it = _StageSet.begin(); replace = false; } diff --git a/code/ryzom/client/src/streamable_entity.h b/code/ryzom/client/src/streamable_entity.h index b31e5c964..57f92759e 100644 --- a/code/ryzom/client/src/streamable_entity.h +++ b/code/ryzom/client/src/streamable_entity.h @@ -28,7 +28,7 @@ */ struct IStreamableEntity : public NLMISC::CRefCount { - /** Given a pos, test wether the entity needs to be loaded now. + /** Given a pos, test whether the entity needs to be loaded now. * It it returns false, it means that the entity is too far or that asynchronous loading suffice. * It it returns true, the next call to update will return only when the loading is completed. */ @@ -74,7 +74,7 @@ public: //\name From IStreamableEntity //@{ - /** Given a pos, test wether the entity needs to be loaded now. + /** Given a pos, test whether the entity needs to be loaded now. * It it returns false, it means that the entity is too far or that asynchronous loading suffice. * It it returns true, the next call to update will return only when the loading is completed. */ diff --git a/code/ryzom/client/src/streamable_entity_composite.h b/code/ryzom/client/src/streamable_entity_composite.h index 94f1d6696..dc2e2c3b9 100644 --- a/code/ryzom/client/src/streamable_entity_composite.h +++ b/code/ryzom/client/src/streamable_entity_composite.h @@ -43,7 +43,7 @@ public: IStreamableEntity *getEntity(uint index) const { return _Entities[index]; } //\name from IStreamableEntity //@{ - /** Given a pos, test wether one entity needs to be loaded now. + /** Given a pos, test whether one entity needs to be loaded now. * It it returns true, the next call to update will return only when the loading of an entity is completed. */ virtual bool needCompleteLoading(const NLMISC::CVector &pos) const; diff --git a/code/ryzom/client/src/time_client.cpp b/code/ryzom/client/src/time_client.cpp index 94bbca554..5c71203b7 100644 --- a/code/ryzom/client/src/time_client.cpp +++ b/code/ryzom/client/src/time_client.cpp @@ -68,7 +68,7 @@ NLMISC::TGameCycle LastGameCycle = 0; CRyzomTime RT; CClientDate SmoothedClientDate; -// Hierachical timer +// Hierarchical timer H_AUTO_DECL ( RZ_Client_Update_Time ) @@ -312,13 +312,13 @@ void updateClientTime() if (ClientCfg.ForceDeltaTime == 0) { T1 = ryzomGetLocalTime(); - if (T1 == T0) + if (T1 <= T0) { // This case is known to occurs if the framerate is very fast (e.g. during the // loading stage) or if the machine has got a heavy load (e.g. lots of AGP data) // delaying the timer updates. //nlwarning ("getLocalTime has returned the same time! START"); - while (T1 == T0) + while (T1 <= T0) { T1 = ryzomGetLocalTime(); // give up the time slice to let time to other process diff --git a/code/ryzom/client/src/user_entity.h b/code/ryzom/client/src/user_entity.h index d3f814fc8..0d39f2967 100644 --- a/code/ryzom/client/src/user_entity.h +++ b/code/ryzom/client/src/user_entity.h @@ -709,7 +709,7 @@ private: /// For executeCombatWithPhrase CLFECOMMON::TCLEntityId _LastExecuteCombatSlot; - /// R2: to know in wich mode is the current entity (affect camera view and run speed) + /// R2: to know in which mode is the current entity (affect camera view and run speed) R2::TCharMode _R2CharMode; /// snapshot of a CItemImage diff --git a/code/ryzom/client/src/village.h b/code/ryzom/client/src/village.h index f19ba53e0..20251ccfc 100644 --- a/code/ryzom/client/src/village.h +++ b/code/ryzom/client/src/village.h @@ -71,7 +71,7 @@ public: //\name From IStreamableEntity //@{ - /** Given a pos, test wether the village needs to be loaded now. + /** Given a pos, test whether the village needs to be loaded now. * It it returns false, it means that the village is too far or that asynchronous loading suffice. * It it returns true, the next call to update will return only when the loading is completed. */ diff --git a/code/ryzom/client/src/weather_manager_client.h b/code/ryzom/client/src/weather_manager_client.h index 7fc090139..dc6139aef 100644 --- a/code/ryzom/client/src/weather_manager_client.h +++ b/code/ryzom/client/src/weather_manager_client.h @@ -142,7 +142,7 @@ private: private: // Use the curr weather state to update the thunder. void updateThunder(uint64 day, float hour, const CWeatherContext &wc, bool manual = false, float manualWeatherValue = 0.f, EGSPD::CSeason::TSeason manualSeason = EGSPD::CSeason::Spring); - // The the thunder intensity at the given day and hour (value of the 'ThunderIntensity' field in the weather setups) + // The thunder intensity at the given day and hour (value of the 'ThunderIntensity' field in the weather setups) float getThunderIntensity(uint64 day, float hour, const CWeatherContext &wc); // Compute the minimum threshold that must be reached to create a thunder strike float getThunderThreshold(uint64 thunderCycle, const CWeatherContext &wc); diff --git a/code/ryzom/common/data_common/r2/r2_logic.lua b/code/ryzom/common/data_common/r2/r2_logic.lua index 5a83d5b43..904a3d98c 100644 --- a/code/ryzom/common/data_common/r2/r2_logic.lua +++ b/code/ryzom/common/data_common/r2/r2_logic.lua @@ -2107,7 +2107,11 @@ Logic.translateActivityStep = function(context, hlComponent, activitySequence, if Logic.isWanderActivity(activityStep.Activity) and activityStep.TimeLimit == "Few Sec" then local event = r2.Translator.createEvent("destination_reached_all", aiState.Name, groupsByName) table.insert(context.RtAct.Events, event) - local action = r2.Translator.createAction("wander_destination_reached", groupsByName, aiState.Name,activityStepIndex , tonumber(activityStep.TimeLimitValue)) + local number = tonumber(activityStep.TimeLimitValue) + if number == nil then + number = 0 + end + local action = r2.Translator.createAction("wander_destination_reached", groupsByName, aiState.Name, activityStepIndex, number) table.insert(context.RtAct.Actions, action) table.insert(event.ActionsId, action.Id) end @@ -2414,6 +2418,9 @@ Logic.getTimeLimit = function(step) if step.TimeLimit == "Few Sec" then local limit = tonumber(step.TimeLimitValue) + if limit == nil then + limit = 0 + end limit = 1 + limit * 10 param = tostring( limit ) return param diff --git a/code/ryzom/common/src/game_share/bot_chat_types.h b/code/ryzom/common/src/game_share/bot_chat_types.h index 0971ee512..779bc8ba3 100644 --- a/code/ryzom/common/src/game_share/bot_chat_types.h +++ b/code/ryzom/common/src/game_share/bot_chat_types.h @@ -64,7 +64,7 @@ namespace BOTCHATTYPE // Same than user and item can be retired UserRetirable, // this item was created and sold by the player who whatch the list. appears only in the "Resale list". - // but usefull to know that it belongs to the player and therefore PRICE_RETIRE and RESALE_TIME_LEFT are relevant + // but useful to know that it belongs to the player and therefore PRICE_RETIRE and RESALE_TIME_LEFT are relevant ResaleAndUser, // same then ResaleAndUser and item can be retired ResaleAndUserRetirable, diff --git a/code/ryzom/common/src/game_share/character_sync_itf.h b/code/ryzom/common/src/game_share/character_sync_itf.h index 771d66e59..728104322 100644 --- a/code/ryzom/common/src/game_share/character_sync_itf.h +++ b/code/ryzom/common/src/game_share/character_sync_itf.h @@ -477,11 +477,11 @@ namespace CHARSYNC class TCharInfo { protected: - // The entity id the the character + // The entity id of the character NLMISC::CEntityId _CharEId; // The name of the character std::string _CharName; - // The session id the the character home mainland + // The session id of the character home mainland uint32 _HomeSessionId; // The best combat level of the character sint32 _BestCombatLevel; @@ -498,7 +498,7 @@ namespace CHARSYNC // bool _Newcomer; public: - // The entity id the the character + // The entity id of the character const NLMISC::CEntityId &getCharEId() const { return _CharEId; @@ -538,7 +538,7 @@ namespace CHARSYNC } - // The session id the the character home mainland + // The session id of the character home mainland uint32 getHomeSessionId() const { return _HomeSessionId; @@ -693,12 +693,12 @@ namespace CHARSYNC class TCharBestLevelInfo { protected: - // The entity id the the character + // The entity id of the character NLMISC::CEntityId _CharEId; // The best combat level of the character sint32 _BestCombatLevel; public: - // The entity id the the character + // The entity id of the character const NLMISC::CEntityId &getCharEId() const { return _CharEId; diff --git a/code/ryzom/common/src/game_share/crypt.cpp b/code/ryzom/common/src/game_share/crypt.cpp index 7c9fa28fd..578acf64a 100644 --- a/code/ryzom/common/src/game_share/crypt.cpp +++ b/code/ryzom/common/src/game_share/crypt.cpp @@ -634,7 +634,7 @@ int rz_des_setkey(register const char *key) { /* * Encrypt (or decrypt if num_iter < 0) the 8 chars at "in" with abs(num_iter) - * iterations of DES, using the the given 24-bit salt and the pre-computed key + * iterations of DES, using the given 24-bit salt and the pre-computed key * schedule, and store the resulting 8 chars at "out" (in == out is permitted). * * NOTE: the performance of this routine is critically dependent on your diff --git a/code/ryzom/common/src/game_share/persistent_data.h b/code/ryzom/common/src/game_share/persistent_data.h index c8bab7cfa..d86643a8b 100644 --- a/code/ryzom/common/src/game_share/persistent_data.h +++ b/code/ryzom/common/src/game_share/persistent_data.h @@ -16,7 +16,7 @@ /** This file contains a system for loading and saving persistent data in a robust manor - The system is hierachical and all data elements are tagged. + The system is hierarchical and all data elements are tagged. The system supports saving to text files and to binary files @@ -501,7 +501,7 @@ private: // class CPersistentDataRecordRyzomStore //----------------------------------------------------------------------------- // This is just a specialisation of the class that register it into the "RyzomTokenFamily" -// Use it only to store (else unusefull copy of default string table at clear()) +// Use it only to store (else useless copy of default string table at clear()) class CPersistentDataRecordRyzomStore : public CPersistentDataRecord { diff --git a/code/ryzom/common/src/game_share/r2_basic_types.h b/code/ryzom/common/src/game_share/r2_basic_types.h index 1013f46b8..956a4f42d 100644 --- a/code/ryzom/common/src/game_share/r2_basic_types.h +++ b/code/ryzom/common/src/game_share/r2_basic_types.h @@ -39,13 +39,13 @@ private: uint32 _Id; }; -// Usefull because if not defined the compiler do not chose between +// Useful because if not defined the compiler do not chose between // lh.operator uint32() < rh or lh < CSessionId(rh) inline bool operator<(const CSessionId& lh, uint32 rh) { return lh.asInt() < rh; } inline bool operator==(const CSessionId& lh, uint32 rh) { return lh.asInt() == rh; } inline bool operator!=(const CSessionId& lh, uint32 rh) { return lh.asInt() != rh; } -// usefull for lh != 0 +// useful for lh != 0 inline bool operator!=(const CSessionId& lh, int rh) { return lh.asInt() != uint32(rh); } typedef CSessionId TSessionId; diff --git a/code/ryzom/common/src/game_share/r2_share_itf.cpp b/code/ryzom/common/src/game_share/r2_share_itf.cpp index 49e13bea2..37ee69333 100644 --- a/code/ryzom/common/src/game_share/r2_share_itf.cpp +++ b/code/ryzom/common/src/game_share/r2_share_itf.cpp @@ -992,7 +992,7 @@ namespace R2 _ModuleProxy->sendModuleMessage(sender, __message); } } - // Update the the ring access of a scenario. + // Update the ring access of a scenario. void CShareServerEditionItfProxy::onScenarioRingAccessUpdated(NLNET::IModule *sender, bool ok, const std::string &ringAccess, const std::string &errMsg) { if (_LocalModuleSkel && _LocalModule->isImmediateDispatchingSupported()) diff --git a/code/ryzom/common/src/game_share/r2_share_itf.h b/code/ryzom/common/src/game_share/r2_share_itf.h index f6be6cb0e..512294ffd 100644 --- a/code/ryzom/common/src/game_share/r2_share_itf.h +++ b/code/ryzom/common/src/game_share/r2_share_itf.h @@ -859,7 +859,7 @@ namespace R2 virtual void tpToEntryPoint(NLNET::IModuleProxy *sender, uint32 actIndex) =0; // Set the starting act of the scenario virtual void setStartingAct(NLNET::IModuleProxy *sender, uint32 actIndex) =0; - // Update the the ring access of a scenario. + // Update the ring access of a scenario. virtual void onScenarioRingAccessUpdated(NLNET::IModuleProxy *sender, bool ok, const std::string &ringAccess, const std::string &errMsg) =0; // a message to validate a file waiting to be saved virtual void saveScenarioFile(NLNET::IModuleProxy *sender, const std::string &md5, const R2::TScenarioHeaderSerializer &header) =0; @@ -959,7 +959,7 @@ namespace R2 void tpToEntryPoint(NLNET::IModule *sender, uint32 actIndex); // Set the starting act of the scenario void setStartingAct(NLNET::IModule *sender, uint32 actIndex); - // Update the the ring access of a scenario. + // Update the ring access of a scenario. void onScenarioRingAccessUpdated(NLNET::IModule *sender, bool ok, const std::string &ringAccess, const std::string &errMsg); // a message to validate a file waiting to be saved void saveScenarioFile(NLNET::IModule *sender, const std::string &md5, const R2::TScenarioHeaderSerializer &header); diff --git a/code/ryzom/common/src/game_share/ring_access.cpp b/code/ryzom/common/src/game_share/ring_access.cpp index eb6bf1d4c..9eda38010 100644 --- a/code/ryzom/common/src/game_share/ring_access.cpp +++ b/code/ryzom/common/src/game_share/ring_access.cpp @@ -117,7 +117,7 @@ void CRingAccess::init() _R2PlotItemSheetId.insert( CSheetId( NLMISC::toString("r2_plot_item_%d.sitem", i))); } - _SheetIdToAccess.clear();//only usefull when manualy re init file + _SheetIdToAccess.clear();//only useful when manualy re init file // File stream CIFile file; diff --git a/code/ryzom/common/src/game_share/rm_family.cpp b/code/ryzom/common/src/game_share/rm_family.cpp index ffae6cdc2..474dfaaec 100644 --- a/code/ryzom/common/src/game_share/rm_family.cpp +++ b/code/ryzom/common/src/game_share/rm_family.cpp @@ -290,7 +290,7 @@ namespace RM_FABER_STAT_TYPE return CI18N::get("mpstat" + NLMISC::toString((uint)stats)); } - // Array saying for wich item part built, what stat is usefull + // Array saying for which item part built, what stat is useful class CItemPartToStat { public: diff --git a/code/ryzom/common/src/game_share/scenario.cpp b/code/ryzom/common/src/game_share/scenario.cpp index 0a25acddd..819e102a3 100644 --- a/code/ryzom/common/src/game_share/scenario.cpp +++ b/code/ryzom/common/src/game_share/scenario.cpp @@ -1041,7 +1041,7 @@ bool CScenarioValidator::applySave(const std::string& signature) out2 += _ScenarioBody; out.serialBuffer((uint8*)out2.c_str(), (uint)out2.size()); - if (_Filename != std::string("data/r2_buffer.dat") ) + if (_Filename != std::string("save/r2_buffer.dat") ) { nlinfo("Scenario %s saved", _Filename.c_str()); } @@ -1308,7 +1308,7 @@ bool CUserComponentValidator::applySave(const std::string& signature) out.serialBuffer((uint8*)out2.c_str(),(uint)out2.size()); - if (_Filename != std::string("data/r2_buffer.dat") ) + if (_Filename != std::string("save/r2_buffer.dat") ) { nlinfo("UserComponent %s saved", _Filename.c_str()); } diff --git a/code/ryzom/common/src/game_share/server_animation_module.cpp b/code/ryzom/common/src/game_share/server_animation_module.cpp index 577cd3078..4d0dc1243 100644 --- a/code/ryzom/common/src/game_share/server_animation_module.cpp +++ b/code/ryzom/common/src/game_share/server_animation_module.cpp @@ -375,7 +375,7 @@ public: // weather value can come from the scenario description, or may have been changed by an animator uint8 CurrSeason; // current season or ~0 for no season set yet bool StartingAct; // 1 if a player/ia has schedule a startAct - uint32 InitialAct; //act at wich begin the scenario (1) for animation currentAct for test + uint32 InitialAct; //act at which begin the scenario (1) for animation currentAct for test uint32 ScenarioScore; NLMISC::TTime ScenarioTime; diff --git a/code/ryzom/common/src/game_share/server_edition_module.h b/code/ryzom/common/src/game_share/server_edition_module.h index e59956484..65b8a67c1 100644 --- a/code/ryzom/common/src/game_share/server_edition_module.h +++ b/code/ryzom/common/src/game_share/server_edition_module.h @@ -499,7 +499,7 @@ namespace R2 // implementation of kick ( send a warning message to client to disconnect himself otherwise he will be kicked 30 seconds later) bool kickPioneerImpl(TSessionId sessionId, TCharId charId, std::string& outMsg); bool unkickPioneerImpl(TSessionId sessionId, TCharId charId, std::string& outMsg); - // implementaion of teleport (teleport a character to another character if they are in the same session (current wether is correctly set) + // implementaion of teleport (teleport a character to another character if they are in the same session (current whether is correctly set) bool teleportOneCharacterToAnotherImpl(TSessionId sessionId, TCharId source, TCharId target, std::string& outMsg); // hibernate a session (save to files) bool hibernateSessionImpl(TSessionId sessionId, std::string& msg); diff --git a/code/ryzom/common/src/game_share/string_manager_sender.cpp b/code/ryzom/common/src/game_share/string_manager_sender.cpp index cfea77c61..641692605 100644 --- a/code/ryzom/common/src/game_share/string_manager_sender.cpp +++ b/code/ryzom/common/src/game_share/string_manager_sender.cpp @@ -165,7 +165,7 @@ namespace STRING_MANAGER /* - * Generic method used to send localised texts to clients ( wether they are ingame or in the character creation process ) + * Generic method used to send localised texts to clients ( whether they are ingame or in the character creation process ) * this method is inline and declared there so that it cannot be accessed from elsewhere. * Use sendStringToClient or sendStringToUser */ diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_function.h b/code/ryzom/common/src/game_share/time_weather_season/weather_function.h index d8f001f40..6dc4115c9 100644 --- a/code/ryzom/common/src/game_share/time_weather_season/weather_function.h +++ b/code/ryzom/common/src/game_share/time_weather_season/weather_function.h @@ -37,7 +37,7 @@ class CWeatherFunctionSheetBase; /** A weather function is a set of weather setup. Depending on the weather function, it blends between 2 setups to get the current state of the weather - * It should be initialized after all wether setup have been loaded, because it builds references on the weather setups. + * It should be initialized after all whether setup have been loaded, because it builds references on the weather setups. * \author Nicolas Vizerie * \author Nevrax France * \date 2002 diff --git a/code/ryzom/server/src/ai_service/ai.h b/code/ryzom/server/src/ai_service/ai.h index 3d907d82c..f06271c17 100644 --- a/code/ryzom/server/src/ai_service/ai.h +++ b/code/ryzom/server/src/ai_service/ai.h @@ -107,7 +107,7 @@ public: * Return ~0 if the instance number is already in use. */ uint32 createAIInstance(const std::string &continentName, uint32 instanceNumber); - /** destroy an AI Instance (usefull for ring creation / destruction of session) + /** destroy an AI Instance (useful for ring creation / destruction of session) @param instanceNumber is the AiInstance Id @param displayWarningIfInstanceNotExist If false nothing happends when the specified instance do not exist */ diff --git a/code/ryzom/server/src/ai_service/ai_player.h b/code/ryzom/server/src/ai_service/ai_player.h index 430396b16..d7ad18684 100644 --- a/code/ryzom/server/src/ai_service/ai_player.h +++ b/code/ryzom/server/src/ai_service/ai_player.h @@ -175,7 +175,7 @@ public: } private: - TPlayerMap _spawnedPlayers; // hum .. still usefull ? + TPlayerMap _spawnedPlayers; // hum .. still useful ? /// Team composition. typedef CHashMap > TTeamMap; TTeamMap _teams; diff --git a/code/ryzom/server/src/ai_service/continent_inline.h b/code/ryzom/server/src/ai_service/continent_inline.h index 13c31bca4..0dd3ca8f2 100644 --- a/code/ryzom/server/src/ai_service/continent_inline.h +++ b/code/ryzom/server/src/ai_service/continent_inline.h @@ -775,11 +775,13 @@ CGroupNpc* CGroupDesc::createNpcGroup(CMgrNpc* mgr, CAIVector const& po RYAI_MAP_CRUNCH::CWorldMap const& worldMap = CWorldContainer::getWorldMap(); RYAI_MAP_CRUNCH::CWorldPosition wp; uint32 maxTries = 100; - do { + do + { rpos = pos; rpos += randomPos(dispersionRadius); --maxTries; - } while (!worldMap.setWorldPosition(AITYPES::vp_auto, wp, rpos) && maxTries>0); + } + while (!worldMap.setWorldPosition(AITYPES::vp_auto, wp, rpos) && maxTries>0); if (maxTries<=0) rpos = pos; } @@ -804,11 +806,13 @@ CGroupNpc* CGroupDesc::createNpcGroup(CMgrNpc* mgr, CAIVector const& po RYAI_MAP_CRUNCH::CWorldMap const& worldMap = CWorldContainer::getWorldMap(); RYAI_MAP_CRUNCH::CWorldPosition wp; uint32 maxTries = 100; - do { + do + { rpos = pos; rpos += randomPos(dispersionRadius); --maxTries; - } while (!worldMap.setWorldPosition(AITYPES::vp_auto, wp, rpos) && maxTries>0); + } + while (!worldMap.setWorldPosition(AITYPES::vp_auto, wp, rpos) && maxTries>0); if (maxTries<=0) rpos = pos; } diff --git a/code/ryzom/server/src/ai_service/nf_grp.cpp b/code/ryzom/server/src/ai_service/nf_grp.cpp index ff779543e..74305e5ef 100644 --- a/code/ryzom/server/src/ai_service/nf_grp.cpp +++ b/code/ryzom/server/src/ai_service/nf_grp.cpp @@ -3042,7 +3042,7 @@ void setManagerAggroListTarget_ss_(CStateInstance* entity, CScriptStack& stack) @subsection getBotIndexByName_s_f -Get the index of a bot of a group by its name (or return -1). Mainly usefull for scripted boss. +Get the index of a bot of a group by its name (or return -1). Mainly useful for scripted boss. botIndex begins at zero for the first member of the group, -1 if the bot is not found. @@ -3228,7 +3228,7 @@ void isPlayerAlived_s_f(CStateInstance* entity, CScriptStack& stack) @subsection getServerTimeStr__s Gets the server time as string "eg 21:17:14 the x" -This function is usefull for stat purpose or debug (to know when a boss is down) +This function is useful for stat purpose or debug (to know when a boss is down) Arguments: > s(serverTime) @@ -4284,7 +4284,7 @@ void getBotEid_f_s(CStateInstance* entity, CScriptStack& stack) @subsection getBotIndex_s_f Get the bot Index by its entityId. Entity Id of a bot can be given via getCurrentSpeackerEid(). -It can be usefull to Known the index of the bot in the group with the EntityId. +It can be useful to Known the index of the bot in the group with the EntityId. Arguments: s(botEid) -> f(botIndex), diff --git a/code/ryzom/server/src/ai_service/script_compiler.cpp b/code/ryzom/server/src/ai_service/script_compiler.cpp index 226ea8d6c..824a0bc41 100644 --- a/code/ryzom/server/src/ai_service/script_compiler.cpp +++ b/code/ryzom/server/src/ai_service/script_compiler.cpp @@ -1026,7 +1026,7 @@ CSmartPtr CCompiler::buildCodeTree (const string &code) const CSmartPtr lastInsertedTracer; CSmartPtr firstInsertedTracer; - // For each token the the code. + // For each token of the code. while (index useful to update the player DB to indicateds the current speed of the incarnated creature + /// Ring stuff <=> useful to update the player DB to indicate the current speed of the incarnated creature void setNpcControl(const NLMISC::CEntityId& eid); void setStopNpcControl(); diff --git a/code/ryzom/server/src/entities_game_service/world_instances.cpp b/code/ryzom/server/src/entities_game_service/world_instances.cpp index 86daee733..e40d39f7b 100644 --- a/code/ryzom/server/src/entities_game_service/world_instances.cpp +++ b/code/ryzom/server/src/entities_game_service/world_instances.cpp @@ -217,7 +217,7 @@ void CWorldInstances::msgToAIInstance(uint32 instanceNumber, CMirrorTransportCla return; } - // send the message the the convenient AIS. + // send the message to the convenient AIS. msg.send(it->second.AISId); } @@ -239,7 +239,7 @@ void CWorldInstances::msgToAIInstance2(uint32 instanceNumber, NLNET::CMessage &m return; } - // send the message the the convenient AIS. + // send the message to the convenient AIS. // msg.send(it->second.AISId); NLNET::CUnifiedNetwork::getInstance()->send( it->second.AISId, msg ); } diff --git a/code/ryzom/server/src/frontend_service/distance_prioritizer.cpp b/code/ryzom/server/src/frontend_service/distance_prioritizer.cpp index 1efd64072..9f0e44a15 100644 --- a/code/ryzom/server/src/frontend_service/distance_prioritizer.cpp +++ b/code/ryzom/server/src/frontend_service/distance_prioritizer.cpp @@ -248,7 +248,7 @@ void CDistancePrioritizer::fillOutBox( CClientHost& client, TOutBox& outbox ) } } - // Get the entity corresponding to the the client/slot pair + // Get the entity corresponding to the client/slot pair TPairState& pairState = _VisionArray->getPairState( clientId, slot ); CEntity* sentity = NULL; diff --git a/code/ryzom/server/src/input_output_service/chat_manager.cpp b/code/ryzom/server/src/input_output_service/chat_manager.cpp index 51db34b4d..062635866 100644 --- a/code/ryzom/server/src/input_output_service/chat_manager.cpp +++ b/code/ryzom/server/src/input_output_service/chat_manager.cpp @@ -1276,7 +1276,7 @@ void CChatManager::sendEmoteTextToAudience( const TDataSetRow& sender,const std // ignore users in the excluded vector if ( std::find( excluded.begin(),excluded.end(), (*itA) ) == excluded.end() ) { - // the the phrase + // the phrase uint32 sentId = STRING_MANAGER::sendStringToClient( *itA,phraseId.c_str(),params,&IosLocalSender ); // send phrase id with an invalid sender, so that client dont display "toto says : toto bows" sendChat2Ex( CChatGroup::say, *itA, sentId, TDataSetRow::createFromRawIndex( INVALID_DATASET_ROW ) ); diff --git a/code/ryzom/server/src/logger_service/logger_service.cpp b/code/ryzom/server/src/logger_service/logger_service.cpp index ccdbf0442..5e09ccb83 100644 --- a/code/ryzom/server/src/logger_service/logger_service.cpp +++ b/code/ryzom/server/src/logger_service/logger_service.cpp @@ -507,7 +507,7 @@ public: // counter is used to track the state of the current result writing // between module update. - // the query thread has posted a result, send it the the BS + // the query thread has posted a result, send it to the BS const TThreadResult &threadResult = _QueryResult.peek(); uint32 nbLog = (uint32)threadResult.Lines->size(); diff --git a/code/ryzom/server/src/pd_lib/db_delta_file.cpp b/code/ryzom/server/src/pd_lib/db_delta_file.cpp index 53100174d..a413c228d 100644 --- a/code/ryzom/server/src/pd_lib/db_delta_file.cpp +++ b/code/ryzom/server/src/pd_lib/db_delta_file.cpp @@ -221,7 +221,7 @@ bool CDBDeltaFile::preload() // check file exists if (!CFile::fileExists(filepath)) { - nlwarning("CDBDeltaFile::read(): failed, file '%s' doesn't exists", filepath.c_str()); + nlwarning("CDBDeltaFile::read(): failed, file '%s' doesn't exist", filepath.c_str()); return false; } diff --git a/code/ryzom/server/src/server_share/entity_locator_itf.h b/code/ryzom/server/src/server_share/entity_locator_itf.h index 2a8ce5fe1..c5d230ab5 100644 --- a/code/ryzom/server/src/server_share/entity_locator_itf.h +++ b/code/ryzom/server/src/server_share/entity_locator_itf.h @@ -269,14 +269,14 @@ namespace ENTITYLOC class TCharConnectionEvent { protected: - // The character id the the character + // The character id of the character uint32 _CharId; // Type of the event : true for a connection, false otherwise bool _Connection; // The privilege of the character (e.g :GM:) std::string _Privilege; public: - // The character id the the character + // The character id of the character uint32 getCharId() const { return _CharId; diff --git a/code/ryzom/server/src/shard_unifier_service/ring_session_manager.cpp b/code/ryzom/server/src/shard_unifier_service/ring_session_manager.cpp index 1d1819d9d..8088e14ca 100644 --- a/code/ryzom/server/src/shard_unifier_service/ring_session_manager.cpp +++ b/code/ryzom/server/src/shard_unifier_service/ring_session_manager.cpp @@ -4117,7 +4117,7 @@ endOfWelcomeUserResult: // load the scenario data CScenarioPtr scenario = CScenario::load(_RingDb, sessionLog->getScenarioId(), __FILE__, __LINE__); - BOMB_IF(sessionLog == NULL, "Failed to load the the scenario "<getScenarioId(), invokeResult(from, charId>>4, 7, "No scenario info found for the session"); return); + BOMB_IF(sessionLog == NULL, "Failed to load the scenario "<getScenarioId(), invokeResult(from, charId>>4, 7, "No scenario info found for the session"); return); // lookup for an existing rating to update CPlayerRatingPtr playerRating; diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/filesystem_model.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/filesystem_model.cpp index 67033af2c..fc0bd4669 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/filesystem_model.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/filesystem_model.cpp @@ -65,7 +65,7 @@ namespace NLQT if(parent.isValid()) { return 0; - } + } else { return qMin(QFileSystemModel::rowCount(parent),1); diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp index ff48889fc..f5ce78726 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/formdelegate.cpp @@ -77,7 +77,7 @@ namespace NLQT editor->addItem(label); } return editor; - } + } else { switch (type->getType()) @@ -144,7 +144,7 @@ namespace NLQT QComboBox *cb = static_cast(editor); cb->setCurrentIndex(cb->findText(value)); //cb->setIconSize() - } + } else { switch (type->getType()) @@ -193,14 +193,14 @@ namespace NLQT if (value == oldValue) { // nothing's changed - } + } else { nldebug(QString("setModelData from %1 to %2") .arg(oldValue).arg(value).toStdString().c_str()); model->setData(index, value, Qt::EditRole); } - } + } else { switch (type->getType()) @@ -214,7 +214,7 @@ namespace NLQT if (QString("%1").arg(value) == oldValue) { // nothing's changed - } + } else { nldebug(QString("setModelData from %1 to %2") @@ -231,7 +231,7 @@ namespace NLQT if (QString("%1").arg(value) == oldValue) { // nothing's changed - } + } else { nldebug(QString("setModelData from %1 to %2") @@ -252,7 +252,7 @@ namespace NLQT if (value == oldValue) { // nothing's changed - } + } else { nldebug(QString("setModelData from %1 to %2") diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.cpp index d05ebd605..6d1c999f6 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_dirtree_dialog.cpp @@ -129,7 +129,7 @@ namespace NLQT _ui.dirTree->setModel(_dirModel); _dirModel->setRootPath(_ldPath); _ui.dirTree->setRootIndex(_dirModel->index(_ldPath)); - } + } else { _dirModel = new CFileSystemModel(""); diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp index b163799d2..fa94dc88e 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georges_treeview_dialog.cpp @@ -183,7 +183,7 @@ namespace NLQT //flushValueChange (); //UpdateAllViews (NULL); //return TRUE; - } + } else if (loadedForm.contains(".dfn")) { //nlassert (Dfn != NULL); @@ -198,7 +198,7 @@ namespace NLQT //modify (NULL, NULL, false); //UpdateAllViews (NULL); //return TRUE; - } + } else { nlassert (_form != NULL); @@ -239,7 +239,8 @@ namespace NLQT void CGeorgesTreeViewDialog::doubleClicked ( const QModelIndex & index ) { - if (index.column() == 1) { + if (index.column() == 1) + { //QTreeView::doubleClicked(index); return; } @@ -298,7 +299,7 @@ namespace NLQT // if (newState == Qt::Checked) // { // _ui.treeView->setRowHidden(in.row(),in.parent(),false); - // } + // } // else // { // _ui.treeView->setRowHidden(in.row(),in.parent(),true); @@ -314,7 +315,7 @@ namespace NLQT // if (newState == Qt::Checked) // { // _ui.treeView->setRowHidden(in2.row(),in,false); - // } + // } // else // { // _ui.treeView->setRowHidden(in2.row(),in,true); diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp index 79fe69319..e93bca792 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/georgesform_model.cpp @@ -133,7 +133,7 @@ namespace NLQT if (value.contains(".shape")) { return QIcon(":/images/pqrticles.png"); - } + } else if(value.contains(".tga") || value.contains(".png")) { qDebug() << p_index << p_role; @@ -444,8 +444,8 @@ namespace NLQT //columnData << QString(elmName.c_str()) << QString("default") << QString("default"); //parent->appendChild(new CFormItem(elmt, columnData, parent, UFormElm::ValueDefaultDfn, UFormElm::NodeDfn)); - } - } + } + } else { nlinfo("getNodeByName returned false"); diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp index b6aafe4d8..57c0c3fe2 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp @@ -142,7 +142,7 @@ namespace NLQT { _emptyView->deleteLater(); tabifyDockWidget(_emptyView, newView); - } + } else { tabifyDockWidget(_currentView,newView); @@ -216,7 +216,7 @@ namespace NLQT { loadFile(*it, skelFileName); ++it; - } + } _AnimationSetDialog->updateListObject(); _AnimationSetDialog->updateListAnim(); _SlotManagerDialog->updateUiSlots(); diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp index e45755ab1..36174b6d9 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/objectviewer_dialog.cpp @@ -138,10 +138,8 @@ namespace NLQT done = false; } } - - - - } while (!done); + } + while (!done); } void CObjectViewerDialog::updateRender() diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.cpp index 9d3772242..13a2f8a00 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.cpp @@ -142,7 +142,7 @@ namespace NLQT if (list.empty()) { Modules::config().getConfigFile().getVar("SearchPaths").forceAsString(""); - } + } else { Modules::config().getConfigFile().getVar("SearchPaths").forceAsString(""); diff --git a/code/ryzom/tools/translation_tools/extract_bot_names.cpp b/code/ryzom/tools/translation_tools/extract_bot_names.cpp index 5660b1a41..1b8e69d94 100644 --- a/code/ryzom/tools/translation_tools/extract_bot_names.cpp +++ b/code/ryzom/tools/translation_tools/extract_bot_names.cpp @@ -293,7 +293,7 @@ int extractBotNames(int argc, char *argv[]) CPrimitiveContext::instance().CurrentLigoConfig = &LigoConfig; //------------------------------------------------------------------- - // ok, ready the the real work, + // ok, ready for the real work, // first, read the primitives files and parse the primitives vector files; CPath::getFileList("primitive", files); @@ -615,8 +615,7 @@ int extractBotNames(int argc, char *argv[]) if (transName.find(ucstring("$")) != ucstring::npos) { transName = fctsTitleId; - } - + } } else {