From 04239591ec09370c049b764b8bfa3fa5e8993b12 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 14 Jun 2010 10:02:51 +0200 Subject: [PATCH] Changed: #878 Fix typos in comments/code --- code/nel/include/nel/3d/computed_string.h | 2 +- code/nel/include/nel/3d/mesh.h | 2 +- code/nel/include/nel/3d/nelu.h | 2 +- code/nel/include/nel/3d/patch.h | 2 +- code/nel/include/nel/3d/ps_located.h | 2 +- code/nel/include/nel/3d/ps_mesh.h | 2 +- code/nel/include/nel/3d/tessellation.h | 2 +- code/nel/include/nel/3d/tile_element.h | 2 +- code/nel/include/nel/3d/transform.h | 2 +- code/nel/include/nel/3d/u_skeleton.h | 2 +- code/nel/include/nel/misc/algo.h | 2 +- code/nel/include/nel/misc/bitmap.h | 2 +- code/nel/include/nel/misc/dummy_window.h | 4 +- code/nel/include/nel/misc/matrix.h | 2 +- .../3d/driver/direct3d/driver_direct3d.cpp | 17 ++----- .../src/3d/driver/direct3d/driver_direct3d.h | 2 +- code/nel/src/3d/landscape_model.cpp | 2 +- code/nel/src/3d/mrm_builder.cpp | 6 +-- code/nel/src/3d/shape_bank.cpp | 4 +- code/nel/src/3d/tessellation.cpp | 4 +- code/nel/src/3d/track_sampled_common.cpp | 2 +- code/nel/src/3d/water_shape.cpp | 6 +-- code/nel/src/3d/zone.cpp | 2 +- code/nel/src/misc/algo.cpp | 2 +- code/nel/src/misc/async_file_manager.cpp | 2 +- code/nel/src/misc/di_keyboard_device.h | 2 +- code/nel/src/misc/matrix.cpp | 6 +-- code/nel/src/pacs/edge_collide.cpp | 2 +- code/nel/src/pacs/global_retriever.cpp | 2 +- .../src/sound/driver/dsound/source_dsound.cpp | 2 +- .../sound/driver/openal/sound_driver_al.cpp | 2 +- code/nel/src/sound/music_sound.cpp | 2 +- .../tools/3d/object_viewer/object_viewer.cfg | 44 +++++++++---------- .../tools/3d/object_viewer/object_viewer.h | 2 +- .../tools/3d/object_viewer/object_viewer.rc | 4 +- code/ryzom/client/src/actions.h | 4 +- .../ryzom/client/src/bg_downloader_access.cpp | 2 +- code/ryzom/client/src/character_cl.cpp | 2 +- .../client/src/client_sheets/sbrick_sheet.cpp | 2 +- code/ryzom/client/src/ground_fx_manager.cpp | 4 +- code/ryzom/client/src/input.cpp | 2 +- .../src/interface_v3/action_handler_game.cpp | 2 +- .../src/interface_v3/action_handler_item.cpp | 2 +- .../client/src/interface_v3/chat_window.h | 4 +- .../client/src/interface_v3/dbctrl_sheet.cpp | 2 +- .../client/src/interface_v3/dbctrl_sheet.h | 6 +-- .../src/interface_v3/dbgroup_build_phrase.cpp | 4 +- .../src/interface_v3/dbgroup_build_phrase.h | 2 +- .../dbgroup_list_sheet_icon_phrase.h | 2 +- .../dbgroup_list_sheet_text_phrase.h | 2 +- .../client/src/interface_v3/group_html.cpp | 2 +- .../client/src/interface_v3/group_tree.h | 2 +- .../src/interface_v3/interface_manager.cpp | 4 +- .../src/interface_v3/interface_parser.cpp | 4 +- .../client/src/interface_v3/lua_helper.h | 2 +- .../ryzom/client/src/interface_v3/lua_ihm.cpp | 2 +- .../client/src/interface_v3/obs_huge_list.cpp | 2 +- .../client/src/interface_v3/people_list.h | 2 +- .../src/interface_v3/req_skill_formula.h | 4 +- .../client/src/interface_v3/view_text_id.h | 2 +- code/ryzom/client/src/login.cpp | 6 +-- code/ryzom/client/src/login_patch.cpp | 8 ++-- code/ryzom/client/src/login_patch.h | 4 +- code/ryzom/client/src/misc.cpp | 6 +-- .../client/src/r2/dmc/client_edition_module.h | 8 ++-- .../client/src/r2/tool_maintained_action.cpp | 2 +- .../_backup_service_interface_singleton.cpp | 4 +- code/ryzom/common/src/game_share/dyn_chat.h | 2 +- .../common/src/game_share/msg_ais_egs_gen.h | 4 +- .../ryzom/common/src/game_share/ring_access.h | 2 +- .../src/game_share/server_edition_module.cpp | 16 +++---- .../src/game_share/server_edition_module.h | 4 +- .../src/admin_modules/aes_client_module.cpp | 2 +- .../server/src/ai_service/nf_grp_npc.cpp | 4 +- .../server/src/ai_share/primitive_parser.cpp | 2 +- .../creature_manager/creature.cpp | 2 +- .../egs_sheets/egs_static_brick.cpp | 2 +- .../egs_sheets/egs_static_brick.h | 2 +- .../egs_sheets/egs_static_game_item.h | 2 +- .../egs_sheets/egs_static_game_sheet.h | 4 +- .../egs_sheets/egs_static_rolemaster_phrase.h | 2 +- .../egs_sheets/egs_static_success_table.cpp | 2 +- .../egs_sheets/egs_static_success_table.h | 2 +- .../entity_manager/entity_manager.cpp | 2 +- .../phrase_manager/combat_phrase.cpp | 2 +- .../player_manager/cdb.h | 2 +- .../player_manager/character.h | 2 +- .../src/input_output_service/commands.cpp | 4 +- .../server/src/logger_service/log_query.cpp | 2 +- .../shard_unifier_service/name_manager.cpp | 2 +- .../mission_compiler_lib/mission_compiler.h | 4 +- .../mission_compiler_lib/step_content.cpp | 2 +- .../mission_compiler_lib/steps.cpp | 2 +- .../mission_compiler_lib/variables.cpp | 2 +- code/ryzom/tools/translation_tools/main.cpp | 2 +- 95 files changed, 163 insertions(+), 172 deletions(-) diff --git a/code/nel/include/nel/3d/computed_string.h b/code/nel/include/nel/3d/computed_string.h index 0ce2092f9..0ec85431f 100644 --- a/code/nel/include/nel/3d/computed_string.h +++ b/code/nel/include/nel/3d/computed_string.h @@ -188,7 +188,7 @@ public: */ float StringLine; - /// Optionnal: each render*() method can draw a subset of letters. Default is 0/FFFFFFFF + /// Optional: each render*() method can draw a subset of letters. Default is 0/FFFFFFFF uint32 SelectStart; uint32 SelectSize; diff --git a/code/nel/include/nel/3d/mesh.h b/code/nel/include/nel/3d/mesh.h index d5a462918..8b91ed1c4 100644 --- a/code/nel/include/nel/3d/mesh.h +++ b/code/nel/include/nel/3d/mesh.h @@ -572,7 +572,7 @@ private: /** Just for build process. * NB: we must store palette info by corner (not by vertex) because Matrix Block grouping may insert vertex * discontinuities. eg: a vertex use Matrix18. After Matrix grouping (16matrix max), Matrix18 could be Matrix2 for a group - * of face, but Matrix13 for an other!! + * of face, but Matrix13 for another!! */ struct CCornerTmp : public CMesh::CCorner { diff --git a/code/nel/include/nel/3d/nelu.h b/code/nel/include/nel/3d/nelu.h index 185cc6cc5..65f5529a7 100644 --- a/code/nel/include/nel/3d/nelu.h +++ b/code/nel/include/nel/3d/nelu.h @@ -72,7 +72,7 @@ public: * - create a default camera, linked to the scene, and with default frustum as specified above. * * After creation, use the CNELU::Camera to manipulates the camera of scene (but you may change all you want - * to this camera or create/use an other camera if you want...) + * to this camera or create/use another camera if you want...) * \param viewport the viewport, fullscreen by default. */ static void initScene(CViewport viewport=CViewport()); diff --git a/code/nel/include/nel/3d/patch.h b/code/nel/include/nel/3d/patch.h index 030a94c55..3aebd8fc5 100644 --- a/code/nel/include/nel/3d/patch.h +++ b/code/nel/include/nel/3d/patch.h @@ -509,7 +509,7 @@ public: */ void setupColorsFromTileFlags(const NLMISC::CRGBA colors[4]); - /** Set this patch flags from an other one. + /** Set this patch flags from another one. * The patchs must match */ void copyTileFlagsFromPatch(const CPatch *src); diff --git a/code/nel/include/nel/3d/ps_located.h b/code/nel/include/nel/3d/ps_located.h index 990e608b1..1d4d21407 100644 --- a/code/nel/include/nel/3d/ps_located.h +++ b/code/nel/include/nel/3d/ps_located.h @@ -117,7 +117,7 @@ public: /** Detach a bindable object from this located. Ownership is transferred to the caller * Any reference the object may have in the system is lost (targets..) - * After that is may be inserted an other system. + * After that is may be inserted another system. */ CPSLocatedBindable *unbind(uint index); diff --git a/code/nel/include/nel/3d/ps_mesh.h b/code/nel/include/nel/3d/ps_mesh.h index c4e54929e..3cd29155f 100644 --- a/code/nel/include/nel/3d/ps_mesh.h +++ b/code/nel/include/nel/3d/ps_mesh.h @@ -398,7 +398,7 @@ protected: void releaseShapes(); - /** Compute (optionnal) mesh colors. + /** Compute (optional) mesh colors. * \param startIndex Index of the mesh being processed * \param toProcess Number of meshs to process */ diff --git a/code/nel/include/nel/3d/tessellation.h b/code/nel/include/nel/3d/tessellation.h index 2e4aa25e6..1b11210f0 100644 --- a/code/nel/include/nel/3d/tessellation.h +++ b/code/nel/include/nel/3d/tessellation.h @@ -369,7 +369,7 @@ private: void allocTileUv(TTileUvId id); // delete a CTessNearVertex "id", removing it from Patch RenderList, for each not NULL TileFace of "this" face. void deleteTileUv(TTileUvId id); - // Just ptr-copy a CTessNearVertex "id" from an other face/vertex id. Do this for each not NULL TileFace. + // Just ptr-copy a CTessNearVertex "id" from another face/vertex id. Do this for each not NULL TileFace. void copyTileUv(TTileUvId id, CTessFace *srcFace, TTileUvId srcId); // The Base NearVertex must be allocated before. diff --git a/code/nel/include/nel/3d/tile_element.h b/code/nel/include/nel/3d/tile_element.h index e0b9ede9c..6a4b5ccc9 100644 --- a/code/nel/include/nel/3d/tile_element.h +++ b/code/nel/include/nel/3d/tile_element.h @@ -59,7 +59,7 @@ private: public: - /// Copy this tile flags from an other tile + /// Copy this tile flags from another tile void copyFlagsFromOther(const CTileElement &other) { Flags = other.Flags; } /** The three tile ident. NL_TILE_ELM_LAYER_EMPTY means no Tile for this pass. Tile[0] should be !=NL_TILE_ELM_LAYER_EMPTY. diff --git a/code/nel/include/nel/3d/transform.h b/code/nel/include/nel/3d/transform.h index fd551f93d..5aaa25ee0 100644 --- a/code/nel/include/nel/3d/transform.h +++ b/code/nel/include/nel/3d/transform.h @@ -663,7 +663,7 @@ protected: */ virtual sint renderSkinGroupGeom(float /* alphaMRM */, uint /* remainingVertices */, uint8 * /* dest */) {return 0;} /** if supportSkinGrouping(), called to render the primitives of the already skinned vertices (VB activated in the driver) - * Optionnaly, fill specRdrPasses with specular rdrPass to sort (used for specular grouping). + * Optionally, fill specRdrPasses with specular rdrPass to sort (used for specular grouping). * \param baseVertex value to add to each PBlock index. */ virtual void renderSkinGroupPrimitives(uint /* baseVertex */, std::vector &/* specularRdrPasses */, uint /* skinIndex */) { } diff --git a/code/nel/include/nel/3d/u_skeleton.h b/code/nel/include/nel/3d/u_skeleton.h index 56cdb5503..7c212b7c4 100644 --- a/code/nel/include/nel/3d/u_skeleton.h +++ b/code/nel/include/nel/3d/u_skeleton.h @@ -107,7 +107,7 @@ public: * setting <0 means -1 and so means DistMax = infinite (default in meshs but multilod meshes). * NB: This apply to the shape direclty!! ie All instances using same shape will be affected * - * Note: If the skeleton himself is sticked to an other skeleton, this setup is not taken into account. + * Note: If the skeleton himself is sticked to another skeleton, this setup is not taken into account. * ie the skeleton clip follow the ancestor skeleton clip result (ie the first skeleton in hierarchy * which is not sticked). * diff --git a/code/nel/include/nel/misc/algo.h b/code/nel/include/nel/misc/algo.h index a718e3e53..b604e9d26 100644 --- a/code/nel/include/nel/misc/algo.h +++ b/code/nel/include/nel/misc/algo.h @@ -191,7 +191,7 @@ void splitString(const std::string &str, const std::string &separator, std::vec void splitUCString(const ucstring &ucstr, const ucstring &separator, std::vector &retList); // *************************************************************************** -/// In a string or ucstring, find a substr and replace it with an other. return true if replaced +/// In a string or ucstring, find a substr and replace it with another. return true if replaced template bool strFindReplace(T &str, const T &strFind, const U &strReplace) { diff --git a/code/nel/include/nel/misc/bitmap.h b/code/nel/include/nel/misc/bitmap.h index 945343c13..99fa5527f 100644 --- a/code/nel/include/nel/misc/bitmap.h +++ b/code/nel/include/nel/misc/bitmap.h @@ -572,7 +572,7 @@ public: * \param tiled If false coordinate are clamped, else the bitmap is considered to tile */ CRGBAF getColor (float x, float y) const; - // Get Color with optionnal tiling on axis + // Get Color with optional tiling on axis CRGBAF getColor (float x, float y, bool tileU, bool tileV) const; diff --git a/code/nel/include/nel/misc/dummy_window.h b/code/nel/include/nel/misc/dummy_window.h index c474d0d89..f424618d4 100644 --- a/code/nel/include/nel/misc/dummy_window.h +++ b/code/nel/include/nel/misc/dummy_window.h @@ -28,7 +28,7 @@ namespace NLMISC { -/** A simple invisible win32 window, with an optionnal message handling function. +/** A simple invisible win32 window, with an optional message handling function. * Possible uses include : * - Creating an icon in the tray (require a window to be passed) * - Creating a message queue (in order to use an IPC mechanism such as WM_COPYDATA) @@ -42,7 +42,7 @@ class CDummyWindow { public: CDummyWindow(); - /** Init a dummy window, with an optionnal message handling procedure + /** Init a dummy window, with an optional message handling procedure * \return true on success */ bool init(HINSTANCE hInstance, WNDPROC winProc = NULL); diff --git a/code/nel/include/nel/misc/matrix.h b/code/nel/include/nel/misc/matrix.h index ff9f6ea5a..2ed9bac1a 100644 --- a/code/nel/include/nel/misc/matrix.h +++ b/code/nel/include/nel/misc/matrix.h @@ -120,7 +120,7 @@ public: * \param quat a UNIT quaternion */ void setRot(const CQuat &quat); - /** Explicit setup the Rotation/Scale matrix (base) with the rotation part of an other matrix. + /** Explicit setup the Rotation/Scale matrix (base) with the rotation part of another matrix. * \param matrix the matrix to copy rot part. */ void setRot(const CMatrix &matrix); diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp index cbafa50a1..3986e8e26 100644 --- a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp +++ b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp @@ -1779,35 +1779,30 @@ IDriver::TMessageBoxId CDriverD3D::systemMessageBox (const char* message, const } // *************************************************************************** - bool CDriverD3D::activate() { return true; } // *************************************************************************** - bool CDriverD3D::isActive () { return (IsWindow(_HWnd) != 0); } // *************************************************************************** - nlWindow CDriverD3D::getDisplay() { return _HWnd; } // *************************************************************************** - NLMISC::IEventEmitter *CDriverD3D::getEventEmitter() { return &_EventEmitter; } // *************************************************************************** - void CDriverD3D::getWindowSize (uint32 &width, uint32 &height) { H_AUTO_D3D(CDriverD3D_getWindowSize); @@ -1825,7 +1820,6 @@ void CDriverD3D::getWindowPos (sint32 &x, sint32 &y) } // *************************************************************************** - uint32 CDriverD3D::getImplementationVersion () const { H_AUTO_D3D(CDriverD3D_getImplementationVersion); @@ -1833,21 +1827,18 @@ uint32 CDriverD3D::getImplementationVersion () const } // *************************************************************************** - const char *CDriverD3D::getDriverInformation () { return "Directx 9 NeL Driver"; } // *************************************************************************** - uint8 CDriverD3D::getBitPerPixel () { return _CurrentMode.Depth; } // *************************************************************************** - bool CDriverD3D::clear2D(CRGBA rgba) { H_AUTO_D3D(CDriverD3D_clear2D); @@ -2712,7 +2703,7 @@ const char *CDriverD3D::getVideocardInformation () return name; } else - return "Can't get video card informations"; + return "Can't get video card information"; } // *************************************************************************** @@ -3077,14 +3068,14 @@ bool CDriverD3D::setMonitorColorProperties (const CMonitorColorProperties &prope } // *************************************************************************** -//**************************************************************************** +// **************************************************************************** bool CDriverD3D::supportEMBM() const { H_AUTO_D3D(CDriverD3D_supportEMBM); return _EMBMSupported; } -//**************************************************************************** +// **************************************************************************** bool CDriverD3D::isEMBMSupportedAtStage(uint stage) const { H_AUTO_D3D(CDriverD3D_isEMBMSupportedAtStage); @@ -3092,7 +3083,7 @@ bool CDriverD3D::isEMBMSupportedAtStage(uint stage) const return stage < _NbNeLTextureStages - 1; } -//**************************************************************************** +// **************************************************************************** void CDriverD3D::setEMBMMatrix(const uint stage, const float mat[4]) { H_AUTO_D3D(CDriverD3D_setEMBMMatrix); diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.h b/code/nel/src/3d/driver/direct3d/driver_direct3d.h index d9baa1b34..52dca1dc5 100644 --- a/code/nel/src/3d/driver/direct3d/driver_direct3d.h +++ b/code/nel/src/3d/driver/direct3d/driver_direct3d.h @@ -774,7 +774,7 @@ public: virtual void forceTextureResize(uint divisor); virtual void forceNativeFragmentPrograms(bool /* nativeOnly */) {} // ignored - // Driver informations + // Driver information virtual uint getNumAdapter() const; virtual bool getAdapter(uint adapter, CAdapter &desc) const; virtual bool setAdapter(uint adapter); diff --git a/code/nel/src/3d/landscape_model.cpp b/code/nel/src/3d/landscape_model.cpp index 8f90ea99e..4070f1f8a 100644 --- a/code/nel/src/3d/landscape_model.cpp +++ b/code/nel/src/3d/landscape_model.cpp @@ -161,7 +161,7 @@ void CLandscapeModel::clipAndRenderLandscape() CRenderTrav &renderTrav= getOwnerScene()->getRenderTrav(); // Yes, this is ugly, but the clip pass is finished in render(), for clipping TessBlocks. - // This saves an other Landscape patch traversal, so this is faster... + // This saves another Landscape patch traversal, so this is faster... // Order them in order which clip faster (first horizontal, then vertical). // NB: TessBlock are ALWAYS clipped with the frustum pyramid, not the clustered one (faster clip for most common cases). CurrentPyramid[0]= clipTrav.WorldFrustumPyramid[NL3D_CLIP_PLANE_LEFT]; diff --git a/code/nel/src/3d/mrm_builder.cpp b/code/nel/src/3d/mrm_builder.cpp index 5820a575a..640aee743 100644 --- a/code/nel/src/3d/mrm_builder.cpp +++ b/code/nel/src/3d/mrm_builder.cpp @@ -297,7 +297,7 @@ float CMRMBuilder::computeEdgeCost(const CMRMEdge &edge) { /* The edge is between 2 interfaces but not the same. If we collide it we'll have holes! This problem arise if space beetween interfaces is small. eg: if we setup an interface beetween - hair and head, and an other one beetween head and torso, then we'll have this problem in the + hair and head, and another one beetween head and torso, then we'll have this problem in the back of the neck. The solution is to make a big big cost to hope we'll never collide them (else Holes...)!! Don't use FLT_MAX to still have a correct order if we don't have choice... @@ -1030,7 +1030,7 @@ void CMRMBuilder::saveCoarserMesh(CMRMMesh &coarserMesh) index++; } else - vert.CoarserIndex=-1; // indicate that this vertex no more exist and is to be geomorphed to an other. + vert.CoarserIndex=-1; // indicate that this vertex no more exist and is to be geomorphed to another. } @@ -1059,7 +1059,7 @@ void CMRMBuilder::saveCoarserMesh(CMRMMesh &coarserMesh) index++; } else - wedge.CoarserIndex=-1; // indicate that this wedge no more exist and is to be geomorphed to an other. + wedge.CoarserIndex=-1; // indicate that this wedge no more exist and is to be geomorphed to another. } } diff --git a/code/nel/src/3d/shape_bank.cpp b/code/nel/src/3d/shape_bank.cpp index 387d89a02..b5735a071 100644 --- a/code/nel/src/3d/shape_bank.cpp +++ b/code/nel/src/3d/shape_bank.cpp @@ -559,7 +559,7 @@ void CShapeBank::cancelLoadAsync (const std::string &shapeNameNotLwr) - mesh load async is ended, and the texture is not found in the driver => texture generate()-d too - mesh state is AsyncLoad_Texture, and begin (but doesn't end) to upload the texture - - an other mesh is created syncrhonously using also this texture (thus + - another mesh is created syncrhonously using also this texture (thus found in driver, and so just referencing it, no generate) - the async mesh is then canceled, while the texture has not end to load! - the texture is still in memory (the sync mesh still point to it), but with @@ -742,7 +742,7 @@ void CShapeBank::linkShapeToShapeCache(const string &shapeNameNotLwr, const stri // abort, since same cache name / cache ptr return; - // If The shape is In the cache of an other Shape Cache, abort. + // If The shape is In the cache of another Shape Cache, abort. if( shapeInfo.isAdded ) // Abort, because impossible. return; diff --git a/code/nel/src/3d/tessellation.cpp b/code/nel/src/3d/tessellation.cpp index 2b9dd2570..b21e14d81 100644 --- a/code/nel/src/3d/tessellation.cpp +++ b/code/nel/src/3d/tessellation.cpp @@ -2470,7 +2470,7 @@ void CTessFace::averageTesselationVertices() { // NB: here, just need to compute average of myself with FLeft, because my neighbor FBase // is on same patch (see splitRectangular()), and is average with its FLeft neighbor is done - // on an other branch of the recurs call. + // on another branch of the recurs call. neighbor= FLeft; } @@ -2514,7 +2514,7 @@ void CTessFace::refreshTesselationGeometry() /* NB: rectangular case: just need to take SonLeft->VBase, because my neighbor on FBase will compute his son - on an other branch of the recurs call. + on another branch of the recurs call. */ // re-compute this position (maybe with new noise geometry in Tile Edition). SonLeft->VBase->EndPos= Patch->computeVertex(SonLeft->PVBase.getS(), SonLeft->PVBase.getT()); diff --git a/code/nel/src/3d/track_sampled_common.cpp b/code/nel/src/3d/track_sampled_common.cpp index 3da3f9921..9384beacb 100644 --- a/code/nel/src/3d/track_sampled_common.cpp +++ b/code/nel/src/3d/track_sampled_common.cpp @@ -180,7 +180,7 @@ void CTrackSampledCommon::buildCommon(const std::vector &timeList, float //=================== _BeginTime= beginTime; _EndTime= endTime; - // compute deltatime for a frame to an other + // compute deltatime for a frame to another uint totalFrameCount= timeList[numKeys-1] - timeList[0]; nlassert(totalFrameCount>0); _DeltaTime= (_EndTime-_BeginTime) / totalFrameCount; diff --git a/code/nel/src/3d/water_shape.cpp b/code/nel/src/3d/water_shape.cpp index 6c2b90204..cbce23dd9 100644 --- a/code/nel/src/3d/water_shape.cpp +++ b/code/nel/src/3d/water_shape.cpp @@ -149,20 +149,20 @@ static const char *WaterVpBump1LayersCode = ADD R0, R2, -R1; #compute reflection vector \n\ MAD o[TEX1], R0, c[8], c[8]; \n\ "; -/** Optionnal diffuse texture in stage 3 +/** Optional diffuse texture in stage 3 */ static const char *WaterVpDiffuseMapStage3Code = "DP4 o[TEX3].x, R4, c[13]; #compute uv for diffuse texture \n\ DP4 o[TEX3].y, R4, c[14]; \n\ "; -/** Optionnal diffuse texture in stage 2 +/** Optional diffuse texture in stage 2 */ static const char *WaterVpDiffuseMapStage2Code = "DP4 o[TEX2].x, R4, c[13]; #compute uv for diffuse texture \n\ DP4 o[TEX2].y, R4, c[14]; \n\ "; -/** Optionnal diffuse texture in stage 1 +/** Optional diffuse texture in stage 1 */ static const char *WaterVpDiffuseMapStage1Code = "DP4 o[TEX1].x, R4, c[13]; #compute uv for diffuse texture \n\ diff --git a/code/nel/src/3d/zone.cpp b/code/nel/src/3d/zone.cpp index ef43668b8..38d6584c8 100644 --- a/code/nel/src/3d/zone.cpp +++ b/code/nel/src/3d/zone.cpp @@ -538,7 +538,7 @@ void CZone::compile(CLandscape *landscape, TZoneMap &loadedZones) nlassert(zone!=this); // insert the zone in the neigborood (if not done...). neighborZones[zoneto]= zone; - // Doesn't matter if BaseVertices is already linked to an other zone... + // Doesn't matter if BaseVertices is already linked to another zone... // This should be the same pointer in this case... BaseVertices[cur]= zone->getBaseVertex(vertto); } diff --git a/code/nel/src/misc/algo.cpp b/code/nel/src/misc/algo.cpp index 692d70e90..e7ccefa86 100644 --- a/code/nel/src/misc/algo.cpp +++ b/code/nel/src/misc/algo.cpp @@ -80,7 +80,7 @@ bool testWildCard(const char *strIn, const char *wildCard) if( testWildCard(strIn+pos+token.size(), wildCard) ) // if succeed, end return true; - // fails=> test with an other occurence of token in the string. + // fails=> test with another occurence of token in the string. pos= sCopy.find(token, pos+1); } diff --git a/code/nel/src/misc/async_file_manager.cpp b/code/nel/src/misc/async_file_manager.cpp index 6243e6ea4..194018d6a 100644 --- a/code/nel/src/misc/async_file_manager.cpp +++ b/code/nel/src/misc/async_file_manager.cpp @@ -88,7 +88,7 @@ bool CAsyncFileManager::cancelLoadTask(const CAsyncFileManager::ICancelCallback // If not found, the current running task may be the one we want to cancel. Must wait it. // Beware that this code works because of the CUnfairSynchronized access we made above (ensure that the - // taskmanager will end just the current task async (if any) and won't start an other one. + // taskmanager will end just the current task async (if any) and won't start another one. waitCurrentTaskToComplete (); return false; diff --git a/code/nel/src/misc/di_keyboard_device.h b/code/nel/src/misc/di_keyboard_device.h index 88c3d3e3e..26e552087 100644 --- a/code/nel/src/misc/di_keyboard_device.h +++ b/code/nel/src/misc/di_keyboard_device.h @@ -59,7 +59,7 @@ public: ///\name Object //@{ /** Create a keyboard device, that must then be deleted by the caller - * An optionnal WinEventEmiter can be provided, so that its flags can be in sync + * An optional WinEventEmiter can be provided, so that its flags can be in sync * with a win32 keyboard flags (shift, ctrl, and alt) */ static CDIKeyboard *createKeyboardDevice(IDirectInput8 *di8, diff --git a/code/nel/src/misc/matrix.cpp b/code/nel/src/misc/matrix.cpp index 608a75ed0..b0e90186f 100644 --- a/code/nel/src/misc/matrix.cpp +++ b/code/nel/src/misc/matrix.cpp @@ -1530,7 +1530,7 @@ void CMatrix::serial(IStream &f) // ====================================================================================================== void CMatrix::setArbitraryRotI(const CVector &idir) { - // avoid gimbal lock. if idir == nearly K, use an other second lead vector + // avoid gimbal lock. if idir == nearly K, use another second lead vector if( fabs(idir.z)<0.9f ) setRot(idir, CVector::J, CVector::K); else @@ -1540,7 +1540,7 @@ void CMatrix::setArbitraryRotI(const CVector &idir) void CMatrix::setArbitraryRotJ(const CVector &jdir) { - // avoid gimbal lock. if jdir == nearly K, use an other second lead vector + // avoid gimbal lock. if jdir == nearly K, use another second lead vector if(fabs(jdir.z)<0.9f) setRot(CVector::I, jdir, CVector::K); else @@ -1550,7 +1550,7 @@ void CMatrix::setArbitraryRotJ(const CVector &jdir) void CMatrix::setArbitraryRotK(const CVector &kdir) { - // avoid gimbal lock. if kdir == nearly I, use an other second lead vector + // avoid gimbal lock. if kdir == nearly I, use another second lead vector if( fabs(kdir.y)<0.9f ) setRot(CVector::I, CVector::J, kdir); else diff --git a/code/nel/src/pacs/edge_collide.cpp b/code/nel/src/pacs/edge_collide.cpp index 5794e2c69..9e1942adc 100644 --- a/code/nel/src/pacs/edge_collide.cpp +++ b/code/nel/src/pacs/edge_collide.cpp @@ -329,7 +329,7 @@ float CEdgeCollide::testCircleMove(const CVector2f &start, const CVector2f &del It is important for CGlobalRetriever::testCollisionWithCollisionChains() because of the "SURFACEMOVE NOT DETECTED" Problem. Suppose we can walk on this chain SA/SB (separate Surface A/SurfaceB). Suppose we are near this edge, - and on Surface SA, and suppose there is an other chain SB/SC the circle collide with. If we + and on Surface SA, and suppose there is another chain SB/SC the circle collide with. If we return 1 (no collision), SB/SC won't be detected (because only SA/?? chains will be tested) and so the cylinder will penetrate SB/SC... This case arise at best if chains SA/SB and chain SB/SC do an angle of 45deg diff --git a/code/nel/src/pacs/global_retriever.cpp b/code/nel/src/pacs/global_retriever.cpp index 737547b6e..04336edff 100644 --- a/code/nel/src/pacs/global_retriever.cpp +++ b/code/nel/src/pacs/global_retriever.cpp @@ -1269,7 +1269,7 @@ void NLPACS::CGlobalRetriever::findCollisionChains(CCollisionSurfaceTemp &cst, c // LeftSurface retrieverInstance is always curInstance. cc.LeftSurface.RetrieverInstanceId= curInstance; - // If RightSurface is not an "edgeId" ie a pointer on a neighbor surface on an other retrieverInstance. + // If RightSurface is not an "edgeId" ie a pointer on a neighbor surface on another retrieverInstance. const CChain &originalChain= localRetriever.getChain(cc.ChainId); if( !originalChain.isBorderChainId(cc.RightSurface.SurfaceId) ) { diff --git a/code/nel/src/sound/driver/dsound/source_dsound.cpp b/code/nel/src/sound/driver/dsound/source_dsound.cpp index 75447a5f2..3c10ac875 100644 --- a/code/nel/src/sound/driver/dsound/source_dsound.cpp +++ b/code/nel/src/sound/driver/dsound/source_dsound.cpp @@ -2569,7 +2569,7 @@ void CSourceDSound::crossFade() _Buffer->getFormat(sampleFormat, freq); - // The source is currently playing an other buffer. We will do a hot + // The source is currently playing another buffer. We will do a hot // swap between the old and the new buffer. DirectSound maintains two // cursors into the buffer: the play cursor and the write cursor. // The write cursor indicates where we can start writing the new samples. diff --git a/code/nel/src/sound/driver/openal/sound_driver_al.cpp b/code/nel/src/sound/driver/openal/sound_driver_al.cpp index 07ca7c801..3dc156fc7 100644 --- a/code/nel/src/sound/driver/openal/sound_driver_al.cpp +++ b/code/nel/src/sound/driver/openal/sound_driver_al.cpp @@ -59,7 +59,7 @@ void alTestWarning(const char *src) switch (errcode) { case AL_NO_ERROR: break; - case AL_INVALID_NAME: nlwarning("AL: Invalid Name paramater passed to AL call (%s)", src); break; + case AL_INVALID_NAME: nlwarning("AL: Invalid Name parameter passed to AL call (%s)", src); break; case AL_INVALID_ENUM: nlwarning("AL: Invalid parameter passed to AL call (%s)", src); break; case AL_INVALID_VALUE: nlwarning("AL: Invalid enum parameter value (%s)", src); break; case AL_INVALID_OPERATION: nlwarning("AL: Illegal call (%s)", src); break; diff --git a/code/nel/src/sound/music_sound.cpp b/code/nel/src/sound/music_sound.cpp index c6b653388..2b192c3c6 100644 --- a/code/nel/src/sound/music_sound.cpp +++ b/code/nel/src/sound/music_sound.cpp @@ -78,7 +78,7 @@ void CMusicSound::importForm(const std::string& filename, NLGEORGES::UFormElm& uint32 CMusicSound::getDuration() { // Cannot know the length of this music sound. - // Since its not really a sound (played in an other "channel"), suppose 0 + // Since its not really a sound (played in another "channel"), suppose 0 return 0; } diff --git a/code/nel/tools/3d/object_viewer/object_viewer.cfg b/code/nel/tools/3d/object_viewer/object_viewer.cfg index 7d55bc134..25e48d7fc 100644 --- a/code/nel/tools/3d/object_viewer/object_viewer.cfg +++ b/code/nel/tools/3d/object_viewer/object_viewer.cfg @@ -37,7 +37,7 @@ recursive_search_pathes= // can load dds if the tga is not available extensions_remapping = { "tga", "dds" }; -camera_focal = 75; // this is optionnal +camera_focal = 75; // this is optional // sound related vars packed_sheet_path = "R:\code\ryzom\data\sound"; @@ -46,33 +46,33 @@ sample_path = "R:\code\ryzom\data\sound\samplebanks\"; // // Vegetable Landscape Setup (for vegetable edition). search_pathes must be OK. -veget_tile_bank= ""; // this is optionnal, but obligatory for Vegetable Edit to work properly -veget_tile_far_bank= ""; // this is optionnal, but obligatory for Vegetable Edit to work properly -veget_landscape_zones= // this is optionnal, but obligatory for Vegetable Edit to work properly +veget_tile_bank= ""; // this is optional, but obligatory for Vegetable Edit to work properly +veget_tile_far_bank= ""; // this is optional, but obligatory for Vegetable Edit to work properly +veget_landscape_zones= // this is optional, but obligatory for Vegetable Edit to work properly { }; -veget_landscape_threshold= 0.01; // this is optionnal -veget_landscape_tile_near= 50; // this is optionnal -veget_landscape_ambient = {17, 54, 100} ; // this is optionnal -veget_landscape_diffuse = {241, 226, 244} ; // this is optionnal -veget_landscape_snap_height= 1.70; // this is optionnal +veget_landscape_threshold= 0.01; // this is optional +veget_landscape_tile_near= 50; // this is optional +veget_landscape_ambient = {17, 54, 100} ; // this is optional +veget_landscape_diffuse = {241, 226, 244} ; // this is optional +veget_landscape_snap_height= 1.70; // this is optional // veget setup -veget_texture= ""; // this is optionnal, but important for Vegetable Edit to behave properly -veget_ambient= {80, 80, 80}; // this is optionnal -veget_diffuse= {255, 255, 255}; // this is optionnal. NB: works like veget_landscape_diffuse (ie maxLightFactor possible) -veget_light_dir= {0, 1, -1}; // this is optionnal -veget_wind_dir= {1, 1, 0}; // this is optionnal -veget_wind_freq= 0.5; // this is optionnal -veget_wind_power= 1; // this is optionnal -veget_wind_bend_min= 0; // this is optionnal +veget_texture= ""; // this is optional, but important for Vegetable Edit to behave properly +veget_ambient= {80, 80, 80}; // this is optional +veget_diffuse= {255, 255, 255}; // this is optional. NB: works like veget_landscape_diffuse (ie maxLightFactor possible) +veget_light_dir= {0, 1, -1}; // this is optional +veget_wind_dir= {1, 1, 0}; // this is optional +veget_wind_freq= 0.5; // this is optional +veget_wind_power= 1; // this is optional +veget_wind_bend_min= 0; // this is optional // scene_light setup -scene_light_enabled = 1; // this is optionnal. Usefull to load Igs with lights and see correct ligthing -scene_light_sun_specular= {255, 255, 255}; // this is optionnal -scene_light_sun_diffuse = {255, 255, 255}; // this is optionnal -scene_light_sun_ambiant = {64, 64, 64}; // this is optionnal -scene_light_sun_dir = {1, 0, -1}; // this is optionnal +scene_light_enabled = 1; // this is optional. Usefull to load Igs with lights and see correct ligthing +scene_light_sun_specular= {255, 255, 255}; // this is optional +scene_light_sun_diffuse = {255, 255, 255}; // this is optional +scene_light_sun_ambiant = {64, 64, 64}; // this is optional +scene_light_sun_dir = {1, 0, -1}; // this is optional // scale the played position of all the skeletons by this value (default 1). diff --git a/code/nel/tools/3d/object_viewer/object_viewer.h b/code/nel/tools/3d/object_viewer/object_viewer.h index 4ae69f1bf..26d71ffca 100644 --- a/code/nel/tools/3d/object_viewer/object_viewer.h +++ b/code/nel/tools/3d/object_viewer/object_viewer.h @@ -345,7 +345,7 @@ public: // @} /** an interface for objects that want to be called during the loop - * First use : display of an optionnal bbox for a particle system + * First use : display of an optional bbox for a particle system */ struct IMainLoopCallBack { diff --git a/code/nel/tools/3d/object_viewer/object_viewer.rc b/code/nel/tools/3d/object_viewer/object_viewer.rc index 53ca54798..3f2b6c65e 100644 --- a/code/nel/tools/3d/object_viewer/object_viewer.rc +++ b/code/nel/tools/3d/object_viewer/object_viewer.rc @@ -1318,14 +1318,14 @@ END IDD_VEGETABLE_SELECT_OTHER DIALOG DISCARDABLE 0, 0, 187, 146 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Select An Other Vegetable" +CAPTION "Select Another Vegetable" FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,129,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 LISTBOX IDC_LIST1,5,5,95,130,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - LTEXT "Selet the vegetable to copy colors from",IDC_STATIC,110, + LTEXT "Select the vegetable to copy colors from",IDC_STATIC,110, 75,75,35 END diff --git a/code/ryzom/client/src/actions.h b/code/ryzom/client/src/actions.h index 313c2965d..e8fdee00b 100644 --- a/code/ryzom/client/src/actions.h +++ b/code/ryzom/client/src/actions.h @@ -191,10 +191,10 @@ public: // Init default values CParameter (); - // The parameter name (optionnal) + // The parameter name (optional) std::string Name; - // The parameter localized name (optionnal) + // The parameter localized name (optional) std::string LocalizedName; // Default value diff --git a/code/ryzom/client/src/bg_downloader_access.cpp b/code/ryzom/client/src/bg_downloader_access.cpp index e6bdfaf93..45516aaaf 100644 --- a/code/ryzom/client/src/bg_downloader_access.cpp +++ b/code/ryzom/client/src/bg_downloader_access.cpp @@ -279,7 +279,7 @@ void CBGDownloaderAccess::CDownloadCoTask::run() for (uint catIndex = 0; catIndex < bnpCatSet.categoryCount(); ++catIndex) { const CBNPCategory &cat = bnpCatSet.getCategory(catIndex); - if (cat.isOptional()) // NB : 'optionnal' flag meaning has changed : it now means 'Mainland Patch' + if (cat.isOptional()) // NB : 'optional' flag meaning has changed : it now means 'Mainland Patch' // until an enum is added { for (uint f = 0; f < cat.fileCount(); ++f) diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp index 2420c1ccd..51b7179ce 100644 --- a/code/ryzom/client/src/character_cl.cpp +++ b/code/ryzom/client/src/character_cl.cpp @@ -4371,7 +4371,7 @@ bool CCharacterCL::createCurrentAttackEndPart(CProjectileBuild &destPB, // destPB.LocalizedImpact = sheet.IsImpactLocalised; - // If this is a secondary projectile, it may start from an other location, which is the impact point of the previous projectile + // If this is a secondary projectile, it may start from another location, which is the impact point of the previous projectile // (so it doesn't start from the caster hand, or any around settings that is read from the spell sheet) if (sm) // start stickmode wanted ? { diff --git a/code/ryzom/client/src/client_sheets/sbrick_sheet.cpp b/code/ryzom/client/src/client_sheets/sbrick_sheet.cpp index 2cdf281cf..70ca7f515 100644 --- a/code/ryzom/client/src/client_sheets/sbrick_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/sbrick_sheet.cpp @@ -167,7 +167,7 @@ void CSBrickSheet::build (const NLGEORGES::UFormElm &root) if(bf != BRICK_FAMILIES::Unknown) OptionalFamilies.push_back( bf ); else - nlwarning("Unknown optionnal family %s",sTmp.c_str()); + nlwarning("Unknown optional family %s",sTmp.c_str()); } } diff --git a/code/ryzom/client/src/ground_fx_manager.cpp b/code/ryzom/client/src/ground_fx_manager.cpp index 9b96aa356..18fd41fe0 100644 --- a/code/ryzom/client/src/ground_fx_manager.cpp +++ b/code/ryzom/client/src/ground_fx_manager.cpp @@ -533,7 +533,7 @@ void CGroundFXManager::update(const NLMISC::CVectorD &camPos) { // NB : we dont activate emitters has soon as the fx is allocated by an entity, because of the way the fx works. // As a matter of fact, if an object move from A to B, the fx may spawn several particles on [AB] in a single frame - // So if the FX was previously used by an other entity, a trail of particles may appear between the 2 entities when + // So if the FX was previously used by another entity, a trail of particles may appear between the 2 entities when // fx is deallocated from first entity and allocated by the new one if (!_SortedInstances[k]->FXHandle->FX.empty()) { @@ -550,7 +550,7 @@ void CGroundFXManager::update(const NLMISC::CVectorD &camPos) { // NB : we dont activate emitters has soon as the fx is allocated by an entity, because of the way the fx works. // As a matter of fact, if an object move from A to B, the fx may spawn several particles on [AB] in a single frame - // So if the FX was previously used by an other entity, a trail of particles may appear between the 2 entities when + // So if the FX was previously used by another entity, a trail of particles may appear between the 2 entities when // fx is deallocated from first entity and allocated by the new one if (!_SortedInstances[k]->FXHandle->FXUnderWater.empty()) { diff --git a/code/ryzom/client/src/input.cpp b/code/ryzom/client/src/input.cpp index 368ffa98d..d0732bd86 100644 --- a/code/ryzom/client/src/input.cpp +++ b/code/ryzom/client/src/input.cpp @@ -114,7 +114,7 @@ bool InitMouseWithCursor (bool hardware) return false; } - // Update mouse informations + // Update mouse information UpdateMouse (); if (InitMouseFirstTime) diff --git a/code/ryzom/client/src/interface_v3/action_handler_game.cpp b/code/ryzom/client/src/interface_v3/action_handler_game.cpp index 6580b4f0d..903f37a0b 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_game.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_game.cpp @@ -532,7 +532,7 @@ public: CCDBNodeLeaf *progs = im->getDbProp("SERVER:TARGET:PROGRAMMES", false); if (!progs) { - nlwarning(" can't retrieve programms."); + nlwarning(" can't retrieve programs."); return; } bool missionsToDo = (progs->getValue32() & (1 << BOTCHATTYPE::AvailableMissionFamily)) != 0; diff --git a/code/ryzom/client/src/interface_v3/action_handler_item.cpp b/code/ryzom/client/src/interface_v3/action_handler_item.cpp index 009829b9e..6f1021b9a 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_item.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_item.cpp @@ -687,7 +687,7 @@ static void validateStackItem(CDBCtrlSheet *pCSSrc, CDBCtrlSheet *pCSDst, sint32 // *************************************************************************** -/** Swap an item with an other in the inventory. +/** Swap an item with another in the inventory. * eg: place in sword in the set, or place an armor in the kit, or swap 2 items in bags */ class CHandlerSwapItem: public IActionHandler diff --git a/code/ryzom/client/src/interface_v3/chat_window.h b/code/ryzom/client/src/interface_v3/chat_window.h index 77cce3487..a18b950f6 100644 --- a/code/ryzom/client/src/interface_v3/chat_window.h +++ b/code/ryzom/client/src/interface_v3/chat_window.h @@ -63,7 +63,7 @@ struct CChatWindowDesc std::string AHOnCloseButton; std::string AHOnCloseButtonParams; std::string HeaderColor; - // default ctor : build optionnal parameters with their default values + // default ctor : build optional parameters with their default values CChatWindowDesc(); }; @@ -224,7 +224,7 @@ public: // dtor ~CChatWindowManager(); /** Create a new chat window. Each chat window should have a unique name - * The window should be inserted in an other container by the caller. + * The window should be inserted in another container by the caller. * \param name A unique title to affect to that window * \param listener A listener to react to the event of the window * \return A pointer on the window, or NULL, if creation failed or if name already exists. diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp index 34fb03788..bbdead11e 100644 --- a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp +++ b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp @@ -2709,7 +2709,7 @@ bool CDBCtrlSheet::handleEvent (const CEventDescriptor &event) // In all case, quit _Draging = false; _LastDraggedSheet = NULL; - // In call case, end of drag => consider handled to not call an other action + // In call case, end of drag => consider handled to not call another action return true; } } diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.h b/code/ryzom/client/src/interface_v3/dbctrl_sheet.h index ec221fa0a..3134ec5c3 100644 --- a/code/ryzom/client/src/interface_v3/dbctrl_sheet.h +++ b/code/ryzom/client/src/interface_v3/dbctrl_sheet.h @@ -226,7 +226,7 @@ public: CCtrlSheetInfo::TSheetType getType () const; void setType (CCtrlSheetInfo::TSheetType type); - // Swap the content with an other ctrl_sheet (debug): SheetId, Quantity and Quality + // Swap the content with another ctrl_sheet (debug): SheetId, Quantity and Quality void swapSheet(CDBCtrlSheet *other); void setSheetId(sint32 val) {_SheetId.setSInt32(val);} void setQuality(sint32 val) {_Quality.setSInt32(val);} @@ -355,7 +355,7 @@ public: /// Special ContextHelp for ctrl sheet. virtual void getContextHelp(ucstring &help) const; - /** true if an item of an other ctrlSheet can be dropped on this slot. + /** true if an item of another ctrlSheet can be dropped on this slot. * also return true if src is 0, or if _ItemSlot==UNDEFINED */ bool canDropItem(CDBCtrlSheet *src) const; @@ -670,7 +670,7 @@ protected: // For an Item only. Usefull for LeftHand Filtering: must have a pointer to the right hand CDBCtrlSheet *_OtherHandItemFilter; - // This String is optionnal and usage dependent for Item, Macro, or Sentence + // This String is optional and usage dependent for Item, Macro, or Sentence std::string _OptString; CCDBNodeLeaf *_GrayedLink; diff --git a/code/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp b/code/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp index ec9622589..7e15b0551 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp +++ b/code/ryzom/client/src/interface_v3/dbgroup_build_phrase.cpp @@ -464,7 +464,7 @@ void CDBGroupBuildPhrase::fillSelectionMain(uint index) filterBrickSetuped(bricks); } - // For optionnal or credit, filter by BrickExclusion. + // For optional or credit, filter by BrickExclusion. if(index>=1/*+_NumMandatories*/) filterBrickExclusion(bricks, index); @@ -967,7 +967,7 @@ void CDBGroupBuildPhrase::updateParamHrc(uint index) // **** From the current View setup of 'word', build the Parameter Hierarchy (in simple tree form) CParamTreeNode rootNode(NULL); - // NB: here rootNode represent the Main (ie mandatory, optionnal or credit) brick. Therefore, it is not a real parameter. + // NB: here rootNode represent the Main (ie mandatory, optional or credit) brick. Therefore, it is not a real parameter. rootNode.Brick= word->Slot.Brick->asSBrickSheet(); rootNode.Valid= true; rootNode.ViewParamFamilies= word->Slot.ViewParamFamilies; diff --git a/code/ryzom/client/src/interface_v3/dbgroup_build_phrase.h b/code/ryzom/client/src/interface_v3/dbgroup_build_phrase.h index df322cdde..e828c56e6 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_build_phrase.h +++ b/code/ryzom/client/src/interface_v3/dbgroup_build_phrase.h @@ -106,7 +106,7 @@ public: // enable disaply and set the brick void setBrick(uint32 sheetId); void setParamBrick(uint param, uint32 sheetId); - // for optional delete, copy state from an other word + // for optional delete, copy state from another word void copySetup(const CWord &w); CWord() diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.h b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.h index 2a0f45c67..5e3af2734 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.h +++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.h @@ -25,7 +25,7 @@ // *************************************************************************** /** - * Special IconList for displaying Phrase Sheet. Optionnaly display progression info + * Special IconList for displaying Phrase Sheet. Optionally display progression info * \author Lionel Berenguier * \author Nevrax France * \date 2004 diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.h b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.h index ae5a5127d..4b857501e 100644 --- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.h +++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.h @@ -25,7 +25,7 @@ // *************************************************************************** /** - * Special TextList for displaying Phrase Sheet. Optionnaly display progression info + * Special TextList for displaying Phrase Sheet. Optionally display progression info * \author Lionel Berenguier * \author Nevrax France * \date 2003 diff --git a/code/ryzom/client/src/interface_v3/group_html.cpp b/code/ryzom/client/src/interface_v3/group_html.cpp index 9caea5382..fca0eb987 100644 --- a/code/ryzom/client/src/interface_v3/group_html.cpp +++ b/code/ryzom/client/src/interface_v3/group_html.cpp @@ -672,7 +672,7 @@ bool scanHTMLColor(const char *src, CRGBA &dest) src = scanColorComponent(src, result.A); if (!src) { - // Alpha is optionnal + // Alpha is optional result.A = 255; } dest = result; diff --git a/code/ryzom/client/src/interface_v3/group_tree.h b/code/ryzom/client/src/interface_v3/group_tree.h index 997c627d3..556abab99 100644 --- a/code/ryzom/client/src/interface_v3/group_tree.h +++ b/code/ryzom/client/src/interface_v3/group_tree.h @@ -33,7 +33,7 @@ class CGroupTree : public CInterfaceGroup public: struct SNode; - // optionnal callback that is called when a node has been added + // optional callback that is called when a node has been added struct INodeAddedCallback { /** A node has just been added in the CGroupTree object diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp index 16c85edf2..296811fe8 100644 --- a/code/ryzom/client/src/interface_v3/interface_manager.cpp +++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp @@ -2258,7 +2258,7 @@ void CInterfaceManager::drawContextHelp () // *************** // **** try to disable // *************** - // test disable first, so can recheck asap if an other present. see below + // test disable first, so can recheck asap if another present. see below if(_CurCtrlContextHelp) { if(x!=_LastXContextHelp || y!=_LastYContextHelp) @@ -4469,7 +4469,7 @@ void CInterfaceManager::setMode(uint8 newMode) CGroupContainer *pGC = dynamic_cast(*itw); if ((pGC != NULL)&&(pGC->getActive())) { - // if this GC is a Full modal window, or if it is a modal son of an other GC, + // if this GC is a Full modal window, or if it is a modal son of another GC, if (pGC->isModal() || pGC->isModalSon()) { setTopWindow(pGC); diff --git a/code/ryzom/client/src/interface_v3/interface_parser.cpp b/code/ryzom/client/src/interface_v3/interface_parser.cpp index 6aa2d4143..a97699542 100644 --- a/code/ryzom/client/src/interface_v3/interface_parser.cpp +++ b/code/ryzom/client/src/interface_v3/interface_parser.cpp @@ -1362,7 +1362,7 @@ bool CInterfaceParser::parseLink(xmlNodePtr cur, CInterfaceGroup * parentGroup) { splitLinkTargets(std::string((const char*)ptr), parentGroup, targets); } - // optionnal action handler + // optional action handler std::string action; std::string params; std::string cond; @@ -3065,7 +3065,7 @@ bool CInterfaceParser::parseCareerGenerator(xmlNodePtr /* cur */) return false; - // knownWindow (optionnal) + // knownWindow (optional) prop = xmlGetProp (cur, (xmlChar*)"known_window"); if(prop) knownWindow= (const char*)prop; diff --git a/code/ryzom/client/src/interface_v3/lua_helper.h b/code/ryzom/client/src/interface_v3/lua_helper.h index c8192dcff..e6d50cb9d 100644 --- a/code/ryzom/client/src/interface_v3/lua_helper.h +++ b/code/ryzom/client/src/interface_v3/lua_helper.h @@ -246,7 +246,7 @@ public: const void *toPointer(int index = -1); /** Helper functions : get value of the wanted type in the top table after conversion * A default value is used if the stack entry is NULL. - * If conversion fails then an exception is thrown (with optionnal msg) + * If conversion fails then an exception is thrown (with optional msg) */ bool getTableBooleanValue(const char *name, bool defaultValue= false); double getTableNumberValue(const char *name, double defaultValue= 0); diff --git a/code/ryzom/client/src/interface_v3/lua_ihm.cpp b/code/ryzom/client/src/interface_v3/lua_ihm.cpp index 18f77fb49..88ae99cbb 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm.cpp +++ b/code/ryzom/client/src/interface_v3/lua_ihm.cpp @@ -885,7 +885,7 @@ int CLuaIHM::luaUINewIndex(CLuaState &ls) } CInterfaceElement *pIE = dynamic_cast(pRPT); - // ** try to get an other UI (child or parent) + // ** try to get another UI (child or parent) CInterfaceElement *uiRelative= getUIRelative(pIE, propName); if(uiRelative) { diff --git a/code/ryzom/client/src/interface_v3/obs_huge_list.cpp b/code/ryzom/client/src/interface_v3/obs_huge_list.cpp index ae68aeb36..ac0c05c29 100644 --- a/code/ryzom/client/src/interface_v3/obs_huge_list.cpp +++ b/code/ryzom/client/src/interface_v3/obs_huge_list.cpp @@ -149,7 +149,7 @@ bool CHugeListObs::init() _HasNext = im->getDbProp(dbPath + ":HAS_NEXT", false); if (!_HasNext) return false; - // optionnal (rolemaster Trading only) + // optional (rolemaster Trading only) _RoleMasterFlagDB = im->getDbProp(dbPath + ":ROLEMASTER_FLAGS", false); _RoleMasterRaceDB = im->getDbProp(dbPath + ":ROLEMASTER_RACE", false); diff --git a/code/ryzom/client/src/interface_v3/people_list.h b/code/ryzom/client/src/interface_v3/people_list.h index 34960ef56..fd7ffbbcd 100644 --- a/code/ryzom/client/src/interface_v3/people_list.h +++ b/code/ryzom/client/src/interface_v3/people_list.h @@ -67,7 +67,7 @@ public: CPeopleList(); /** create a list of people from the given description * \param desc description of the people list - * \param chat optionnal chat box in the list + * \param chat optional chat box in the list * \return true if the list could be */ bool create(const CPeopleListDesc &desc, const CChatWindowDesc *chat = NULL); diff --git a/code/ryzom/client/src/interface_v3/req_skill_formula.h b/code/ryzom/client/src/interface_v3/req_skill_formula.h index 9164d35c9..59e215048 100644 --- a/code/ryzom/client/src/interface_v3/req_skill_formula.h +++ b/code/ryzom/client/src/interface_v3/req_skill_formula.h @@ -82,10 +82,10 @@ public: // Or operation with a SkillValue. void orV(const CSkillValue &req); - // And operation with an other Req Skill Formula. NB: if this.empty, ope= + // And operation with another Req Skill Formula. NB: if this.empty, ope= void andV(const CReqSkillFormula &req); - // Or operation with an other Req Skill Formula + // Or operation with another Req Skill Formula void orV(const CReqSkillFormula &req); // empty formula? diff --git a/code/ryzom/client/src/interface_v3/view_text_id.h b/code/ryzom/client/src/interface_v3/view_text_id.h index d4de9c20a..836e55d58 100644 --- a/code/ryzom/client/src/interface_v3/view_text_id.h +++ b/code/ryzom/client/src/interface_v3/view_text_id.h @@ -122,7 +122,7 @@ protected: // If true, setTextFormatted() is used instead of setText() bool _IsTextFormatTaged; - // Optionnal ucstring modifier + // Optional ucstring modifier IOnReceiveTextId *_StringModifier; #if defined(NL_DEBUG) diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp index 81de7e8e8..6c06e2b3c 100644 --- a/code/ryzom/client/src/login.cpp +++ b/code/ryzom/client/src/login.cpp @@ -1580,7 +1580,7 @@ void initPatch() } // *************************************************************************** -// Called after the check has been done. The page is full of optionnal categories that must be selected for patching +// Called after the check has been done. The page is full of optional categories that must be selected for patching class CAHLoginPatch : public IActionHandler { virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */) @@ -1638,7 +1638,7 @@ class CAHLoginPatch : public IActionHandler REGISTER_ACTION_HANDLER (CAHLoginPatch, "login_patch"); // *************************************************************************** -// Called after the check has been done. The page is full of optionnal categories that must be selected for patching +// Called after the check has been done. The page is full of optional categories that must be selected for patching class CAHClosePatch : public IActionHandler { virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */) @@ -2174,7 +2174,7 @@ void initDataScan() } // *************************************************************************** -// Called after the check has been done. The page is full of optionnal categories that must be selected for patching +// Called after the check has been done. The page is full of optional categories that must be selected for patching class CAHOnScanDataStart : public IActionHandler { virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */) diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp index e24d5df48..cf99dbab5 100644 --- a/code/ryzom/client/src/login_patch.cpp +++ b/code/ryzom/client/src/login_patch.cpp @@ -3018,10 +3018,10 @@ void CScanDataThread::run () // **************************************************************************** uint32 CPatchManager::SPatchInfo::getAvailablePatchsBitfield() const { - // About the test (until a patch enum is added, we use the 'optionnal' flag) - // Non optionnal -> must patch it (will be for RoS) - // Optionnal -> Will be for Mainland - // Required : stands for 'bnp' required by the Optionnal bnps !! so ignore only RoS is wanted + // About the test (until a patch enum is added, we use the 'optional' flag) + // Non optional -> must patch it (will be for RoS) + // Optional -> Will be for Mainland + // Required : stands for 'bnp' required by the Optional bnps !! so ignore only RoS is wanted uint32 result = 0; if (!NonOptCat.empty()) diff --git a/code/ryzom/client/src/login_patch.h b/code/ryzom/client/src/login_patch.h index eec8b0fd3..02b341fa6 100644 --- a/code/ryzom/client/src/login_patch.h +++ b/code/ryzom/client/src/login_patch.h @@ -89,7 +89,7 @@ public: struct SFileToPatch { std::string FileName; // Dest file for the patch - std::string SrcFileName; // Optionnal src file to which apply patch (empty unless some version of the file, possibly with + std::string SrcFileName; // Optional src file to which apply patch (empty unless some version of the file, possibly with // all patchs applied, was found in the /unpack directory due to a download by the background downloader) std::vector Patches; std::vector PatcheSizes; @@ -178,7 +178,7 @@ public: // if the checkThread ended and is ok then the getDesc* methods can be called bool isCheckThreadEnded(bool &ok); - // Get all the optionnal categories to display for patching + // Get all the optional categories to display for patching void getInfoToDisp(SPatchInfo &piOut); void forceStopCheckThread(); diff --git a/code/ryzom/client/src/misc.cpp b/code/ryzom/client/src/misc.cpp index 976786a97..4e9281584 100644 --- a/code/ryzom/client/src/misc.cpp +++ b/code/ryzom/client/src/misc.cpp @@ -400,11 +400,11 @@ bool computeAnimSet(const CAnimationSet *&animSet, MBEHAV::EMode mode, const str //----------------------------------------------- // dump : -// Create a file with informations to debug. +// Create a file with information to debug. //----------------------------------------------- void dump(const std::string &name) { - // Write informations to start as the version + // Write information to start as the version COFile fStart; if(fStart.open(name + "_start.rec", false, false)) { @@ -477,7 +477,7 @@ void loadDump(const std::string &name) { CVectorD currentPos; - // Load informations to start as the version + // Load information to start as the version CIFile fStart; if(fStart.open(name + "_start.rec", false)) { 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 c6bf1283c..9ea4a2a6e 100644 --- a/code/ryzom/client/src/r2/dmc/client_edition_module.h +++ b/code/ryzom/client/src/r2/dmc/client_edition_module.h @@ -249,7 +249,7 @@ He can change the current act - getRuntimeActs() : return act description - requestStartAct(): ask the DSS to start another act - updateActPositionDescriptions(): update the description of acts -He can use DM function such teleport himself to an other character +He can use DM function such teleport himself to another character - requestTeleportOneCharacterToAnother: teleport the dm to another plyer character. He can dynamically change the Weather or the Season. - requestSetWeather: change the current weather at runtime or edit mode @@ -380,7 +380,7 @@ Sessions infos: - getAiInstance: get the id of the current AiInstance. One AiInstance is created by session. - getSessionType: get the type of the current session (edition / animation) - isSessionOwner: is the player the owner of the current session -- getEditSessionLink: is the current session linked to an other session +- getEditSessionLink: is the current session linked to another session - getScenarioHeader: get header info of current scenario (animation function). Enable to know divers info set into the header of a scenario. Quotas infos: - getMaxNpcs: get the maximal number of npc allowed by scenario. @@ -502,7 +502,7 @@ public: const std::string& instanceId, const std::string& attrName, sint32 position, const std::string& key, CObject* value); - /*! Move a node form the current Scenario from a position to an other (in edition Mode) + /*! Move a node form the current Scenario from a position to another (in edition Mode) The initial position is defined by instanceId, attrName, position. The final position is defined by desInstanceId, destAttrName, destPosition. */ @@ -679,7 +679,7 @@ public: const TActPositionDescriptions& getRuntimeActs() const { return _ActPositionDescriptions; } /*! - DM function that enable the dm to teleport to an other character (player). + DM function that enable the dm to teleport to another character (player). (Right click in the participant list) \param sessionId The id of the session \param sourceCharId The id of the character that will be teleport diff --git a/code/ryzom/client/src/r2/tool_maintained_action.cpp b/code/ryzom/client/src/r2/tool_maintained_action.cpp index 4f8001d86..592808350 100644 --- a/code/ryzom/client/src/r2/tool_maintained_action.cpp +++ b/code/ryzom/client/src/r2/tool_maintained_action.cpp @@ -59,7 +59,7 @@ void CToolMaintainedAction::cancel() bool CToolMaintainedAction::onMouseLeftButtonDown() { //H_AUTO(R2_CToolMaintainedAction_onMouseLeftButtonDown) - CTool::TSmartPtr holdThis(this); // prevent deletion by son (if they set an other tool) + CTool::TSmartPtr holdThis(this); // prevent deletion by son (if they set another tool) // TODO nico : find a more general system than this, because if (_State == Action) return true; // may happen if focus was lost if (_State == Canceling) diff --git a/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp b/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp index efff0524d..11e7312fa 100644 --- a/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp +++ b/code/ryzom/common/src/game_share/_backup_service_interface_singleton.cpp @@ -55,7 +55,7 @@ CVariable SaveShardRoot("variables", "SaveShardRoot", "Root directory of // stats variables CVariable BSLastAckTime("BSIF", "BSLastAckTime", "The timestamp of the last ack received from backup system", 0, 0, true); CVariable BSTimeSinceLastAck("BSIF", "BSTimeSinceLastAck", "The time since the last ack from the backup system", 0, 0, true); -CVariable BSLastAckDelay("BSIF", "BSLastAckDelay", "The time it took for the last received ack to be recieved from slowest of our connected BS services", 0, 0, true); +CVariable BSLastAckDelay("BSIF", "BSLastAckDelay", "The time it took for the last received ack to be received from slowest of our connected BS services", 0, 0, true); CVariable BSResponseTime("BSIF", "BSResponseTime", "Latest/average time (in sec) between BS request and response", 0, 20, false ); @@ -220,7 +220,7 @@ NLMISC::CSmartPtr CBackupInterfaceSingleton::popGener // if there are untreated callbacks in the generic responses container then yell while (!_GenericResponses.empty() && sint32(_GenericResponses.front().first-requestId)<0) { - STOP("Skipping untreated generic callback for request: "<<_GenericResponses.front().first<<" becuase we are treating request id: "< - * This would avoid to have fields for one service that aren't used by an other (like the historic...) + * This would avoid to have fields for one service that aren't used by another (like the historic...) * * \author Nicolas Vizerie * \author Nevrax France diff --git a/code/ryzom/common/src/game_share/msg_ais_egs_gen.h b/code/ryzom/common/src/game_share/msg_ais_egs_gen.h index 3d647289f..3e7748f7d 100644 --- a/code/ryzom/common/src/game_share/msg_ais_egs_gen.h +++ b/code/ryzom/common/src/game_share/msg_ais_egs_gen.h @@ -861,7 +861,7 @@ namespace RYMSG bool _DontFollow; // if that bot is a building bot it will be caught by outpost system bool _BuildingBot; - // optionnal and rare properties + // optional and rare properties std::vector< std::string > _OptionalProperties; // List of news channel. std::vector< std::string > _NewsChannels; @@ -1224,7 +1224,7 @@ namespace RYMSG _BuildingBot = value; } - // optionnal and rare properties + // optional and rare properties const std::vector< std::string > &getOptionalProperties() const { return _OptionalProperties; diff --git a/code/ryzom/common/src/game_share/ring_access.h b/code/ryzom/common/src/game_share/ring_access.h index 73d5e724e..2de15f464 100644 --- a/code/ryzom/common/src/game_share/ring_access.h +++ b/code/ryzom/common/src/game_share/ring_access.h @@ -69,7 +69,7 @@ namespace R2 std::string getSheetAccessInfo(const std::string& sheetClient, const std::string& sheetServer="") const; std::string getIslandAccessInfo(const std::string& islandeName) const; void getRingAccessAsMap(const std::string& ringAccess, std::map & ringAccessAsMap) const; - // Upgrade a ring access by an other eg "d1:f3:l1" + "d3:f1:j1" => "d3:f2:l1:j1" + // Upgrade a ring access by another eg "d1:f3:l1" + "d3:f1:j1" => "d3:f2:l1:j1" std::string upgradeRingAccess(const std::string& defaultValue, const std::string& bonusValue) const; bool verifyRight(const std::string& askedAcces, const std::string& allowedAccess) const; bool verifyRight(const std::map& askedAccesMap, const std::map& allowedAccessMap, std::string& package, int& neededLevel, int& charLevel) const; diff --git a/code/ryzom/common/src/game_share/server_edition_module.cpp b/code/ryzom/common/src/game_share/server_edition_module.cpp index 3e178e12f..0ef27648e 100644 --- a/code/ryzom/common/src/game_share/server_edition_module.cpp +++ b/code/ryzom/common/src/game_share/server_edition_module.cpp @@ -3289,7 +3289,7 @@ bool CServerEditionModule::unkickPioneerImpl(TSessionId sessionId, TCharId charI if (connectedSessionId != sessionId) { outMsg += NLMISC::toString( - "Refuse to unkick the character %u from session %u because he is connected to an other session %u", + "Refuse to unkick the character %u from session %u because he is connected to another session %u", charId, sessionId.asInt(), connectedSessionId.asInt() ) ; return false; } @@ -3362,7 +3362,7 @@ bool CServerEditionModule::kickPioneerImpl(TSessionId sessionId, TCharId charId, if (connectedSessionId != sessionId) { outMsg += NLMISC::toString( - "Refuse to kick the character %u from session %u because he is connected to an other session %u", + "Refuse to kick the character %u from session %u because he is connected to another session %u", charId, sessionId.asInt(), connectedSessionId.asInt() ) ; return false; } @@ -3409,7 +3409,7 @@ bool CServerEditionModule::kickPioneerImpl(TSessionId sessionId, TCharId charId, if (allowedChar->second.SessionId != sessionId) { outMsg += NLMISC::toString( - "R2Ed: Refuse to kick the character %u from session %u because he is connecting to an other session %u", + "R2Ed: Refuse to kick the character %u from session %u because he is connecting to another session %u", charId, sessionId.asInt(), allowedChar->second.SessionId.asInt() ); @@ -3472,7 +3472,7 @@ bool CServerEditionModule::removeCharacterFromSessionImpl(TSessionId sessionId, TSessionId connectedSessionId = foundPioneerSession->second; if (connectedSessionId != sessionId) { - outMsg += NLMISC::toString("Refuse to remove the character %u from session %u because he is connected to an other session %u", + outMsg += NLMISC::toString("Refuse to remove the character %u from session %u because he is connected to another session %u", charId, sessionId.asInt(), connectedSessionId.asInt() ); return false; } @@ -3503,7 +3503,7 @@ bool CServerEditionModule::removeCharacterFromSessionImpl(TSessionId sessionId, if (allowedChar->second.SessionId != sessionId) { - outMsg += NLMISC::toString("R2Ed: Refuse to remove the character %u from session %u because he is connecting to an other session %u", + outMsg += NLMISC::toString("R2Ed: Refuse to remove the character %u from session %u because he is connecting to another session %u", charId, sessionId.asInt(), allowedChar->second.SessionId.asInt()); return false; @@ -3567,7 +3567,7 @@ bool CServerEditionModule::teleportOneCharacterToAnotherImpl(TSessionId sessionI if (session) { scenario = session->getScenario(); } if (!session || !scenario) { - msg = toString("Try to teleport a character %u to an other character %u but in a session %u that do not exist", source, dest, session); + msg = toString("Try to teleport a character %u to another character %u but in a session %u that do not exist", source, dest, session); return false; } @@ -3578,7 +3578,7 @@ bool CServerEditionModule::teleportOneCharacterToAnotherImpl(TSessionId sessionI if (! sourceCharOk || !destCharOk) { - msg = toString("Try to teleport a character %u %sto an other character %u %sin the session %u", + msg = toString("Try to teleport a character %u %sto another character %u %sin the session %u", source, sourceCharOk?"":"that is not present in the current session ", dest, destCharOk?"":"that is not present in the current session ", session); @@ -3596,7 +3596,7 @@ bool CServerEditionModule::teleportOneCharacterToAnotherImpl(TSessionId sessionI if (_CharacterControlProxy.isNull()) { - msg="Try to tp to an other player but no EGS?"; + msg="Try to tp to another player but no EGS?"; return false; } CCharacterControlItfProxy proxy(_CharacterControlProxy); 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 71ca46d78..7627b92e7 100644 --- a/code/ryzom/common/src/game_share/server_edition_module.h +++ b/code/ryzom/common/src/game_share/server_edition_module.h @@ -163,7 +163,7 @@ namespace R2 virtual void characterKicked(NLNET::IModuleProxy *sender, TSessionId sessionId, TCharId charId); virtual void characterUnkicked(NLNET::IModuleProxy *sender, TSessionId sessionId, TCharId charId); - // Session manager report that a character must be teleport to an other location + // Session manager report that a character must be teleport to another location virtual void teleportOneCharacterToAnother(NLNET::IModuleProxy *sender, TSessionId sessionId, TCharId sourceCharId, TCharId destCharId); virtual void teleportWhileUploadingScenario(NLNET::IModuleProxy *sender, const std::string& island, const std::string& entryPoint, const std::string& season); @@ -340,7 +340,7 @@ namespace R2 NLMISC_COMMAND_HANDLER_ADD(CServerEditionModule, listPioneers, "display the list of pionnieers", "no args") NLMISC_COMMAND_HANDLER_ADD(CServerEditionModule, kickPioneer, "Kick a player out of a session", " ") NLMISC_COMMAND_HANDLER_ADD(CServerEditionModule, unkickPioneer, "Unkick a player from a session", " ") - NLMISC_COMMAND_HANDLER_ADD(CServerEditionModule, teleportOneCharacterToAnother, "Teleport a player to an other player in the same session", " ") + NLMISC_COMMAND_HANDLER_ADD(CServerEditionModule, teleportOneCharacterToAnother, "Teleport a player to another player in the same session", " ") NLMISC_COMMAND_HANDLER_ADD(CServerEditionModule, displayPioneer, "display a pionnieer", "") diff --git a/code/ryzom/server/src/admin_modules/aes_client_module.cpp b/code/ryzom/server/src/admin_modules/aes_client_module.cpp index 5c0a53df3..663ea60dd 100644 --- a/code/ryzom/server/src/admin_modules/aes_client_module.cpp +++ b/code/ryzom/server/src/admin_modules/aes_client_module.cpp @@ -183,7 +183,7 @@ namespace ADMIN // precompute the service name _ServiceAlias = makeServiceAlias(); - // loop for an optionnal 'dontUseShardOrders' flag in init params + // loop for an optional 'dontUseShardOrders' flag in init params const TParsedCommandLine *duso = pcl.getParam("dontUseShardOrders"); if (duso != NULL) _DontUseShardOrders = (duso->ParamValue == "true" || duso->ParamName == "1"); diff --git a/code/ryzom/server/src/ai_service/nf_grp_npc.cpp b/code/ryzom/server/src/ai_service/nf_grp_npc.cpp index a106d757d..15261d0d9 100644 --- a/code/ryzom/server/src/ai_service/nf_grp_npc.cpp +++ b/code/ryzom/server/src/ai_service/nf_grp_npc.cpp @@ -1518,7 +1518,7 @@ void receiveMissionItems_ssc_(CStateInstance* entity, CScriptStack& stack) } } - // A npc give a mission to take an item given by an other npc + // A npc give a mission to take an item given by another npc // but the item instead of being a r2_plot_item is a normal item like system_mp or big armor if ( r2PlotItemSheetId.find(sheetId) == r2PlotItemSheetId.end()) { @@ -1683,7 +1683,7 @@ void giveMissionItems_ssc_(CStateInstance* entity, CScriptStack& stack) } } - // A npc give a mission to give a item to an other npc + // A npc give a mission to give a item to another npc // but the item instead of being a r2_plot_item is a normal item like system_mp or big armor if ( r2PlotItemSheetId.find(sheetId) == r2PlotItemSheetId.end()) { diff --git a/code/ryzom/server/src/ai_share/primitive_parser.cpp b/code/ryzom/server/src/ai_share/primitive_parser.cpp index e55f4dd21..e6ce31008 100644 --- a/code/ryzom/server/src/ai_share/primitive_parser.cpp +++ b/code/ryzom/server/src/ai_share/primitive_parser.cpp @@ -671,7 +671,7 @@ static void addGroupDescriptionToEventAction(const CAIAliasDescriptionNode *tree case AITypeFolder: { string cname = nodeClass(child); - // parse optionnal group descriptions + // parse optional group descriptions if (cname == "group_descriptions") { CAIActions::exec("SETACTN", treeNode?treeNode->getAlias():uniqueId); diff --git a/code/ryzom/server/src/entities_game_service/creature_manager/creature.cpp b/code/ryzom/server/src/entities_game_service/creature_manager/creature.cpp index ed3283c3c..0749193d3 100644 --- a/code/ryzom/server/src/entities_game_service/creature_manager/creature.cpp +++ b/code/ryzom/server/src/entities_game_service/creature_manager/creature.cpp @@ -1280,7 +1280,7 @@ void CCreature::setBotDescription( const CGenNpcDescMsgImp& description ) _ContextTexts[i].second = description.getContextOptions()[i].getDetail(); } - // let's parse optionnal properties + // let's parse optional properties for ( uint i = 0; i < description.getOptionalProperties().size(); i++ ) { std::vector< std::string > result; diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp index 8b8103b65..038810453 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.cpp @@ -559,7 +559,7 @@ void CStaticBrick::readStaticBrick( const NLGEORGES::UFormElm &root, const NLMIS if(bf != BRICK_FAMILIES::Unknown) OptionalFamilies.insert( bf ); else - nlwarning("Unknown optionnal family %s",value.c_str()); + nlwarning("Unknown optional family %s",value.c_str()); } } diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.h index e5884f127..302df76c6 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_brick.h @@ -457,7 +457,7 @@ public: // get brick from family/index static const CStaticBrick *getBrickFromFamilyIndex(uint16 family, uint16 index); - /// called to copy from an other sheet (operator= + care ptrs) + /// called to copy from another sheet (operator= + care ptrs) void reloadSheet(const CStaticBrick &o); private: diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h index 1acb910c5..0ef0e0335 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h @@ -835,7 +835,7 @@ public: /// called when the sheet is removed void removed() {} - /// called to copy from an other sheet (operator= + care ptrs) + /// called to copy from another sheet (operator= + care ptrs) void reloadSheet(const CStaticItem &o); /** Get the base weigth for an item. diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.h index d64f9c94e..5beed11d2 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.h @@ -185,7 +185,7 @@ public : /// called when the sheet is removed void removed() {} - /// called to copy from an other sheet (operator= + care ptrs) + /// called to copy from another sheet (operator= + care ptrs) void reloadSheet(const CStaticXpStagesTable &o); std::vector< SStageTable > XpStagesTables; @@ -647,7 +647,7 @@ public: /// called when the sheet is removed void removed() { } - /// called to copy from an other sheet (operator= + care ptrs) + /// called to copy from another sheet (operator= + care ptrs) void reloadSheet(const CStaticCreatures &o); /// recompute CreatureDamagePerHit according to success chance table and CreatureDamagePerHitWithoutAverageDodge diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_rolemaster_phrase.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_rolemaster_phrase.h index fbe67ad40..2667bb7a4 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_rolemaster_phrase.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_rolemaster_phrase.h @@ -60,7 +60,7 @@ public: /// Removed void removed() {} - /// called to copy from an other sheet (operator= + care ptrs) + /// called to copy from another sheet (operator= + care ptrs) void reloadSheet(const CStaticRolemasterPhrase &o); public: diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.cpp b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.cpp index e98a03144..c625e241e 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.cpp +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.cpp @@ -218,7 +218,7 @@ void CStaticSuccessTable::readGeorges (const CSmartPtr &form, const CShee //-------------------------------------------------------------- // reloadSheet //-------------------------------------------------------------- -/// called to copy from an other sheet (operator= + care ptrs) +/// called to copy from another sheet (operator= + care ptrs) void CStaticSuccessTable::reloadSheet(const CStaticSuccessTable &o) { // nothing special, but check correct size diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.h index c6e3c94dd..0c619150d 100644 --- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.h +++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_success_table.h @@ -96,7 +96,7 @@ public: /// called when the sheet is removed void removed() {} - /// called to copy from an other sheet (operator= + care ptrs) + /// called to copy from another sheet (operator= + care ptrs) void reloadSheet(const CStaticSuccessTable &o); /** diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.cpp b/code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.cpp index c267945c3..d369aef26 100644 --- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.cpp @@ -58,7 +58,7 @@ void CAIInfosOnEntityMsgImp::callback (const std::string &name, NLNET::TServiceI CEntityBase *entity = CEntityBaseManager::getEntityBasePtr(EntityRowId); if (!entity) { - nlwarning(" recieved infos on unknown entity"); + nlwarning(" received infos on unknown entity"); return; } diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/combat_phrase.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/combat_phrase.cpp index 8736cf601..88250abc1 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/combat_phrase.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/combat_phrase.cpp @@ -4886,7 +4886,7 @@ void CCombatPhrase::flushDelayedEvents() case EventDodge: case EventParry: { - // don't send a flying text if some damage is done (for instance on an other entity or with the left weapon) + // don't send a flying text if some damage is done (for instance on another entity or with the left weapon) // don't send a flying text if not wanted bool sendFlyingText= _Behaviour.DeltaHP==0 && ae.SendFlyingText; // don't send a dodge/parry flying text if both Miss and DodgeParry happened (eg: can happen if right weapon attack miss, and left weapon attack is dodged) diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb.h b/code/ryzom/server/src/entities_game_service/player_manager/cdb.h index 443f72538..fccaff859 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/cdb.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb.h @@ -327,7 +327,7 @@ protected: /// Atomic flag: is the branch an atomic group, or is the leaf a member of an atomic group bool _Atomic; - /// Optionnal callback pointer. + /// Optional callback pointer. TNodeChangeCallback _ChangeCallback; }; diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.h b/code/ryzom/server/src/entities_game_service/player_manager/character.h index a000613bd..850fa72ed 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/character.h @@ -1304,7 +1304,7 @@ public: sint processMissionMultipleEvent( CMissionEvent & event, TAIAlias alias = CAIAliasTranslator::Invalid); /// process a mission event for the missions took by this player bool processMissionUserEvent(std::list< CMissionEvent* > & eventList,TAIAlias alias); - /// process a mission event for a specific mission and optionnally for a specific step + /// process a mission event for a specific mission and optionally for a specific step bool processMissionStepUserEvent(std::list< CMissionEvent* > & eventList, uint missionAlias, uint32 stepIndex ); /// make a mission advance through bot chat void botChatMissionAdvance( uint8 index ); diff --git a/code/ryzom/server/src/input_output_service/commands.cpp b/code/ryzom/server/src/input_output_service/commands.cpp index 791688408..a406a6b1e 100644 --- a/code/ryzom/server/src/input_output_service/commands.cpp +++ b/code/ryzom/server/src/input_output_service/commands.cpp @@ -615,7 +615,7 @@ NLMISC_COMMAND( displayChatClients, "Display the list of clients", "" ) return true; } -NLMISC_COMMAND( displayChatGroups, "Display the list of chat groups, optionnaly, display universe chat group and/or player audience groups", "[universe] [player]" ) +NLMISC_COMMAND( displayChatGroups, "Display the list of chat groups, optionally, display universe chat group and/or player audience groups", "[universe] [player]" ) { bool displayUniverse = false; bool playerAudience = false; @@ -638,7 +638,7 @@ NLMISC_COMMAND( displayChatGroups, "Display the list of chat groups, optionnaly, return true; } -NLMISC_COMMAND( displayChatAudience, "Display the current chat dynamic audience for a player, optionnaly, force the update", " [update]" ) +NLMISC_COMMAND( displayChatAudience, "Display the current chat dynamic audience for a player, optionally, force the update", " [update]" ) { bool update = false; if (args.size() < 1) diff --git a/code/ryzom/server/src/logger_service/log_query.cpp b/code/ryzom/server/src/logger_service/log_query.cpp index 8d0efb16b..2caa1609e 100644 --- a/code/ryzom/server/src/logger_service/log_query.cpp +++ b/code/ryzom/server/src/logger_service/log_query.cpp @@ -733,7 +733,7 @@ bool CQueryParser::parseDATE(CQueryParser::iterator &it, CQueryParser::iterator goto noHour; if (!parseINT(it, end)) goto noHour; - // optionnal sec + // optional sec rew = it; if (getNextToken(it, end).TokenType != tt_COLON) goto noHour; diff --git a/code/ryzom/server/src/shard_unifier_service/name_manager.cpp b/code/ryzom/server/src/shard_unifier_service/name_manager.cpp index ac16c8cfe..6e5b35ddf 100644 --- a/code/ryzom/server/src/shard_unifier_service/name_manager.cpp +++ b/code/ryzom/server/src/shard_unifier_service/name_manager.cpp @@ -83,7 +83,7 @@ bool CNameManager::assignName(uint32 charId, const ucstring & ucName, uint32 hom if (_Names.getBToAMap().find(charSlot) != _Names.getBToAMap().end()) { - // the character is associated to an other name + // the character is associated to another name _Names.removeWithB(charSlot); } diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.h b/code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.h index aa84dd3a4..756b3859d 100644 --- a/code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.h +++ b/code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.h @@ -115,7 +115,7 @@ public: return _VarName; } - /// Evaluate the content of the variable with an optionnal sub part. + /// Evaluate the content of the variable with an optional sub part. virtual std::string evalVar(const std::string &subPart) = 0; /** Factory method to create new variable. Caller become responsible @@ -435,7 +435,7 @@ public: /** Install the generated script into the destination primitive files */ bool installCompiledMission(NLLIGO::CLigoConfig &ligoConfig, const std::string &primFileName); - /// Publish the modified to the path paramater + /// Publish the modified to the path parameter bool publishFiles(const std::string &serverPathPrim, const std::string &serverPathText, const std::string &localPathText); /// Search for text in the file : add it if it's not in diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp b/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp index ce9cfada5..47bcdf896 100644 --- a/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp +++ b/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp @@ -1741,7 +1741,7 @@ class CContentKill : public CContentObjective } - // add optionnal place + // add optional place if (!_Place._VarValue.empty()) { for (uint i=0; i _Properties; - // Optionnal action (enchantement) + // Optional action (enchantement) string _Action; // Name of the item CPhrase _ItemPhrase; diff --git a/code/ryzom/tools/translation_tools/main.cpp b/code/ryzom/tools/translation_tools/main.cpp index 4ab357638..53d84cc02 100644 --- a/code/ryzom/tools/translation_tools/main.cpp +++ b/code/ryzom/tools/translation_tools/main.cpp @@ -153,7 +153,7 @@ void showUsage(char *exeName) LOG(" extract_bot_names [-r]\n"); LOG(" extract_new_sheet_names [-r]\n"); LOG("\n"); - LOG("Language code are ISO 639-2 + optionnaly ISO 3166 country code.\n"); + LOG("Language code are ISO 639-2 + optionally ISO 3166 country code.\n"); LOG("Reference language is always the first language in languages.txt\n"); }