From 2dd0bed9d99f66f04b261a7bdbf98f5b30f5c6f5 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 1 Feb 2013 21:58:05 +0100 Subject: [PATCH 1/9] Changed: Use OpenGL by default with an ATI card and without a warning dialog --- code/ryzom/client/src/init.cpp | 38 +--------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp index f8ea4aa04..0b6a9cf42 100644 --- a/code/ryzom/client/src/init.cpp +++ b/code/ryzom/client/src/init.cpp @@ -533,31 +533,6 @@ void checkDriverVersion() nlwarning ("Can't check video driver version"); } -void checkNoATIOpenGL() -{ - string deviceName; - uint64 driverVersion; - if (CSystemInfo::getVideoInfo (deviceName, driverVersion)) - { - string lwr = deviceName; - strlwr(lwr); - if (lwr.find (ATI_RECOMMANDED_DRIVERS_STRING_TEST)!=string::npos && ClientCfg.Driver3D==CClientConfig::OpenGL) - { - // special case for radeon 7500 or less : doesn't issue message since doesn't work with Direct3D for now - if (!(strstr(lwr.c_str() , "radeon 7000") || strstr(lwr.c_str() , "radeon 7200") || strstr(lwr.c_str() , "radeon 7500"))) - { - ucstring message= CI18N::get("uiUseATID3D"); - if (ClientQuestion (message)) - { - ClientCfg.Driver3D= CClientConfig::DrvAuto; - ClientCfg.writeString("Driver3D", "Auto"); - ClientCfg.ConfigFile.save(); - } - } - } - } -} - void checkDriverDepth () { // Check desktop is in 32 bit else no window mode allowed. @@ -815,8 +790,6 @@ void prelogInit() // Check driver version checkDriverVersion(); - // Check ATI not in OpenGL - checkNoATIOpenGL(); // Create the driver (most important part of the client). nmsg = "Creating 3d driver..."; ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) ); @@ -831,21 +804,12 @@ void prelogInit() switch(ClientCfg.Driver3D) { - case CClientConfig::DrvAuto: #ifdef NL_OS_WINDOWS - { - // Fallback to D3D for card other than nVidia - std::string deviceName; - uint64 drvVersion; - CSystemInfo::getVideoInfo(deviceName, drvVersion); - strlwr(deviceName); - driver = strstr(deviceName.c_str(), NVIDIA_RECOMMANDED_DRIVERS_STRING_TEST) == NULL ? UDriver::Direct3d:UDriver::OpenGl; - } - break; case CClientConfig::Direct3D: driver = UDriver::Direct3d; break; #endif // NL_OS_WINDOWS + case CClientConfig::DrvAuto: case CClientConfig::OpenGL: driver = UDriver::OpenGl; break; From 98606fb5b5ba1df316550714bfadd556692e1e81 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 8 Feb 2013 13:17:44 +0100 Subject: [PATCH 2/9] Changed: Typo fixes (thanks to Vagrant!) --- code/nel/include/nel/3d/anim_detail_trav.h | 2 +- code/nel/include/nel/3d/camera.h | 2 +- code/nel/include/nel/3d/clip_trav.h | 2 +- code/nel/include/nel/3d/landscape_def.h | 6 ++--- code/nel/include/nel/3d/landscape_model.h | 2 +- code/nel/include/nel/3d/load_balancing_trav.h | 2 +- code/nel/include/nel/3d/mesh_base_instance.h | 2 +- code/nel/include/nel/3d/mesh_instance.h | 2 +- code/nel/include/nel/3d/mesh_mrm_instance.h | 2 +- .../nel/3d/mesh_mrm_skinned_instance.h | 2 +- .../include/nel/3d/mesh_multi_lod_instance.h | 2 +- .../include/nel/3d/meshvp_per_pixel_light.h | 2 +- code/nel/include/nel/3d/patch.h | 2 +- code/nel/include/nel/3d/point_light_model.h | 2 +- .../include/nel/3d/ps_attrib_maker_template.h | 2 +- .../include/nel/3d/quad_grid_clip_manager.h | 2 +- code/nel/include/nel/3d/render_trav.h | 2 +- code/nel/include/nel/3d/root_model.h | 2 +- code/nel/include/nel/3d/seg_remanence.h | 2 +- code/nel/include/nel/3d/skeleton_model.h | 2 +- code/nel/include/nel/3d/transform.h | 4 ++-- code/nel/include/nel/3d/transform_shape.h | 2 +- .../nel/3d/vegetable_blend_layer_model.h | 2 +- .../include/nel/misc/stl_block_allocator.h | 2 +- code/nel/include/nel/misc/xml_pack.h | 2 +- code/nel/nel-config.in | 2 +- code/nel/samples/pacs/readme.txt | 2 +- .../src/3d/driver/direct3d/driver_direct3d.h | 4 ++-- code/nel/src/3d/tessellation.cpp | 2 +- code/nel/src/3d/vertex_program_parse.cpp | 6 ++--- code/nel/src/3d/zone_lighter.cpp | 2 +- code/nel/src/logic/logic_state_machine.cpp | 2 +- .../src/misc/config_file/cf_gramatical.ypp | 2 +- code/nel/src/net/message.cpp | 2 +- code/nel/src/sound/context_sound.cpp | 2 +- .../tools/3d/build_gamedata/cfg/panoply.cfg | 2 +- .../src/plugins/bnp_manager/bnp_file.cpp | 24 +++++++++---------- .../particle_system/located_bindable_form.ui | 2 +- .../translation_manager/ftp_selection.ui | 2 +- .../src/translations/object_viewer_qt_de.ts | 2 +- .../src/translations/object_viewer_qt_en.ts | 2 +- .../src/translations/object_viewer_qt_fr.ts | 2 +- .../src/translations/object_viewer_qt_ru.ts | 2 +- code/nel/tools/3d/panoply_maker/panoply.cfg | 2 +- .../3d/plugin_max/max_material_support.txt | 4 ++-- .../plugin_max/nel_export/nel_export_view.cpp | 2 +- .../3d/plugin_max/nel_mesh_lib/calc_lm.cpp | 2 +- .../nel_mesh_lib/export_skinning.cpp | 2 +- .../nel_patch_lib/nel_patch_mesh.cpp | 2 +- .../scripts/nel_assets_png_batched.ms | 2 +- .../scripts/nel_batched_mergesave.ms | 2 +- .../plugin_max/scripts/nel_batched_script.ms | 2 +- code/nel/tools/3d/zone_dump/zone_dump.cpp | 2 +- .../misc/make_sheet_id/make_sheet_id.cpp | 8 +++---- .../admin_executor_service.cpp | 2 +- code/nelns/login_system/database/nel.sql | 4 ++-- .../data/gamedev/interfaces_v3/interface.txt | 2 +- .../data/gamedev/interfaces_v3/inventory.xml | 4 ++-- code/ryzom/client/src/client_cfg.h | 2 +- .../client/src/client_sheets/item_sheet.h | 2 +- .../src/interface_v3/bot_chat_page_trade.h | 2 +- .../interface_v3/interface_expr_user_fct.cpp | 4 ++-- .../src/interface_v3/inventory_manager.cpp | 4 ++-- .../src/interface_v3/inventory_manager.h | 2 +- .../client/src/interface_v3/view_text.cpp | 2 +- .../client/src/interfaces_manager/osd.cpp | 2 +- .../ryzom/client/src/interfaces_manager/osd.h | 2 +- .../source/scintilla/LexBaan.cxx | 2 +- .../source/scintilla/LexCPP.cxx | 2 +- code/ryzom/client/src/player_cl.cpp | 2 +- code/ryzom/client/src/player_r2_cl.cpp | 2 +- .../ryzom/client/src/r2/dmc/action_historic.h | 2 +- code/ryzom/client/src/scene_parser.cpp | 2 +- code/ryzom/common/data_common/msg.xml | 4 ++-- .../class_doc/user_model.html | 2 +- code/ryzom/common/src/game_share/item_infos.h | 8 +++---- .../common/src/game_share/msg_client_server.h | 6 ++--- .../game_share/ring_session_manager_itf.xml | 2 +- .../server/entities_game_service_default.cfg | 2 +- .../sheet_pack_cfg/entities_game_service.cfg | 2 +- .../server/src/admin_modules/aes_module.cpp | 2 +- code/ryzom/server/src/ai_service/commands.cpp | 8 +++---- .../doc/source/primitive_parsing.dox | 2 +- .../server/src/ai_service/script_compiler.cpp | 2 +- .../server/src/ai_service/script_parser.yacc | 18 +++++++------- .../src/ai_service/script_parser_yacc.cpp | 18 +++++++------- .../egs_sheets/egs_static_brick.cpp | 2 +- .../entity_manager/entity_base.cpp | 4 ++-- .../guild_manager/fame_manager.cpp | 2 +- .../special_power_enchant_weapon.cpp | 4 ++-- .../player_manager/character.cpp | 2 +- .../character_inventory_manipulation.cpp | 6 ++--- .../src/input_output_service/chat_manager.cpp | 2 +- .../src/monitor_service/service_main.cpp | 4 ++-- .../server/src/shard_unifier_service/nel.sql | 2 +- .../ring_session_manager.cpp | 2 +- .../testing_tool_service.h | 2 +- .../georges_dll/georges_edit_doc.h | 4 ++-- .../icon_search/icon_search_default.cfg | 2 +- .../world_editor/land_export_lib/export.cpp | 2 +- .../world_editor/builder_zone_region.h | 2 +- .../world_editor/world_editor/main_frm.h | 2 +- .../world_editor/plugin_interface.h | 2 +- .../world_editor_plugin/plugin.cpp | 2 +- .../plugin.cpp | 2 +- code/ryzom/tools/scripts/linux/build | 4 ++-- .../server/admin/jpgraph/jpgraph_gantt.php | 2 +- .../server/admin/jpgraph/jpgraph_pie.php | 2 +- .../server/sql/ryzom_admin_default_data.sql | 2 +- code/ryzom/tools/server/sql/ryzom_tables.sql | 4 ++-- .../ryzom/tools/server/www/login/r2_login.php | 2 +- .../webtt/cake/libs/view/helpers/cache.php | 2 +- code/snowballs2/server/position/src/main.cpp | 4 ++-- code/tool/build/build | 4 ++-- code/web/api/common/auth.php | 4 ++-- 115 files changed, 176 insertions(+), 176 deletions(-) diff --git a/code/nel/include/nel/3d/anim_detail_trav.h b/code/nel/include/nel/3d/anim_detail_trav.h index 471ccd52b..7b51afe84 100644 --- a/code/nel/include/nel/3d/anim_detail_trav.h +++ b/code/nel/include/nel/3d/anim_detail_trav.h @@ -71,7 +71,7 @@ public: // For clipTrav. cleared at beginning of CClipTrav::traverse void clearVisibleList(); - // For ClipTrav only. NB: list is cleared at begining of traverse(). NB: only CTransform are supported + // For ClipTrav only. NB: list is cleared at begininng of traverse(). NB: only CTransform are supported void addVisibleModel(CTransform *model) { _VisibleList[_CurrentNumVisibleModels]= model; diff --git a/code/nel/include/nel/3d/camera.h b/code/nel/include/nel/3d/camera.h index 431998f8a..3185dfe7b 100644 --- a/code/nel/include/nel/3d/camera.h +++ b/code/nel/include/nel/3d/camera.h @@ -68,7 +68,7 @@ public: class CCamera : public CTransform { public: - /// Call at the begining of the program, to register the model + /// Call at the beginning of the program, to register the model static void registerBasic(); diff --git a/code/nel/include/nel/3d/clip_trav.h b/code/nel/include/nel/3d/clip_trav.h index e892ee02e..10dd9dccb 100644 --- a/code/nel/include/nel/3d/clip_trav.h +++ b/code/nel/include/nel/3d/clip_trav.h @@ -93,7 +93,7 @@ public: /// \name Visible List mgt. Those visible models are updated each traverse(). //@{ - // NB: list is cleared at begining of traverse(). + // NB: list is cleared at beginning of traverse(). void addVisibleModel(CTransform *model) { model->_IndexInVisibleList= _CurrentNumVisibleModels; diff --git a/code/nel/include/nel/3d/landscape_def.h b/code/nel/include/nel/3d/landscape_def.h index ce90c5b4a..c189a428f 100644 --- a/code/nel/include/nel/3d/landscape_def.h +++ b/code/nel/include/nel/3d/landscape_def.h @@ -81,14 +81,14 @@ class IDriver; class CLandscapeGlobals { public: - // LANDSCAPE RENDERING CONTEXT. Landscape must setup it at the begining at refine()/render(). + // LANDSCAPE RENDERING CONTEXT. Landscape must setup it at the beginning at refine()/render(). // The current date of LandScape for refine only. static sint CurrentDate; // The current date of LandScape for render only. static sint CurrentRenderDate; // The center view for refinement. static CVector RefineCenter; - // What is the treshold for tessellation. + // What is the threshold for tessellation. static float RefineThreshold; // Guess. static float OORefineThreshold; @@ -143,7 +143,7 @@ public: static CLandscapeVBAllocator *CurrentTileVBAllocator; - // PATCH GLOBAL INTERFACE. patch must setup them at the begining at refine()/render(). + // PATCH GLOBAL INTERFACE. patch must setup them at the beginning at refine()/render(). // NO!!! REMIND: can't have any patch global, since a propagated split()/updateErrorMetric() // can arise. must use Patch pointer. diff --git a/code/nel/include/nel/3d/landscape_model.h b/code/nel/include/nel/3d/landscape_model.h index f9ca071bd..981e3e972 100644 --- a/code/nel/include/nel/3d/landscape_model.h +++ b/code/nel/include/nel/3d/landscape_model.h @@ -42,7 +42,7 @@ const NLMISC::CClassId LandscapeModelId=NLMISC::CClassId(0x5a573b55, 0x6b395829 class CLandscapeModel : public CTransform { public: - /// Call at the begining of the program, to register the model + /// Call at the beginning of the program, to register the model static void registerBasic(); public: diff --git a/code/nel/include/nel/3d/load_balancing_trav.h b/code/nel/include/nel/3d/load_balancing_trav.h index 37bd69ddd..43d5c95d8 100644 --- a/code/nel/include/nel/3d/load_balancing_trav.h +++ b/code/nel/include/nel/3d/load_balancing_trav.h @@ -165,7 +165,7 @@ public: // For clipTrav. cleared at beginning of CClipTrav::traverse void clearVisibleList(); - // For ClipTrav only. NB: list is cleared at begining of traverse(). + // For ClipTrav only. NB: list is cleared at beginning of traverse(). void addVisibleModel(CTransform *model) { _VisibleList[_CurrentNumVisibleModels]= model; diff --git a/code/nel/include/nel/3d/mesh_base_instance.h b/code/nel/include/nel/3d/mesh_base_instance.h index 4a4091e3c..b045fa414 100644 --- a/code/nel/include/nel/3d/mesh_base_instance.h +++ b/code/nel/include/nel/3d/mesh_base_instance.h @@ -53,7 +53,7 @@ const NLMISC::CClassId MeshBaseInstanceId=NLMISC::CClassId(0xef44331, 0x739f6bc class CMeshBaseInstance : public CTransformShape { public: - /// Call at the begining of the program, to register the model + /// Call at the beginning of the program, to register the model static void registerBasic(); public: diff --git a/code/nel/include/nel/3d/mesh_instance.h b/code/nel/include/nel/3d/mesh_instance.h index c4018913f..17eb7a97a 100644 --- a/code/nel/include/nel/3d/mesh_instance.h +++ b/code/nel/include/nel/3d/mesh_instance.h @@ -49,7 +49,7 @@ const NLMISC::CClassId MeshInstanceId=NLMISC::CClassId(0x6bfe0a34, 0x23b26dc9); class CMeshInstance : public CMeshBaseInstance { public: - /// Call at the begining of the program, to register the model + /// Call at the beginning of the program, to register the model static void registerBasic(); public: diff --git a/code/nel/include/nel/3d/mesh_mrm_instance.h b/code/nel/include/nel/3d/mesh_mrm_instance.h index 03fed2d86..4df6b92f0 100644 --- a/code/nel/include/nel/3d/mesh_mrm_instance.h +++ b/code/nel/include/nel/3d/mesh_mrm_instance.h @@ -49,7 +49,7 @@ const NLMISC::CClassId MeshMRMInstanceId=NLMISC::CClassId(0xec608f3, 0x1111c33) class CMeshMRMInstance : public CMeshBaseInstance { public: - /// Call at the begining of the program, to register the model + /// Call at the beginning of the program, to register the model static void registerBasic(); protected: diff --git a/code/nel/include/nel/3d/mesh_mrm_skinned_instance.h b/code/nel/include/nel/3d/mesh_mrm_skinned_instance.h index 610744a52..71fac9476 100644 --- a/code/nel/include/nel/3d/mesh_mrm_skinned_instance.h +++ b/code/nel/include/nel/3d/mesh_mrm_skinned_instance.h @@ -49,7 +49,7 @@ const NLMISC::CClassId MeshMRMSkinnedInstanceId=NLMISC::CClassId(0x6cfd2619, 0x class CMeshMRMSkinnedInstance : public CMeshBaseInstance { public: - /// Call at the begining of the program, to register the model + /// Call at the beginning of the program, to register the model static void registerBasic(); protected: diff --git a/code/nel/include/nel/3d/mesh_multi_lod_instance.h b/code/nel/include/nel/3d/mesh_multi_lod_instance.h index 2b249678c..549979438 100644 --- a/code/nel/include/nel/3d/mesh_multi_lod_instance.h +++ b/code/nel/include/nel/3d/mesh_multi_lod_instance.h @@ -61,7 +61,7 @@ public: Lod0Blend = 0x1, }; - /// Call at the begining of the program, to register the model + /// Call at the beginning of the program, to register the model static void registerBasic(); /// Last Matrix date for Lods diff --git a/code/nel/include/nel/3d/meshvp_per_pixel_light.h b/code/nel/include/nel/3d/meshvp_per_pixel_light.h index bc211a4b6..d7be0f3f9 100644 --- a/code/nel/include/nel/3d/meshvp_per_pixel_light.h +++ b/code/nel/include/nel/3d/meshvp_per_pixel_light.h @@ -29,7 +29,7 @@ namespace NL3D { /** - * This vertex program is used to perform perpixel lighting with meshs. Its ouputs are : + * This vertex program is used to perform perpixel lighting with meshs. Its outputs are : * * Coord Tex 0 : duplicate the tex Coord 0 set from the v.b. * Coord Tex 1 : The light vector in tangent space. diff --git a/code/nel/include/nel/3d/patch.h b/code/nel/include/nel/3d/patch.h index 4b35660d0..c1363953a 100644 --- a/code/nel/include/nel/3d/patch.h +++ b/code/nel/include/nel/3d/patch.h @@ -808,7 +808,7 @@ private: CTessFarVertex BaseFarVertices[4]; - // Local info for CTessFace tiles. CPatch must setup them at the begining at refine()/render(). + // Local info for CTessFace tiles. CPatch must setup them at the beginning at refine()/render(). // For Far Texture coordinates. float Far0UScale, Far0VScale, Far0UBias, Far0VBias; float Far1UScale, Far1VScale, Far1UBias, Far1VBias; diff --git a/code/nel/include/nel/3d/point_light_model.h b/code/nel/include/nel/3d/point_light_model.h index a9da70661..2ca3e46d3 100644 --- a/code/nel/include/nel/3d/point_light_model.h +++ b/code/nel/include/nel/3d/point_light_model.h @@ -55,7 +55,7 @@ const NLMISC::CClassId PointLightModelId=NLMISC::CClassId(0x7e842eba, 0x140b6c6 class CPointLightModel : public CTransform { public: - /// Call at the begining of the program, to register the model + /// Call at the beginning of the program, to register the model static void registerBasic(); diff --git a/code/nel/include/nel/3d/ps_attrib_maker_template.h b/code/nel/include/nel/3d/ps_attrib_maker_template.h index 8d7b68ba2..92953b86f 100644 --- a/code/nel/include/nel/3d/ps_attrib_maker_template.h +++ b/code/nel/include/nel/3d/ps_attrib_maker_template.h @@ -29,7 +29,7 @@ namespace NL3D { /* * In this file, we define several template that helps to create attributes maker such as gradient (of float, int, vector etc) * attributes maker are used in the particle system to generate values, such as size, color etc. see ps_attrib_maker.h - * for more informations + * for more information */ diff --git a/code/nel/include/nel/3d/quad_grid_clip_manager.h b/code/nel/include/nel/3d/quad_grid_clip_manager.h index 7e32c07b3..54d427a8b 100644 --- a/code/nel/include/nel/3d/quad_grid_clip_manager.h +++ b/code/nel/include/nel/3d/quad_grid_clip_manager.h @@ -55,7 +55,7 @@ const NLMISC::CClassId QuadGridClipManagerId=NLMISC::CClassId(0x1ffb079a, 0x6c5 class CQuadGridClipManager : public CTransform { public: - /// Call at the begining of the program, to register the model + /// Call at the beginning of the program, to register the model static void registerBasic(); public: diff --git a/code/nel/include/nel/3d/render_trav.h b/code/nel/include/nel/3d/render_trav.h index 271165427..6e8d04b32 100644 --- a/code/nel/include/nel/3d/render_trav.h +++ b/code/nel/include/nel/3d/render_trav.h @@ -227,7 +227,7 @@ public: enum {MaxVPLight= 4}; /** reset the lighting setup in the driver (all lights are disabled). - * called at begining of traverse(). Must be called by any model (before and after rendering) + * called at beginning of traverse(). Must be called by any model (before and after rendering) * that wish to use CDriver::setLight() instead of the standard behavior with changeLightSetup() */ void resetLightSetup(); diff --git a/code/nel/include/nel/3d/root_model.h b/code/nel/include/nel/3d/root_model.h index 3faa5b675..d54ad7c20 100644 --- a/code/nel/include/nel/3d/root_model.h +++ b/code/nel/include/nel/3d/root_model.h @@ -39,7 +39,7 @@ const NLMISC::CClassId RootModelId=NLMISC::CClassId(0x25f0505d, 0x75c69f9); class CRootModel : public CTransform { public: - /// Call at the begining of the program, to register the model + /// Call at the beginning of the program, to register the model static void registerBasic(); diff --git a/code/nel/include/nel/3d/seg_remanence.h b/code/nel/include/nel/3d/seg_remanence.h index dddfa3a61..2e3202a89 100644 --- a/code/nel/include/nel/3d/seg_remanence.h +++ b/code/nel/include/nel/3d/seg_remanence.h @@ -54,7 +54,7 @@ public: CSegRemanence(CSegRemanence &other); CSegRemanence &operator = (CSegRemanence &other); //@} - /// Call at the begining of the program, to register the model + /// Call at the beginning of the program, to register the model static void registerBasic(); /// to instanciate that model from a scene static CTransform *creator() { return new CSegRemanence; } diff --git a/code/nel/include/nel/3d/skeleton_model.h b/code/nel/include/nel/3d/skeleton_model.h index 196cc680c..ed4f8aadc 100644 --- a/code/nel/include/nel/3d/skeleton_model.h +++ b/code/nel/include/nel/3d/skeleton_model.h @@ -79,7 +79,7 @@ public: /// max number of bones supported in skeleton enum { MaxNumBones = 256 }; - /// Call at the begining of the program, to register the model + /// Call at the beginning of the program, to register the model static void registerBasic(); public: diff --git a/code/nel/include/nel/3d/transform.h b/code/nel/include/nel/3d/transform.h index cf8d3031f..00e023331 100644 --- a/code/nel/include/nel/3d/transform.h +++ b/code/nel/include/nel/3d/transform.h @@ -90,7 +90,7 @@ const NLMISC::CClassId TransformId=NLMISC::CClassId(0x174750cb, 0xf952024); class CTransform : public ITransformable { public: - /// Call at the begining of the program, to register the model + /// Call at the beginning of the program, to register the model static void registerBasic(); /// get the scene which has created us @@ -113,7 +113,7 @@ public: /** * Extra init for a model. this method is called by the framework at the very end of CScene::createModel() * Warning! if the model is a CTransformShape, then when initModel() is called, Shape and other related member/setup - * of IShape::createInstance() are not yet done (because createModel() is called at the begining in createInstance()). + * of IShape::createInstance() are not yet done (because createModel() is called at the beginning in createInstance()). * * Because initModel() is called at the very end, deriver could implement anything like creating other models, * but not deleting this model... diff --git a/code/nel/include/nel/3d/transform_shape.h b/code/nel/include/nel/3d/transform_shape.h index 28c5602c3..7bffe971a 100644 --- a/code/nel/include/nel/3d/transform_shape.h +++ b/code/nel/include/nel/3d/transform_shape.h @@ -55,7 +55,7 @@ const NLMISC::CClassId TransformShapeId=NLMISC::CClassId(0x1e6115e6, 0x63502517 class CTransformShape : public CTransform { public: - /// Call at the begining of the program, to register the model + /// Call at the beginning of the program, to register the model static void registerBasic(); public: diff --git a/code/nel/include/nel/3d/vegetable_blend_layer_model.h b/code/nel/include/nel/3d/vegetable_blend_layer_model.h index ea37a0e4d..1f8840de9 100644 --- a/code/nel/include/nel/3d/vegetable_blend_layer_model.h +++ b/code/nel/include/nel/3d/vegetable_blend_layer_model.h @@ -48,7 +48,7 @@ const NLMISC::CClassId VegetableBlendLayerModelId=NLMISC::CClassId(0x77375163, class CVegetableBlendLayerModel : public CTransform { public: - /// Call at the begining of the program, to register the model + /// Call at the beginning of the program, to register the model static void registerBasic(); public: diff --git a/code/nel/include/nel/misc/stl_block_allocator.h b/code/nel/include/nel/misc/stl_block_allocator.h index 56afd24e4..5e38b573c 100644 --- a/code/nel/include/nel/misc/stl_block_allocator.h +++ b/code/nel/include/nel/misc/stl_block_allocator.h @@ -44,7 +44,7 @@ namespace NLMISC { * will assert when allocations will occur). * * To construct a container which use this allocator, do like this: - * list> myList( ptrOnBlockMemory ); + * list > myList( ptrOnBlockMemory ); * * But see CSTLBlockList for easier list instanciation, because using it, you'll do like this: * CSTLBlockList myList(ptrOnBlockMemory); diff --git a/code/nel/include/nel/misc/xml_pack.h b/code/nel/include/nel/misc/xml_pack.h index 555f3bb09..5dc2f5b2f 100644 --- a/code/nel/include/nel/misc/xml_pack.h +++ b/code/nel/include/nel/misc/xml_pack.h @@ -69,7 +69,7 @@ namespace NLMISC * return true and advance the it iterator if match is found. */ bool matchString(std::string::iterator &it, std::string::iterator end, const char *text); - /// Advance up to the begining of the next line, incrementing the in/out param lineCount + /// Advance up to the beginning of the next line, incrementing the in/out param lineCount void skipLine(std::string::iterator &it, std::string::iterator end, uint32 &lineCount); ///@} diff --git a/code/nel/nel-config.in b/code/nel/nel-config.in index 063900903..39e6afe9c 100644 --- a/code/nel/nel-config.in +++ b/code/nel/nel-config.in @@ -5,7 +5,7 @@ # nel-config # # Script printing NeL's install library/include paths and some other -# informations like NeL's version +# information like NeL's version # prefix=@prefix@ diff --git a/code/nel/samples/pacs/readme.txt b/code/nel/samples/pacs/readme.txt index 9f3c0424e..e78327b3a 100644 --- a/code/nel/samples/pacs/readme.txt +++ b/code/nel/samples/pacs/readme.txt @@ -12,7 +12,7 @@ This sample show: - Managing several dynamic world image - Moving PACS primitives - Managing collisions -- Get triggered informations by collisions (flashes) +- Get triggered information by collisions (flashes) ---------------- diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.h b/code/nel/src/3d/driver/direct3d/driver_direct3d.h index 351cf10d0..cff7cb804 100644 --- a/code/nel/src/3d/driver/direct3d/driver_direct3d.h +++ b/code/nel/src/3d/driver/direct3d/driver_direct3d.h @@ -640,7 +640,7 @@ public: void *lock (uint size, uint stride, uint &offset); void unlock (); - // Runtime reset (called at the begining of the frame rendering), blocking lock here. + // Runtime reset (called at the beginning of the frame rendering), blocking lock here. void reset (); }; @@ -670,7 +670,7 @@ public: void *lock (uint size, uint &offset); void unlock (); - // Runtime reset (called at the begining of the frame rendering), blocking lock here. + // Runtime reset (called at the beginning of the frame rendering), blocking lock here. void reset (); }; diff --git a/code/nel/src/3d/tessellation.cpp b/code/nel/src/3d/tessellation.cpp index 8f6dd5134..8940358c3 100644 --- a/code/nel/src/3d/tessellation.cpp +++ b/code/nel/src/3d/tessellation.cpp @@ -202,7 +202,7 @@ CTessFace::~CTessFace() // *************************************************************************** float CTessFace::computeNearLimit() { - // General formula for Level, function of Size, treshold etc...: + // General formula for Level, function of Size, threshold etc...: // WantedLevel= log2(BaseSize / sqrdist / RefineThreshold); // <=> WantedLevel= log2( CurSize*2^Level / sqrdist / RefineThreshold). // <=> WantedLevel= log2( ProjectedSize* 2^Level / RefineThreshold). diff --git a/code/nel/src/3d/vertex_program_parse.cpp b/code/nel/src/3d/vertex_program_parse.cpp index 25ed6e9f4..9b535d551 100644 --- a/code/nel/src/3d/vertex_program_parse.cpp +++ b/code/nel/src/3d/vertex_program_parse.cpp @@ -146,7 +146,7 @@ bool CVPParser::parseOperand(CVPOperand &operand, bool outputOperand, std::strin break; case 'A': result = parseAddressRegister(operand, errorOutput); break; case '-': - errorOutput = "Negation not allowed on ouput register."; + errorOutput = "Negation not allowed on output register."; return false; default: errorOutput = "Output, Address, or Temporary register expected as an output operand."; @@ -365,7 +365,7 @@ bool CVPParser::parseOutputRegister(CVPOperand &operand, std::string &errorOutpu operand.Type = CVPOperand::OutputRegister; if (*_CurrChar != '[') { - errorOutput = "'[' expected when parsing an ouput register."; + errorOutput = "'[' expected when parsing an output register."; return false; } ++_CurrChar; @@ -565,7 +565,7 @@ bool CVPParser::parseAddressRegister(CVPOperand &operand, std::string &errorOutp bool CVPParser::parseOp2(CVPInstruction &instr,std::string &errorOutput) { skipSpacesAndComments(); - // parse ouput + // parse output if (!parseOperand(instr.Dest, true, errorOutput)) return false; // Can't write in input or consant register if (instr.Dest.Type == CVPOperand::Constant || instr.Dest.Type == CVPOperand::InputRegister) diff --git a/code/nel/src/3d/zone_lighter.cpp b/code/nel/src/3d/zone_lighter.cpp index 8ed47c673..112df54e0 100644 --- a/code/nel/src/3d/zone_lighter.cpp +++ b/code/nel/src/3d/zone_lighter.cpp @@ -2781,7 +2781,7 @@ void CZoneLighter::computeTileFlagsOnly (CLandscape &landscape, CZone& output, u // can't copy tile flags if(!ok) - throw Exception("The input zonew, and ouput zonel are too different: not same patchs!!"); + throw Exception("The input zonew, and output zonel are too different: not same patchs!!"); /// copy the tiles flags from the zone to light to the output zone copyTileFlags(output, zonew); diff --git a/code/nel/src/logic/logic_state_machine.cpp b/code/nel/src/logic/logic_state_machine.cpp index 1694936d3..0edc7bd14 100644 --- a/code/nel/src/logic/logic_state_machine.cpp +++ b/code/nel/src/logic/logic_state_machine.cpp @@ -426,7 +426,7 @@ void CLogicStateMachine::setVerbose( string varName, bool b ) filter = 1; } else - // xxx* => we look for a string with xxx at the begining + // xxx* => we look for a string with xxx at the beginning if( varName[varName.size()-1]=='*' ) { motif = varName.substr(0,varName.size()-1); diff --git a/code/nel/src/misc/config_file/cf_gramatical.ypp b/code/nel/src/misc/config_file/cf_gramatical.ypp index 4b6a2707e..199f3df9a 100644 --- a/code/nel/src/misc/config_file/cf_gramatical.ypp +++ b/code/nel/src/misc/config_file/cf_gramatical.ypp @@ -225,7 +225,7 @@ inst: VARIABLE ADD_ASSIGN expression SEMICOLON } else { - // this var has been created in a parent Cfg, append at the begining of the array + // this var has been created in a parent Cfg, append at the beginning of the array Var.add ((*((vector*)(YYPARSE_PARAM)))[i]); if (Var != (*((vector*)(YYPARSE_PARAM)))[i] && Var.Callback != NULL) (Var.Callback)(Var); diff --git a/code/nel/src/net/message.cpp b/code/nel/src/net/message.cpp index 0f9c40562..5110bed45 100644 --- a/code/nel/src/net/message.cpp +++ b/code/nel/src/net/message.cpp @@ -79,7 +79,7 @@ CMessage::CMessage (NLMISC::CMemStream &memstr) : else invert(); // calls readType() if ( ! reading ) - invert(); // set ouput mode back if necessary + invert(); // set output mode back if necessary seek( pos, begin ); // sets the same position as the one in the memstream } diff --git a/code/nel/src/sound/context_sound.cpp b/code/nel/src/sound/context_sound.cpp index 71ffb9b20..d1403c7c9 100644 --- a/code/nel/src/sound/context_sound.cpp +++ b/code/nel/src/sound/context_sound.cpp @@ -276,7 +276,7 @@ void CContextSound::init() if (i == _BaseName.size()) { // The base name is ok, check that the next char is a digit (avoid conflit if some - // sound have a longeur base name with same begining) + // sound have a longeur base name with same beginning) if (soundName[i] >= '0' && soundName[i] <= '9') _ContextSounds->addSound(CAudioMixerUser::instance()->getSoundId(*first), _BaseName); } diff --git a/code/nel/tools/3d/build_gamedata/cfg/panoply.cfg b/code/nel/tools/3d/build_gamedata/cfg/panoply.cfg index ab0fccfa4..c3b96c39e 100644 --- a/code/nel/tools/3d/build_gamedata/cfg/panoply.cfg +++ b/code/nel/tools/3d/build_gamedata/cfg/panoply.cfg @@ -6,7 +6,7 @@ // additionnal paths to search for masks textures //additionnal_paths = { "panoply" }; -// the ouput path for result textures +// the output path for result textures output_path = "tga"; // A character that is used to generate output names when a mask is not defined for a texture. diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.cpp index 3d755ba47..8cae1164b 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.cpp @@ -116,13 +116,13 @@ bool BNPFileHandle::readHeader(const std::string &filePath) uint32 nFileSize = bnp.getFileSize(); bnp.seek(nFileSize-sizeof(uint32), IStream::begin); - uint32 nOffsetFromBegining; + uint32 nOffsetFromBeginning; - bnp.serial(nOffsetFromBegining); + bnp.serial(nOffsetFromBeginning); - if ( !bnp.seek (nOffsetFromBegining, IStream::begin) ) + if ( !bnp.seek (nOffsetFromBeginning, IStream::begin) ) { - nlwarning("Could not read offset from begining"); + nlwarning("Could not read offset from beginning"); bnp.close(); return false; } @@ -206,7 +206,7 @@ void BNPFileHandle::fileNames(std::vector &fileNames) // *************************************************************************** void BNPFileHandle::addFiles( const vector &filePathes) { - uint32 OffsetFromBegining = 0; + uint32 OffsetFromBeginning = 0; // create packed files and add them to the private vector vector::const_iterator it_vec = filePathes.begin(); @@ -233,13 +233,13 @@ void BNPFileHandle::addFiles( const vector &filePathes) { append(m_openedBNPFile + ".tmp", *it_packed); // Set now the new offset for the new header - it_packed->m_pos = OffsetFromBegining; - OffsetFromBegining += it_packed->m_size; + it_packed->m_pos = OffsetFromBeginning; + OffsetFromBeginning += it_packed->m_size; it_packed++; } - writeHeader(m_openedBNPFile + ".tmp", OffsetFromBegining); + writeHeader(m_openedBNPFile + ".tmp", OffsetFromBeginning); // Delete any previous existing file if (CFile::fileExists( m_openedBNPFile )) @@ -252,7 +252,7 @@ void BNPFileHandle::deleteFiles( const vector& fileNames) { vector::const_iterator it_vec; TPackedFilesList::iterator it_packed; - uint32 OffsetFromBegining = 0; + uint32 OffsetFromBeginning = 0; string tmpFile = m_openedBNPFile + ".tmp"; // create a new temporary bnp file with extension *.tmp @@ -270,14 +270,14 @@ void BNPFileHandle::deleteFiles( const vector& fileNames) { append(tmpFile, *it_packed); // Set now the new offset for the new header - it_packed->m_pos = OffsetFromBegining; - OffsetFromBegining += it_packed->m_size; + it_packed->m_pos = OffsetFromBeginning; + OffsetFromBeginning += it_packed->m_size; it_packed++; } } - writeHeader(tmpFile, OffsetFromBegining); + writeHeader(tmpFile, OffsetFromBeginning); CFile::deleteFile( m_openedBNPFile ); string src = m_openedBNPFile + ".tmp"; diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_form.ui index 491d68f16..857f9c241 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_form.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_form.ui @@ -395,7 +395,7 @@ - Fake motion blur treshold: + Fake motion blur threshold: diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ftp_selection.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ftp_selection.ui index 7b3041c04..026b6dcfd 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ftp_selection.ui +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/ftp_selection.ui @@ -17,7 +17,7 @@ - FTP Server informations + FTP Server information diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_de.ts b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_de.ts index a2c2cb40e..696013950 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_de.ts +++ b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_de.ts @@ -855,7 +855,7 @@ - Fake motion blur treshold: + Fake motion blur threshold: diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_en.ts b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_en.ts index ac130014d..4e1e28ab8 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_en.ts +++ b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_en.ts @@ -855,7 +855,7 @@ - Fake motion blur treshold: + Fake motion blur threshold: diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_fr.ts b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_fr.ts index f5c0c68af..3d2b9f8bd 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_fr.ts +++ b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_fr.ts @@ -855,7 +855,7 @@ - Fake motion blur treshold: + Fake motion blur threshold: diff --git a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_ru.ts b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_ru.ts index e67722c12..f86ccaa90 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_ru.ts +++ b/code/nel/tools/3d/object_viewer_qt/src/translations/object_viewer_qt_ru.ts @@ -855,7 +855,7 @@ - Fake motion blur treshold: + Fake motion blur threshold: diff --git a/code/nel/tools/3d/panoply_maker/panoply.cfg b/code/nel/tools/3d/panoply_maker/panoply.cfg index 2cbb8fe1e..9e1300d4b 100644 --- a/code/nel/tools/3d/panoply_maker/panoply.cfg +++ b/code/nel/tools/3d/panoply_maker/panoply.cfg @@ -19,7 +19,7 @@ additionnal_paths = { "panoply", "data" }; // The input path for textures input_path = "panoply"; -// the ouput path for result textures +// the output path for result textures output_path = "png"; // output files format used diff --git a/code/nel/tools/3d/plugin_max/max_material_support.txt b/code/nel/tools/3d/plugin_max/max_material_support.txt index b0c107a9e..24500db00 100644 --- a/code/nel/tools/3d/plugin_max/max_material_support.txt +++ b/code/nel/tools/3d/plugin_max/max_material_support.txt @@ -6,7 +6,7 @@ SUMMARY --> Export those informations from stdmat +-> Export those information from stdmat -> How to use lightmaps -> How to use "color vertex" -> How to use "alpha vertex" @@ -15,7 +15,7 @@ SUMMARY ------------------------------------------------- --> Export those informations from stdmat +-> Export those information from stdmat * Ambiant color * Diffuse color diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp b/code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp index 81efc7d4c..f4d5fdaf2 100644 --- a/code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp +++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp @@ -714,7 +714,7 @@ void CNelExport::viewMesh (TimeValue time) // Delete the pointer IObjectViewer::releaseInterface (view); - // Collisions informations are no more used. + // Collisions information are no more used. delete slInfo.RetrieverBank; delete slInfo.GlobalRetriever; } diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp b/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp index 0f08dd163..27ba7b796 100644 --- a/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp +++ b/code/nel/tools/3d/plugin_max/nel_mesh_lib/calc_lm.cpp @@ -298,7 +298,7 @@ void SLightBuild::convertFromMaxLight (INode *node,TimeValue tvTime) } #endif // (MAX_RELEASE < 4000) - // Get Soft Shadow informations + // Get Soft Shadow information string sTmp = CExportNel::getScriptAppData (node, NEL3D_APPDATA_SOFTSHADOW_RADIUS, toString(NEL3D_APPDATA_SOFTSHADOW_RADIUS_DEFAULT)); this->rSoftShadowRadius = (float)atof(sTmp.c_str()); sTmp = CExportNel::getScriptAppData (node, NEL3D_APPDATA_SOFTSHADOW_CONELENGTH, toString(NEL3D_APPDATA_SOFTSHADOW_CONELENGTH_DEFAULT)); diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_skinning.cpp b/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_skinning.cpp index 61213df85..41741f86d 100644 --- a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_skinning.cpp +++ b/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_skinning.cpp @@ -1470,7 +1470,7 @@ bool CExportNel::mirrorPhysiqueSelection(INode &node, TimeValue tvTime, const st } - // **** Build the ouput vertices + // **** Build the output vertices std::vector vertOut; vertOut.reserve(tempVertex.size()); diff --git a/code/nel/tools/3d/plugin_max/nel_patch_lib/nel_patch_mesh.cpp b/code/nel/tools/3d/plugin_max/nel_patch_lib/nel_patch_mesh.cpp index 560b03d25..a0697ac79 100644 --- a/code/nel/tools/3d/plugin_max/nel_patch_lib/nel_patch_mesh.cpp +++ b/code/nel/tools/3d/plugin_max/nel_patch_lib/nel_patch_mesh.cpp @@ -178,7 +178,7 @@ RPatchMesh::RPatchMesh (PatchMesh *pmesh) SetNumVerts (pmesh->getNumVerts()); } - // Getback the binding informations + // Getback the binding information for (int v=0; vhooks.Count(); v++) { int hookPoint=pmesh->hooks[v].hookPoint; diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_assets_png_batched.ms b/code/nel/tools/3d/plugin_max/scripts/nel_assets_png_batched.ms index 56f83f3be..7a4783027 100644 --- a/code/nel/tools/3d/plugin_max/scripts/nel_assets_png_batched.ms +++ b/code/nel/tools/3d/plugin_max/scripts/nel_assets_png_batched.ms @@ -320,7 +320,7 @@ rollout assets_png_rollout "Properties" -- This script is a base script to include to add multiple functionality to your script -- To use this script - -- Include it in your script into the rollout at the begining. + -- Include it in your script into the rollout at the beginning. -- Implement a do_it function to do the job in your rollout. -- The function should retun -1 if an arror occured, else the count of modification done -- It the function returns <1, the project will not be overwritten diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_batched_mergesave.ms b/code/nel/tools/3d/plugin_max/scripts/nel_batched_mergesave.ms index 5555a93f2..cbf17a097 100644 --- a/code/nel/tools/3d/plugin_max/scripts/nel_batched_mergesave.ms +++ b/code/nel/tools/3d/plugin_max/scripts/nel_batched_mergesave.ms @@ -1,7 +1,7 @@ -- This script is a base script to include to add multiple functionality to your script -- To use this script --- Include it in your script into the rollout at the begining. +-- Include it in your script into the rollout at the beginning. -- Implement a do_it function to do the job in your rollout. -- The function should retun -1 if an arror occured, else the count of modification done -- It the function returns <1, the project will not be overwritten diff --git a/code/nel/tools/3d/plugin_max/scripts/nel_batched_script.ms b/code/nel/tools/3d/plugin_max/scripts/nel_batched_script.ms index 9dff737c6..628aa916b 100644 --- a/code/nel/tools/3d/plugin_max/scripts/nel_batched_script.ms +++ b/code/nel/tools/3d/plugin_max/scripts/nel_batched_script.ms @@ -1,7 +1,7 @@ -- This script is a base script to include to add multiple functionality to your script -- To use this script --- Include it in your script into the rollout at the begining. +-- Include it in your script into the rollout at the beginning. -- Implement a do_it function to do the job in your rollout. -- The function should retun -1 if an arror occured, else the count of modification done -- It the function returns <1, the project will not be overwritten diff --git a/code/nel/tools/3d/zone_dump/zone_dump.cpp b/code/nel/tools/3d/zone_dump/zone_dump.cpp index 817104f34..de6872463 100644 --- a/code/nel/tools/3d/zone_dump/zone_dump.cpp +++ b/code/nel/tools/3d/zone_dump/zone_dump.cpp @@ -188,7 +188,7 @@ int main(int argc, char* argv[]) // Get the current pos sint32 curPos=output.getPos (); - // File at the begining + // File at the beginning output.seek (0, NLMISC::IStream::begin); // Write the triangle count 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 b5dda0c06..53d515fdd 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 @@ -529,10 +529,10 @@ int main( int argc, char ** argv ) // output path sint lastSeparator = CFile::getLastSeparator(outputFileName); - string ouputPath; + string outputPath; if( lastSeparator != -1 ) { - ouputPath = outputFileName.substr(0,lastSeparator+1); + outputPath = outputFileName.substr(0,lastSeparator+1); } // erase the unwanted extensions from map (modify the map, save it, and quit) @@ -568,7 +568,7 @@ int main( int argc, char ** argv ) if( dumpExtensions ) { FILE * extListOutput; - string extListFileName = ouputPath + "sheet_ext.txt"; + string extListFileName = outputPath + "sheet_ext.txt"; if( !(extListOutput = fopen(extListFileName.c_str(),"w")) ) { nlwarning("Can't open output file %s",extListFileName.c_str()); @@ -608,7 +608,7 @@ int main( int argc, char ** argv ) // display the map //display(); - string sheetListFileName = ouputPath + "sheets.txt"; + string sheetListFileName = outputPath + "sheets.txt"; COFile output; if( !output.open(sheetListFileName,false,true) ) { diff --git a/code/nelns/admin_executor_service/admin_executor_service.cpp b/code/nelns/admin_executor_service/admin_executor_service.cpp index 5563806ea..f3c5476fd 100644 --- a/code/nelns/admin_executor_service/admin_executor_service.cpp +++ b/code/nelns/admin_executor_service/admin_executor_service.cpp @@ -1170,7 +1170,7 @@ static void getRegisteredServicesFromCfgFile() static void cbAESInfo(CMessage &msgin, const std::string &serviceName, TServiceId sid) { - nlinfo("Updating all informations for AES and hosted service"); + nlinfo("Updating all information for AES and hosted service"); // // setup the list of all registered services diff --git a/code/nelns/login_system/database/nel.sql b/code/nelns/login_system/database/nel.sql index e90f1109b..66c887dcb 100644 --- a/code/nelns/login_system/database/nel.sql +++ b/code/nelns/login_system/database/nel.sql @@ -40,7 +40,7 @@ CREATE TABLE `shard` ( `Version` varchar(64) collate latin1_general_ci NOT NULL default '', `DynPatchURL` varchar(255) collate latin1_general_ci NOT NULL default '', PRIMARY KEY (`ShardId`) -) ENGINE=MyISAM AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='contains all shards informations for login system'; +) ENGINE=MyISAM AUTO_INCREMENT=301 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='contains all shards information for login system'; @@ -58,5 +58,5 @@ CREATE TABLE `user` ( `ExtendedPrivilege` varchar(45) collate latin1_general_ci NOT NULL default '', `Cookie` varchar(255) collate latin1_general_ci NOT NULL default '', PRIMARY KEY (`UId`) -) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='contains all users informations for login system'; +) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci COMMENT='contains all users information for login system'; diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/interface.txt b/code/ryzom/client/data/gamedev/interfaces_v3/interface.txt index 96e1ebf59..cbe37b268 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/interface.txt +++ b/code/ryzom/client/data/gamedev/interfaces_v3/interface.txt @@ -1276,7 +1276,7 @@ Sur les nodes qui contiennent des fils on peut setuper la valeur de d h6_font_size="16" // Headline 6 font size paragraph_begin_space="12" // Space between paragraphs multi_line_space_factor="0.25" // Space between 2 lines of a paragraph. Factor of the font size - td_begin_space="0" // Space at the begining of a table cell + td_begin_space="0" // Space at the beginning of a table cell li_begin_space="4" // H space when "" ul_begin_space="12" // H space when "
    " li_indent="-10" // W space when "
  • " diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/inventory.xml b/code/ryzom/client/data/gamedev/interfaces_v3/inventory.xml index 300f47ef0..83a8dc089 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/inventory.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/inventory.xml @@ -254,7 +254,7 @@ oncandrop="inv_can_drop" ondrop="inv_drop" item_slot="LEFT_HAND" value="%hand_l" other_hand_slot="handr" auto_grayed="false" /> - + @@ -1114,7 +1114,7 @@ other_hand_slot="handr" auto_grayed="false" tooltip_parent="win" /> - + action stats change) + // update the 'buy' dialog window for the given sphrase sheet (the player has changed an equipped weapon => action stats change) void updateSPhraseBuyDialog(); // invalidate window coords void invalidateCoords(); diff --git a/code/ryzom/client/src/interface_v3/interface_expr_user_fct.cpp b/code/ryzom/client/src/interface_v3/interface_expr_user_fct.cpp index 02139a908..836a5c2ed 100644 --- a/code/ryzom/client/src/interface_v3/interface_expr_user_fct.cpp +++ b/code/ryzom/client/src/interface_v3/interface_expr_user_fct.cpp @@ -447,7 +447,7 @@ REGISTER_INTERFACE_USER_FCT("switch", userFctSwitch) ///////////////////////////////// static DECLARE_INTERFACE_USER_FCT(userFctMax) { - // compute type of ouput + // compute type of output if (!promoteToNumericalBestType(args)) { nlwarning("max : invalid entry"); @@ -479,7 +479,7 @@ REGISTER_INTERFACE_USER_FCT("max", userFctMax) ///////////////////////////////// static DECLARE_INTERFACE_USER_FCT(userFctMin) { - // compute type of ouput + // compute type of output if (!promoteToNumericalBestType(args)) { nlwarning("max : invalid entry"); diff --git a/code/ryzom/client/src/interface_v3/inventory_manager.cpp b/code/ryzom/client/src/interface_v3/inventory_manager.cpp index 5089ee841..20b6102f2 100644 --- a/code/ryzom/client/src/interface_v3/inventory_manager.cpp +++ b/code/ryzom/client/src/interface_v3/inventory_manager.cpp @@ -866,7 +866,7 @@ void CInventoryManager::equip(const std::string &bagPath, const std::string &inv const string sMsg = "ITEM:EQUIP"; if (GenericMsgHeaderMngr.pushNameToStream(sMsg, out)) { - // Fill the message (equiped inventory, equiped inventory slot, bag slot) + // Fill the message (equipped inventory, equipped inventory slot, bag slot) out.serial(inventory); out.serial(invSlot); out.serial(indexInBag); @@ -977,7 +977,7 @@ void CInventoryManager::unequip(const std::string &invPath) const string sMsg = "ITEM:UNEQUIP"; if (GenericMsgHeaderMngr.pushNameToStream(sMsg, out)) { - // Fill the message (equiped inventory, equiped inventory slot) + // Fill the message (equipped inventory, equipped inventory slot) out.serial(inventory); out.serial(invSlot); NetMngr.push (out); diff --git a/code/ryzom/client/src/interface_v3/inventory_manager.h b/code/ryzom/client/src/interface_v3/inventory_manager.h index 14fd540a9..c76bdfd5c 100644 --- a/code/ryzom/client/src/interface_v3/inventory_manager.h +++ b/code/ryzom/client/src/interface_v3/inventory_manager.h @@ -242,7 +242,7 @@ public: void equip(const std::string &bagPath, const std::string &invPath); // UnEquip a part of the player (same format as equip method) void unequip(const std::string &invPath); - // auto equip an item (given by index) from the bag (return true if equiped) + // auto equip an item (given by index) from the bag (return true if equipped) bool autoEquip(sint bagEntryIndex, bool allowReplace); void dropOrDestroyItem(CDBCtrlSheet *item, NLMISC::CBitMemStream &out, uint16 quantity); diff --git a/code/ryzom/client/src/interface_v3/view_text.cpp b/code/ryzom/client/src/interface_v3/view_text.cpp index cac9e7ce8..f7db59955 100644 --- a/code/ryzom/client/src/interface_v3/view_text.cpp +++ b/code/ryzom/client/src/interface_v3/view_text.cpp @@ -1018,7 +1018,7 @@ void CViewText::updateTextContextMultiLineJustified(uint nMaxWidth, bool expandS } } - // Detect change of wordFormat at the begining of the word + // Detect change of wordFormat at the beginning of the word if(isFormatTagChange((uint)spaceEnd, formatTagIndex)) { getFormatTagChange((uint)spaceEnd, formatTagIndex, wordFormat); diff --git a/code/ryzom/client/src/interfaces_manager/osd.cpp b/code/ryzom/client/src/interfaces_manager/osd.cpp index d1c73b9db..53638e355 100644 --- a/code/ryzom/client/src/interfaces_manager/osd.cpp +++ b/code/ryzom/client/src/interfaces_manager/osd.cpp @@ -351,7 +351,7 @@ void COSD::drawBorders(float bSizeW, float bSizeH, float x0, float y0, float x1, //----------------------------------------------- // drawText : -// Draw a text with all informations needed. +// Draw a text with all information needed. //----------------------------------------------- void COSD::drawText(float x, float y, const ucstring &text, const CPen &pen) { diff --git a/code/ryzom/client/src/interfaces_manager/osd.h b/code/ryzom/client/src/interfaces_manager/osd.h index 2076cba9f..92a0206e6 100644 --- a/code/ryzom/client/src/interfaces_manager/osd.h +++ b/code/ryzom/client/src/interfaces_manager/osd.h @@ -167,7 +167,7 @@ private: void drawTB(); /// Draw the resize borders. void drawBorders(float bSizeW, float bSizeH, float x0, float y0, float x1, float y1, const CRGBA &color); - /// Draw a text with all informations needed. + /// Draw a text with all information needed. void drawText(float x, float y, const ucstring &text, const CPen &pen); /// Test the mode of the OSD. diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexBaan.cxx b/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexBaan.cxx index 98a5443ef..cb768c15a 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexBaan.cxx +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexBaan.cxx @@ -135,7 +135,7 @@ static void ColouriseBaanDoc(unsigned int startPos, int length, int initStyle, W } } if (sc.atLineEnd) { - // Reset states to begining of colourise so no surprises + // Reset states to beginning of colourise so no surprises // if different sets of lines lexed. visibleChars = 0; } diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexCPP.cxx b/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexCPP.cxx index 718abc6a0..886bb0a4e 100644 --- a/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexCPP.cxx +++ b/code/ryzom/client/src/lua_ide_dll_nevrax/source/scintilla/LexCPP.cxx @@ -265,7 +265,7 @@ static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, Wo } if (sc.atLineEnd) { - // Reset states to begining of colourise so no surprises + // Reset states to beginning of colourise so no surprises // if different sets of lines lexed. chPrevNonWhite = ' '; visibleChars = 0; diff --git a/code/ryzom/client/src/player_cl.cpp b/code/ryzom/client/src/player_cl.cpp index f5ff60596..e9ad26889 100644 --- a/code/ryzom/client/src/player_cl.cpp +++ b/code/ryzom/client/src/player_cl.cpp @@ -495,7 +495,7 @@ void CPlayerCL::equip(SLOTTYPE::EVisualSlot slot, const std::string &shapeName, } /* If the object is sticked (ie not a skin), decide to delete the Current instance. Why? because the animation - is changed according to the equiped item. + is changed according to the equipped item. Hence, For example, if a sword would be changed for a gun, then the new gun animation would take place, while Keeping the old sword shape. BAD. diff --git a/code/ryzom/client/src/player_r2_cl.cpp b/code/ryzom/client/src/player_r2_cl.cpp index ecfd621f2..fbc97b147 100644 --- a/code/ryzom/client/src/player_r2_cl.cpp +++ b/code/ryzom/client/src/player_r2_cl.cpp @@ -321,7 +321,7 @@ void CPlayerR2CL::equip(SLOTTYPE::EVisualSlot slot, const std::string &shapeName } /* If the object is sticked (ie not a skin), decide to delete the Current instance. Why? because the animation - is changed according to the equiped item. + is changed according to the equipped item. Hence, For example, if a sword would be changed for a gun, then the new gun animation would take place, while Keeping the old sword shape. BAD. diff --git a/code/ryzom/client/src/r2/dmc/action_historic.h b/code/ryzom/client/src/r2/dmc/action_historic.h index 641b71c6b..fef3a9971 100644 --- a/code/ryzom/client/src/r2/dmc/action_historic.h +++ b/code/ryzom/client/src/r2/dmc/action_historic.h @@ -36,7 +36,7 @@ public: CActionHistoric(); ~CActionHistoric(); void setDMC(IDynamicMapClient *dmc) { _DMC = dmc; } - /** Signal the begining of a new action. Calling this twice in a row will not create + /** Signal the beginning of a new action. Calling this twice in a row will not create * an empty action. */ void newSingleAction(const ucstring &name); diff --git a/code/ryzom/client/src/scene_parser.cpp b/code/ryzom/client/src/scene_parser.cpp index 03cd3e8f6..4816459fb 100644 --- a/code/ryzom/client/src/scene_parser.cpp +++ b/code/ryzom/client/src/scene_parser.cpp @@ -1403,7 +1403,7 @@ void CSceneParser::updateCamera(double timeInSec) UAnimation *animation = _AnimationSet->getAnimation(idAnim); if(animation) { - // Get Camera informations from the animation (Pos, Target, Roll). + // Get Camera information from the animation (Pos, Target, Roll). UTrack* trackRollCam = animation->getTrackByName("Camera.roll"); UTrack* trackFovCam = animation->getTrackByName("Camera.fov"); UTrack* trackPosCam = animation->getTrackByName("Camera.PathPos"); diff --git a/code/ryzom/common/data_common/msg.xml b/code/ryzom/common/data_common/msg.xml index 7b30729f8..3fa75650e 100644 --- a/code/ryzom/common/data_common/msg.xml +++ b/code/ryzom/common/data_common/msg.xml @@ -355,11 +355,11 @@ + description="the client equip character (equipped inventory, equipped inventory slot, bag slot)" /> + description="the client unequip character (equipped inventory, equipped inventory slot)" />  

    style='mso-ansi-language:EN-US'>sheet_client : This is sheet from which all non-modified attributes are extracted for the customized bot. NB: all visual -informations are still extracted from the original sheet of the bot.

     

    diff --git a/code/ryzom/common/src/game_share/item_infos.h b/code/ryzom/common/src/game_share/item_infos.h index 7d4576233..1cb32ae41 100644 --- a/code/ryzom/common/src/game_share/item_infos.h +++ b/code/ryzom/common/src/game_share/item_infos.h @@ -105,10 +105,10 @@ public: uint32 LacustreMagicResistance; uint32 JungleMagicResistance; uint32 PrimaryRootMagicResistance; - sint32 HpBuff; // hp buff / debuff gived when item is equiped - sint32 SapBuff; // sap buff / debuff gived when item is equiped - sint32 StaBuff; // sta buff / debuff gived when item is equiped - sint32 FocusBuff; // focus buff / debuff gived when item is equiped + sint32 HpBuff; // hp buff / debuff gived when item is equipped + sint32 SapBuff; // sap buff / debuff gived when item is equipped + sint32 StaBuff; // sta buff / debuff gived when item is equipped + sint32 FocusBuff; // focus buff / debuff gived when item is equipped SKILLS::ESkills RequiredSkill; // required skill uint16 RequiredSkillLevel; // required skill level diff --git a/code/ryzom/common/src/game_share/msg_client_server.h b/code/ryzom/common/src/game_share/msg_client_server.h index c1e9e21c0..cf521a02d 100644 --- a/code/ryzom/common/src/game_share/msg_client_server.h +++ b/code/ryzom/common/src/game_share/msg_client_server.h @@ -152,7 +152,7 @@ public: sint8 HairType; // 0 - 3 sint8 HairColor; // 0 - 5 - // color for equipement slots (Only for pre-equiped perso created with sheet) + // color for equipement slots (Only for pre-equipped perso created with sheet) sint8 JacketColor; sint8 TrousersColor; sint8 HatColor; @@ -258,7 +258,7 @@ public: f.serial( EyesColor ); // 0 - 7 f.serial( Tattoo ); // 0 = neutral, 1 - 64 Tattoo - // color for equipement slots (Only for pre-equiped perso created with sheet) + // color for equipement slots (Only for pre-equipped perso created with sheet) f.serial( JacketColor ); f.serial( TrousersColor ); f.serial( HatColor ); @@ -307,7 +307,7 @@ public: f.serial( EyesColor ); // 0 - 7 f.serial( Tattoo ); // 0 = neutral, 1 - 15 Tattoo - // color for equipement slots (Only for pre-equiped perso created with sheet) + // color for equipement slots (Only for pre-equipped perso created with sheet) f.serial( JacketColor ); f.serial( TrousersColor ); f.serial( HatColor ); diff --git a/code/ryzom/common/src/game_share/ring_session_manager_itf.xml b/code/ryzom/common/src/game_share/ring_session_manager_itf.xml index c71567a61..7fc670080 100644 --- a/code/ryzom/common/src/game_share/ring_session_manager_itf.xml +++ b/code/ryzom/common/src/game_share/ring_session_manager_itf.xml @@ -413,7 +413,7 @@ - + diff --git a/code/ryzom/server/entities_game_service_default.cfg b/code/ryzom/server/entities_game_service_default.cfg index 3016a6f99..4cc685e40 100644 --- a/code/ryzom/server/entities_game_service_default.cfg +++ b/code/ryzom/server/entities_game_service_default.cfg @@ -1165,7 +1165,7 @@ ElectricityJewelProtection = 0.01001; MaxMagicProtection = 10; // Maximum protection can be gived by jewelry (clamp value), de 0 à 100 (pourcentage) HominBaseProtection = 10; // Homin base protection in generic magic damage type HominRacialProtection = 10; // Homin base protection in racial magic damage type -MaxAbsorptionFactor = 10; // Factor used for compute maximum absorption gived by all jewel (100 = 1.0 factor (100%)) (Max absorbtion = sum(equiped jewels recommandeds) * factor) +MaxAbsorptionFactor = 10; // Factor used for compute maximum absorption gived by all jewel (100 = 1.0 factor (100%)) (Max absorbtion = sum(equipped jewels recommandeds) * factor) ////////////////////////////// // JEWEL RESISTANCE DesertResistance = 1; // In skill points bonus diff --git a/code/ryzom/server/sheet_pack_cfg/entities_game_service.cfg b/code/ryzom/server/sheet_pack_cfg/entities_game_service.cfg index 547fd4558..765eb289b 100644 --- a/code/ryzom/server/sheet_pack_cfg/entities_game_service.cfg +++ b/code/ryzom/server/sheet_pack_cfg/entities_game_service.cfg @@ -1203,7 +1203,7 @@ ElectricityJewelProtection = 0.01001; MaxMagicProtection = 10; // Maximum protection can be gived by jewelry (clamp value), de 0 à 100 (pourcentage) HominBaseProtection = 10; // Homin base protection in generic magic damage type HominRacialProtection = 10; // Homin base protection in racial magic damage type -MaxAbsorptionFactor = 10; // Factor used for compute maximum absorption gived by all jewel (100 = 1.0 factor (100%)) (Max absorbtion = sum(equiped jewels recommandeds) * factor) +MaxAbsorptionFactor = 10; // Factor used for compute maximum absorption gived by all jewel (100 = 1.0 factor (100%)) (Max absorbtion = sum(equipped jewels recommandeds) * factor) ////////////////////////////// // JEWEL RESISTANCE DesertResistance = 1; // In skill points bonus diff --git a/code/ryzom/server/src/admin_modules/aes_module.cpp b/code/ryzom/server/src/admin_modules/aes_module.cpp index 356ad6568..c4faf5c47 100644 --- a/code/ryzom/server/src/admin_modules/aes_module.cpp +++ b/code/ryzom/server/src/admin_modules/aes_module.cpp @@ -569,7 +569,7 @@ namespace ADMIN FILE *fp = fopen("aes_nagios_report.txt", "wt"); if (fp != NULL) { - // ouput the current date + // output the current date time_t t = now; fprintf(fp, "AESReportDate=%s", ::ctime(&t)); diff --git a/code/ryzom/server/src/ai_service/commands.cpp b/code/ryzom/server/src/ai_service/commands.cpp index 27a47682a..92193e6c5 100644 --- a/code/ryzom/server/src/ai_service/commands.cpp +++ b/code/ryzom/server/src/ai_service/commands.cpp @@ -2513,10 +2513,10 @@ NLMISC_COMMAND(displayFightSheet,"display the sheet","") log.displayNL("value means the number of attacker sensitivity of the bot, equals to zero means the bot never mind the number of attackers on the target"); log.displayNL("- ScoreModulator [0 1]: %f score>ScoreModulator", sheet->ScoreModulator()); - log.displayNL("value means the minimum value (treshold) needed for the bot to attack, 0 means always, 1 never (also impossible)"); + log.displayNL("value means the minimum value (threshold) needed for the bot to attack, 0 means always, 1 never (also impossible)"); log.displayNL("- FearModulator [0 1]: %f score>FearModulator", sheet->FearModulator()); - log.displayNL("value means the minimum value (treshold) needed for the bot to flee, 0 means always, 1 never (also impossible)"); + log.displayNL("value means the minimum value (threshold) needed for the bot to flee, 0 means always, 1 never (also impossible)"); log.displayNL("- LifeLevelModulator [0 1]: %f value=LifeLevelModulator*lifeCoef+(1.f-LifeLevelModulator)*levelCoef", sheet->LifeLevelModulator()); log.displayNL("value means the ratio between the life and level ratio, 1 means life is only take in count, 0 means level only take in count"); @@ -2545,10 +2545,10 @@ NLMISC_COMMAND(displayFightSheet,"display the sheet","") // value means the number of attacker sensitivity of the bot, equals to zero means the bot never mind the number of attackers on the target // // - ScoreModulator [0 1]: score>ScoreModulator -// value means the minimum value (treshold) needed for the bot to attack, 0 means always, 1 never (also impossible) +// value means the minimum value (threshold) needed for the bot to attack, 0 means always, 1 never (also impossible) // // - FearModulator [0 1]: score>FearModulator -// value means the minimum value (treshold) needed for the bot to flee, 0 means always, 1 never (also impossible) +// value means the minimum value (threshold) needed for the bot to flee, 0 means always, 1 never (also impossible) // // - LifeLevelModulator [0 1]: value=LifeLevelModulator*lifeCoef+(1.f-LifeLevelModulator)*levelCoef // value means the ratio between the life and level ratio, 1 means life is only take in count, 0 means level only take in count diff --git a/code/ryzom/server/src/ai_service/doc/source/primitive_parsing.dox b/code/ryzom/server/src/ai_service/doc/source/primitive_parsing.dox index 8c4dd12ea..4552d22a4 100644 --- a/code/ryzom/server/src/ai_service/doc/source/primitive_parsing.dox +++ b/code/ryzom/server/src/ai_service/doc/source/primitive_parsing.dox @@ -21,7 +21,7 @@ The parsing is in fact done in 2 steps, and is not done the same in all services The first step is common although not being done at the same time. It load the primitive file as a DOM document and check its XML validity and its content according to the world_editor_classes.xml file. In the EGS, this step is done at loading for all files declared in the common.cfg file. On the AIS, this is done after the service initialization, even after the service starts to tick, in commands in the config file. Thus a file can be loaded well after shard initialization while it is already running for a while. -The second step consist in interpreting that DOM tree loaded by the first step. This step differs greatly from one service to another. In the EGS, each manager (an EGS manager is a singleton which manage an aspect of the game) parses all primive files and extract the primitive nodes it needs. In the AIS, a special function is called just after the first step. That function parses the DOM tree and reacts to the nodes it encounters almost like a SAX parser. It extracts the current node informations (including its type, name, and eventually some simple field subnodes like its alias) and generates some NeL like commands, and then parses the primitive children. The commands are interpreted in a kind of state machine which constructs objects roughly reflecting the primitives. +The second step consist in interpreting that DOM tree loaded by the first step. This step differs greatly from one service to another. In the EGS, each manager (an EGS manager is a singleton which manage an aspect of the game) parses all primive files and extract the primitive nodes it needs. In the AIS, a special function is called just after the first step. That function parses the DOM tree and reacts to the nodes it encounters almost like a SAX parser. It extracts the current node information (including its type, name, and eventually some simple field subnodes like its alias) and generates some NeL like commands, and then parses the primitive children. The commands are interpreted in a kind of state machine which constructs objects roughly reflecting the primitives. The main advantage of that method is that it's possible to cache a binary representation of the commands to speedup the loading of the AIS. The drawback is the complexity involved by this dual parsing scheme and the difficulty to modify it and add new primitive types. diff --git a/code/ryzom/server/src/ai_service/script_compiler.cpp b/code/ryzom/server/src/ai_service/script_compiler.cpp index cad927c57..8f4b188ee 100644 --- a/code/ryzom/server/src/ai_service/script_compiler.cpp +++ b/code/ryzom/server/src/ai_service/script_compiler.cpp @@ -898,7 +898,7 @@ CCompiler::CCompiler() while (!file.eof()) { file.getline(buffer, bufferSize); - if (buffer[0]=='#' || buffer[0]=='\0') // Skip lines begining with a # and empty lines + if (buffer[0]=='#' || buffer[0]=='\0') // Skip lines beginning with a # and empty lines continue; string line = buffer; const string sep1 = ": "; diff --git a/code/ryzom/server/src/ai_service/script_parser.yacc b/code/ryzom/server/src/ai_service/script_parser.yacc index 52a39e7e6..3d40bc592 100644 --- a/code/ryzom/server/src/ai_service/script_parser.yacc +++ b/code/ryzom/server/src/ai_service/script_parser.yacc @@ -510,7 +510,7 @@ exp: lValue TOKEN_ASSIGNATOR expression NODE2 ($$, $3, $1); } | lValue TOKEN_ASSIGNATOR TOKEN_LP expression { ERROR_DETECTED ($$, "missing ')' at the end of the expression"); } - | lValue TOKEN_ASSIGNATOR expression TOKEN_RP { ERROR_DETECTED ($$, "missing '(' at the begining of the expression");} + | lValue TOKEN_ASSIGNATOR expression TOKEN_RP { ERROR_DETECTED ($$, "missing '(' at the beginning of the expression");} printContent: printContent TOKEN_SEPARATOR TOKEN_CHAIN { NODE3 ($$, $1, CScriptVM::PUSH_PRINT_STRING, $3); } | TOKEN_CHAIN { NODE2 ($$, CScriptVM::PUSH_PRINT_STRING, $1); } @@ -532,7 +532,7 @@ openStatement: TOKEN_IF TOKEN_LP condition TOKEN_RP statement NODE4 ($$, $3, CScriptVM::JE, sizeToJump, $5); } | TOKEN_IF TOKEN_LP condition statement {ERROR_DETECTED ($$, "missing ')' at the end of the if condition");} - | TOKEN_IF condition TOKEN_RP statement {ERROR_DETECTED ($$, "missing '(' at the begining of the if condition");} + | TOKEN_IF condition TOKEN_RP statement {ERROR_DETECTED ($$, "missing '(' at the beginning of the if condition");} | TOKEN_IF TOKEN_LP condition TOKEN_RP closedStatement TOKEN_ELSE openStatement { int sizeToJump0 = (int)$5.ByteCode->size() + 3; // 2 jump instructions to escape @@ -540,7 +540,7 @@ openStatement: TOKEN_IF TOKEN_LP condition TOKEN_RP statement NODE7 ($$, $3, CScriptVM::JE, sizeToJump0, $5, CScriptVM::JUMP, sizeToJump1, $7); } | TOKEN_IF TOKEN_LP condition closedStatement TOKEN_ELSE openStatement { ERROR_DETECTED ($$, "missing ')' at the end of the if condition");} - | TOKEN_IF condition TOKEN_RP closedStatement TOKEN_ELSE openStatement { ERROR_DETECTED ($$, "missing '(' at the begining of the if condition");} + | TOKEN_IF condition TOKEN_RP closedStatement TOKEN_ELSE openStatement { ERROR_DETECTED ($$, "missing '(' at the beginning of the if condition");} | TOKEN_WHILE TOKEN_LP condition TOKEN_RP openStatement { int sizeToJump0 = (int)$5.ByteCode->size() + 3; // 2 jump instructions to escape @@ -548,7 +548,7 @@ openStatement: TOKEN_IF TOKEN_LP condition TOKEN_RP statement NODE6 ($$, $3, CScriptVM::JE, sizeToJump0, $5, CScriptVM::JUMP, sizeToJump1); } | TOKEN_WHILE TOKEN_LP condition openStatement { ERROR_DETECTED ($$, "missing ')' at the end of the while condition");} - | TOKEN_WHILE condition TOKEN_RP openStatement { ERROR_DETECTED ($$, "missing '(' at the begining of the while condition");} + | TOKEN_WHILE condition TOKEN_RP openStatement { ERROR_DETECTED ($$, "missing '(' at the beginning of the while condition");} closedStatement:TOKEN_IF TOKEN_LP condition TOKEN_RP closedStatement TOKEN_ELSE closedStatement { @@ -565,7 +565,7 @@ closedStatement:TOKEN_IF TOKEN_LP condition TOKEN_RP closedStatement TOKEN_ELSE NODE6 ($$, $3, CScriptVM::JE, sizeToJump0, $5, CScriptVM::JUMP, sizeToJump1); } | TOKEN_WHILE TOKEN_LP condition closedStatement { ERROR_DETECTED ($$, "missing ')' at the end of the while condition");} - | TOKEN_WHILE condition TOKEN_RP closedStatement { ERROR_DETECTED ($$, "missing '(' at the begining of the while condition");} + | TOKEN_WHILE condition TOKEN_RP closedStatement { ERROR_DETECTED ($$, "missing '(' at the beginning of the while condition");} | exp TOKEN_PV { $$ = $1; } | printString TOKEN_PV { $$ = $1; } | logString TOKEN_PV { $$ = $1; } @@ -583,10 +583,10 @@ closedStatement:TOKEN_IF TOKEN_LP condition TOKEN_RP closedStatement TOKEN_ELSE | TOKEN_INCRDECR context TOKEN_NAME TOKEN_PV { NODE7 ($$, $2, CScriptVM::PUSH_CONTEXT_VAR_VAL, $3, $1, $2, CScriptVM::SET_CONTEXT_VAR_VAL, $3); } | TOKEN_NAME TOKEN_ASSIGN expression TOKEN_PV { NODE6 ($$, CScriptVM::PUSH_VAR_VAL, $1, $3, $2, CScriptVM::SET_VAR_VAL, $1); } | TOKEN_NAME TOKEN_ASSIGN TOKEN_LP expression TOKEN_PV { ERROR_DETECTED ($$, "missing ')' at the end of the expression");} - | TOKEN_NAME TOKEN_ASSIGN expression TOKEN_RP TOKEN_PV { ERROR_DETECTED ($$, "missing '(' at the begining of the expression");} + | TOKEN_NAME TOKEN_ASSIGN expression TOKEN_RP TOKEN_PV { ERROR_DETECTED ($$, "missing '(' at the beginning of the expression");} | context TOKEN_NAME TOKEN_ASSIGN expression TOKEN_PV { NODE8 ($$, $1, CScriptVM::PUSH_CONTEXT_VAR_VAL, $1, $4, $3, $1, CScriptVM::SET_CONTEXT_VAR_VAL, $2); } | context TOKEN_NAME TOKEN_ASSIGN TOKEN_LP expression TOKEN_PV { ERROR_DETECTED ($$, "missing ')' at the end of the expression");} - | context TOKEN_NAME TOKEN_ASSIGN expression TOKEN_RP TOKEN_PV { ERROR_DETECTED ($$, "missing '(' at the begining of the expression");} + | context TOKEN_NAME TOKEN_ASSIGN expression TOKEN_RP TOKEN_PV { ERROR_DETECTED ($$, "missing '(' at the beginning of the expression");} | statementBlock { NODE1 ($$, $1); } | error TOKEN_PV { NODE0 ($$); } @@ -715,8 +715,8 @@ switch: TOKEN_SWITCH TOKEN_LP expression TOKEN_RP TOKEN_LA cases TOKEN_RA } } | TOKEN_SWITCH TOKEN_LP expression TOKEN_LA cases TOKEN_RA {ERROR_DETECTED ($$, "missing ')' at the end of the switch expression");} - | TOKEN_SWITCH expression TOKEN_RP TOKEN_LA cases TOKEN_RA {ERROR_DETECTED ($$, "missing '(' at the begining of the switch expression");} - | TOKEN_SWITCH TOKEN_LP expression TOKEN_RP cases TOKEN_RA {ERROR_DETECTED ($$, "missing '{' at the begining of the switch cases");} + | TOKEN_SWITCH expression TOKEN_RP TOKEN_LA cases TOKEN_RA {ERROR_DETECTED ($$, "missing '(' at the beginning of the switch expression");} + | TOKEN_SWITCH TOKEN_LP expression TOKEN_RP cases TOKEN_RA {ERROR_DETECTED ($$, "missing '{' at the beginning of the switch cases");} statementBlock: TOKEN_LA statements TOKEN_RA { $$ = $2; } diff --git a/code/ryzom/server/src/ai_service/script_parser_yacc.cpp b/code/ryzom/server/src/ai_service/script_parser_yacc.cpp index cf8939758..77ef7999e 100644 --- a/code/ryzom/server/src/ai_service/script_parser_yacc.cpp +++ b/code/ryzom/server/src/ai_service/script_parser_yacc.cpp @@ -1942,7 +1942,7 @@ yyreduce: case 58: #line 544 "ai_service/script_parser.yacc" - { ERROR_DETECTED (yyval.ByteCode, "missing '(' at the begining of the expression");;} + { ERROR_DETECTED (yyval.ByteCode, "missing '(' at the beginning of the expression");;} break; case 59: @@ -2010,7 +2010,7 @@ yyreduce: case 71: #line 566 "ai_service/script_parser.yacc" - {ERROR_DETECTED (yyval.ByteCode, "missing '(' at the begining of the if condition");;} + {ERROR_DETECTED (yyval.ByteCode, "missing '(' at the beginning of the if condition");;} break; case 72: @@ -2029,7 +2029,7 @@ yyreduce: case 74: #line 574 "ai_service/script_parser.yacc" - { ERROR_DETECTED (yyval.ByteCode, "missing '(' at the begining of the if condition");;} + { ERROR_DETECTED (yyval.ByteCode, "missing '(' at the beginning of the if condition");;} break; case 75: @@ -2048,7 +2048,7 @@ yyreduce: case 77: #line 582 "ai_service/script_parser.yacc" - { ERROR_DETECTED (yyval.ByteCode, "missing '(' at the begining of the while condition");;} + { ERROR_DETECTED (yyval.ByteCode, "missing '(' at the beginning of the while condition");;} break; case 78: @@ -2086,7 +2086,7 @@ yyreduce: case 83: #line 599 "ai_service/script_parser.yacc" - { ERROR_DETECTED (yyval.ByteCode, "missing '(' at the begining of the while condition");;} + { ERROR_DETECTED (yyval.ByteCode, "missing '(' at the beginning of the while condition");;} break; case 84: @@ -2176,7 +2176,7 @@ yyreduce: case 101: #line 619 "ai_service/script_parser.yacc" - { ERROR_DETECTED (yyval.ByteCode, "missing '(' at the begining of the expression");;} + { ERROR_DETECTED (yyval.ByteCode, "missing '(' at the beginning of the expression");;} break; case 102: @@ -2191,7 +2191,7 @@ yyreduce: case 104: #line 625 "ai_service/script_parser.yacc" - { ERROR_DETECTED (yyval.ByteCode, "missing '(' at the begining of the expression");;} + { ERROR_DETECTED (yyval.ByteCode, "missing '(' at the beginning of the expression");;} break; case 105: @@ -2361,12 +2361,12 @@ yyreduce: case 117: #line 754 "ai_service/script_parser.yacc" - {ERROR_DETECTED (yyval.ByteCode, "missing '(' at the begining of the switch expression");;} + {ERROR_DETECTED (yyval.ByteCode, "missing '(' at the beginning of the switch expression");;} break; case 118: #line 755 "ai_service/script_parser.yacc" - {ERROR_DETECTED (yyval.ByteCode, "missing '{' at the begining of the switch cases");;} + {ERROR_DETECTED (yyval.ByteCode, "missing '{' at the beginning of the switch cases");;} break; case 119: 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 d0d770d7c..4ccde62da 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 @@ -665,7 +665,7 @@ void addParam(const std::string ¶mStr, std::vector &Par case TBrickParam::STA_WEIGHT_FACTOR: // $*STRUCT CSBrickParamStaWeightFactor TBrickParam::STA_WEIGHT_FACTOR // $*-i float StaFactor=0 // quantity of STA FACTOR of WEIGHT to use - // $*-i unsigned StaConst=0 // quantity of STA Constante to use, used STA = StaFactor * (weight of equiped weapons) + StaConst + // $*-i unsigned StaConst=0 // quantity of STA Constante to use, used STA = StaFactor * (weight of equipped weapons) + StaConst Params.push_back(new CSBrickParamStaWeightFactor(tail)); break; diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.cpp b/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.cpp index 7414979a7..6b2fe76bd 100644 --- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.cpp +++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.cpp @@ -1029,7 +1029,7 @@ void CEntityBase::resetEntityModifier() _Skills._Skills[ i ].Modifier = 0; } - // Apply effect product by equiped items on local variables if race is homin + // Apply effect product by equipped items on local variables if race is homin if( _Race < EGSPD::CPeople::EndHumanoid ) { for( i = 0; i < SLOT_EQUIPMENT::NB_SLOT_EQUIPMENT; ++i ) @@ -1117,7 +1117,7 @@ void CEntityBase::resetEntityModifier() } } - // if current slot is equiped, get a pointer of form corresponding to item + // if current slot is equipped, get a pointer of form corresponding to item if( id != CSheetId() ) { const CStaticItem* itemForm = CSheets::getForm( id ); diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp b/code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp index 3c4b9bcc6..cef7560a0 100644 --- a/code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp @@ -1657,7 +1657,7 @@ void CFameManager::tickUpdate() if (!_LastUpdatedRow.isValid()) { - // not a valid row restart at begining + // not a valid row restart at beginning if (!_FamesOwners.empty()) { it = _FamesOwners.begin(); diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/special_power_enchant_weapon.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/special_power_enchant_weapon.cpp index 54a10da5e..4c1663693 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/special_power_enchant_weapon.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/special_power_enchant_weapon.cpp @@ -59,11 +59,11 @@ void CSpecialPowerEnchantWeapon::apply() // Test some cases that should be avoided on client (so don't bother adding an error message) - // If we have no equiped item + // If we have no equipped item if (inv->getSlotCount()<=0) return; - // If equiped item is invalid + // If equipped item is invalid CGameItemPtr item = inv->getItem(0); if (item == NULL) return; diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp index 6aabe5e8b..a28d65b30 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp @@ -9938,7 +9938,7 @@ void CCharacter::sellItem( INVENTORIES::TInventory inv, uint32 slot, uint32 quan if (item->getRefInventory() == _Inventory[INVENTORIES::equipment]) { - nlwarning(" character %s try to sell an equiped item %s, must not permited by client", _Id.toString().c_str(), sheet.toString().c_str() ); + nlwarning(" character %s try to sell an equipped item %s, must not permited by client", _Id.toString().c_str(), sheet.toString().c_str() ); return; } diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp index 67a8ba0ce..9594a0701 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp @@ -937,7 +937,7 @@ void CCharacter::equipCharacter(INVENTORIES::TInventory dstInvId, uint32 dstSlot return; } - // if item is already referenced (maybe equiped), do not equip it + // if item is already referenced (maybe equipped), do not equip it if (item->getRefInventory() != NULL) return; @@ -1097,7 +1097,7 @@ void CCharacter::unequipCharacter(INVENTORIES::TInventory invId, uint32 slot, bo CPhraseManager::getInstance().disengage( _EntityRowId, true ); } - // Remove enchant weapon effects as they are linked to equiped item + // Remove enchant weapon effects as they are linked to equipped item if (invId==INVENTORIES::handling && slot==0) { CSEffectPtr const effect = lookForActiveEffect(EFFECT_FAMILIES::PowerEnchantWeapon); @@ -1784,7 +1784,7 @@ CGameItemPtr CCharacter::removeItemFromInventory(INVENTORIES::TInventory invId, return NULL; } - // if item is equiped, unequip + // if item is equipped, unequip // TODO : still needed ? // bool hand; // uint16 slotImg; 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 27d1c55e8..a4765c300 100644 --- a/code/ryzom/server/src/input_output_service/chat_manager.cpp +++ b/code/ryzom/server/src/input_output_service/chat_manager.cpp @@ -2312,7 +2312,7 @@ ucstring CChatManager::filterClientInput(ucstring &text) { ucstring result; result.reserve(text.size()); - // 1st, remove any begining or ending white space + // 1st, remove any beginning or ending white space ucstring::size_type pos = 0; // skip begin white spaces diff --git a/code/ryzom/server/src/monitor_service/service_main.cpp b/code/ryzom/server/src/monitor_service/service_main.cpp index 9b02a1164..0ad027d86 100644 --- a/code/ryzom/server/src/monitor_service/service_main.cpp +++ b/code/ryzom/server/src/monitor_service/service_main.cpp @@ -582,7 +582,7 @@ bool CMonitorService::update () if (var && (var->Type == CConfigFile::CVar::T_INT)) count = var->asInt(); - // Loop to the begining + // Loop to the beginning if (primitiveToUpdate >= Entites.size()) primitiveToUpdate = 0; @@ -687,7 +687,7 @@ bool CMonitorService::update () // Next primitive primitiveToUpdate++; - // Loop to the begining + // Loop to the beginning if (primitiveToUpdate >= Entites.size()) primitiveToUpdate = 0; diff --git a/code/ryzom/server/src/shard_unifier_service/nel.sql b/code/ryzom/server/src/shard_unifier_service/nel.sql index 0d8741e8a..6230cc7ef 100644 --- a/code/ryzom/server/src/shard_unifier_service/nel.sql +++ b/code/ryzom/server/src/shard_unifier_service/nel.sql @@ -63,7 +63,7 @@ CREATE TABLE `shard` ( `DynPatchURL` varchar(255) default NULL, `FixedSessionId` int(10) unsigned default '0', PRIMARY KEY (`ShardId`) -) TYPE=MyISAM COMMENT='contains all shards informations for login system'; +) TYPE=MyISAM COMMENT='contains all shards information for login system'; 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 5d9c7feb2..987d4c86b 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 @@ -1736,7 +1736,7 @@ endOfWelcomeUserResult: (session->getAccessType()==TAccessType::at_public), session->getLang(), session->getOrientation(), session->getDescription()); } - // Update the informations of a planned or running session + // Update the information of a planned or running session // Return 'invokeResult' : 0 : ok, session updated // 1 : unknown character // 2 : unknown session diff --git a/code/ryzom/server/src/testing_tool_service/testing_tool_service.h b/code/ryzom/server/src/testing_tool_service/testing_tool_service.h index 1dc5786a6..551b0162f 100644 --- a/code/ryzom/server/src/testing_tool_service/testing_tool_service.h +++ b/code/ryzom/server/src/testing_tool_service/testing_tool_service.h @@ -217,7 +217,7 @@ public: bool CTestingTool::testSentence( const std::vector< NLMISC::CSheetId >& s1, const std::vector< NLMISC::CSheetId >& s2 ); private: - // Sheet informations + // Sheet information std::string _TestDescription; uint16 _IterationCount; uint16 _LevelMini; diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.h b/code/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.h index 87b33779f..f1c165a72 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.h +++ b/code/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.h @@ -262,7 +262,7 @@ protected: // Operations public: - // Plugin informations + // Plugin information class CPlugin { public: @@ -274,7 +274,7 @@ public: NLGEORGES::IEditPlugin *Plugin; }; - // Array of plugin informations + // Array of plugin information std::vector PluginArray; // Overrides diff --git a/code/ryzom/tools/leveldesign/icon_search/icon_search_default.cfg b/code/ryzom/tools/leveldesign/icon_search/icon_search_default.cfg index 3ef97f480..b343d9e7d 100644 --- a/code/ryzom/tools/leveldesign/icon_search/icon_search_default.cfg +++ b/code/ryzom/tools/leveldesign/icon_search/icon_search_default.cfg @@ -1,4 +1,4 @@ -// check howto for more informations : \\server\_RYZOM\how_to\leveldesign\ht_icon_search_en.doc +// check howto for more information : \\server\_RYZOM\how_to\leveldesign\ht_icon_search_en.doc SearchClientSrc = 0; ClientSrcPath = "R:\code\ryzom\src_v2\"; diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp index 1b0d6c078..608702b18 100644 --- a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp @@ -777,7 +777,7 @@ void CExport::treatPattern (sint32 x, sint32 y, // 4 - Cut the big zone into a set of unit zones - // - Build patch informations + // - Build patch information // Retrieve source patches vector SrcPI; diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone_region.h b/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone_region.h index 68036d8d6..64038e19c 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone_region.h +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone_region.h @@ -38,7 +38,7 @@ class CBuilderZone; // *************************************************************************** -// CZoneRegion contains informations about the zones painted +// CZoneRegion contains information about the zones painted class CBuilderZoneRegion { diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.h b/code/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.h index 7883c2dea..97bda4584 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.h +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.h @@ -297,7 +297,7 @@ public: virtual void deleteRootPluginPrimitive (void); virtual void getAllRootPluginPrimitive (std::vector &prims); /* - * The players or informations coming from the server are considered as primitives by the WorldEditor + * The players or information coming from the server are considered as primitives by the WorldEditor * so we need to create/delete/modify these primitives */ // Create a plugin primitive diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h b/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h index 8496dab9f..836285241 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h @@ -90,7 +90,7 @@ public: /// get all the current root primitve in the world editor. only the editable one are returned virtual void getAllRootPluginPrimitive (std::vector &prims) = 0; /* - * The players or informations coming from the server are considered as primitives by the WorldEditor + * The players or information coming from the server are considered as primitives by the WorldEditor * so we need to create/delete/modify these primitives */ // Create a plugin primitive diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp index ff837c912..ecd051b0b 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp @@ -262,7 +262,7 @@ void CPlugin::onIdle() } else { - // first, we receive the stack of messages, which is composed of players informations + // first, we receive the stack of messages, which is composed of players information _Client->update(); // now, we insert the players into the GUI for (uint i = 0; i < StackPlayers.size(); ++i) diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.cpp index cdcc61c4e..14a076694 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.cpp @@ -833,7 +833,7 @@ void CPlugin::onIdle() if (_Client && _Client->connected()) { _ConnectionMsg.MsgType = CConnectionMsg::NoMsg; - // first, we receive the stack of messages, which is composed of players informations + // first, we receive the stack of messages, which is composed of players information _Client->update(); // See if there's aconnection relarted msg switch(_ConnectionMsg.MsgType) diff --git a/code/ryzom/tools/scripts/linux/build b/code/ryzom/tools/scripts/linux/build index 90e811ed1..6f97ebd9f 100755 --- a/code/ryzom/tools/scripts/linux/build +++ b/code/ryzom/tools/scripts/linux/build @@ -25,7 +25,7 @@ # $ build snowballs all install # # As you can see there is no need to specify the installed directory -# of NeL, etc ... These informations are automaticly provided to the +# of NeL, etc ... These information are automaticly provided to the # configure script. # # Check the following variables to get an idea of the place of the @@ -415,7 +415,7 @@ case $1 in && cp -RfPp $NEL_SRC/include $BUILD_DIR/nel # Remove from the compilation directory the useless CVS - # informations + # information cd $BUILD_DIR/nel/include \ && find . -prune -type d -name CVS -exec rm -rf \{\} \; diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_gantt.php b/code/ryzom/tools/server/admin/jpgraph/jpgraph_gantt.php index afcce36e4..b45cbe26a 100644 --- a/code/ryzom/tools/server/admin/jpgraph/jpgraph_gantt.php +++ b/code/ryzom/tools/server/admin/jpgraph/jpgraph_gantt.php @@ -524,7 +524,7 @@ class GanttGraph extends Graph { // automtically determined from the input data) function SetDateRange($aStart,$aEnd) { // Adjust the start and end so that the indicate the - // begining and end of respective start and end days + // beginning and end of respective start and end days if( strpos($aStart,':') === false ) $aStart = date('Y-m-d 00:00',strtotime($aStart)); if( strpos($aEnd,':') === false ) diff --git a/code/ryzom/tools/server/admin/jpgraph/jpgraph_pie.php b/code/ryzom/tools/server/admin/jpgraph/jpgraph_pie.php index 0f61a1fed..d9a1abd16 100644 --- a/code/ryzom/tools/server/admin/jpgraph/jpgraph_pie.php +++ b/code/ryzom/tools/server/admin/jpgraph/jpgraph_pie.php @@ -567,7 +567,7 @@ class PiePlot { //----------------------------------------------------------------------- // Step 1 of the algorithm is to construct a number of clusters // a cluster is defined as all slices within the same quadrant (almost) - // that has an angualr distance less than the treshold + // that has an angular distance less than the threshold //----------------------------------------------------------------------- $tresh_hold=25 * M_PI/180; // 25 degrees difference to be in a cluster $incluster=false; // flag if we are currently in a cluster or not diff --git a/code/ryzom/tools/server/sql/ryzom_admin_default_data.sql b/code/ryzom/tools/server/sql/ryzom_admin_default_data.sql index 1f6a6b922..f6fca36e6 100644 --- a/code/ryzom/tools/server/sql/ryzom_admin_default_data.sql +++ b/code/ryzom/tools/server/sql/ryzom_admin_default_data.sql @@ -53,7 +53,7 @@ INSERT IGNORE INTO `neltool_group_shards` (`group_shard_id`, `group_shard_group_ # Dumping data for table nel_tool.neltool_notes: 8 rows /*!40000 ALTER TABLE `neltool_notes` DISABLE KEYS */; -INSERT IGNORE INTO `neltool_notes` (`note_id`, `note_user_id`, `note_title`, `note_data`, `note_date`, `note_active`, `note_global`) VALUES (2, 27, 'Welcome', 'Welcome to the shard administration website!\r\n\r\nThis website is used to monitor and restart shards.\r\n\r\nIt also gives some player characters informations.', 1272378065, 1, 1), (3, 27, 'Shard Start', '# At the same time : NS and TS\r\n[1 min] : all MS, you can boot them all at the same time\r\n[1 min] : IOS\r\n[3 mins] : GMPS\r\n[3 mins] : EGS\r\n[5 mins] : AI Fyros\r\n[1 min 30] : AI Zorai\r\n[1 min 30] : AI Matis\r\n[1 min 30] : AI TNP\r\n[1 min 30] : AI NPE\r\n[1 min 30] : AI Tryker\r\n[1 min 30] : All FS and SBS at the same time\r\n[30 secs] : WS (atm the WS starts in OPEN mode by default, so be fast before CSR checkage, fix for that inc soon)\r\n\r\nNOTE: you can check the uptime for those timers in the right column of the admin tool: UpTime\r\n', 1158751126, 1, 0), (5, 27, 'shutting supplementary', 'the writing wont change when lock the ws\r\n\r\nuntick previous boxes as you shut down\r\n\r\nwait 5 between the ws and the egs ie egs is 5 past rest is 10 past', 1153395380, 1, 0), (4, 27, 'Shard Stop', '1. Broadcast to warn players\r\n\r\n2. 10 mins before shutdown, lock the WS\r\n\r\n3. At the right time shut down WS\r\n\r\n4. Shut down EGS\r\nOnly the EGS. Wait 5 reals minutes. Goal is to give enough time to egs, in order to save all the info he has to, and letting him sending those message to all services who need it.\r\n\r\n5. Shut down the rest, et voilà, you're done.', 1153314198, 1, 0), (6, 27, 'Start (EGS to high?)', 'If [EGS] is to high on startup:\r\n\r\n[shut down egs]\r\n[5 mins]\r\n\r\n[IOS] & [GPMS] (shut down at same time)\r\n\r\nAfter the services are down follow "UP" process with timers again.\r\n\r\nIOS\r\n[3 mins]\r\nGPMS\r\n[3 mins]\r\nEGS\r\n[5 mins]\r\nbla bla...', 1153395097, 1, 0), (7, 27, 'opening if the egs is too high on reboot', '<kadael> here my note on admin about egs to high on startup\r\n<kadael> ---\r\n<kadael> If [EGS] is to high on startup:\r\n<kadael> [shut down egs]\r\n<kadael> [5 mins]\r\n<kadael> [IOS] & [GPMS] (at same time shut down )\r\n<kadael> after the services are down follow "UP" process with timers again.\r\n<kadael> IOS\r\n<kadael> [3 mins]\r\n<kadael> GPMS\r\n<kadael> [3 mins]\r\n<kadael> EGS\r\n<kadael> [5 mins]\r\n<kadael> bla bla...\r\n<kadael> ---', 1153395362, 1, 0), (10, 27, 'Ring points', 'Commande pour donner tout les points ring à tout le monde :\r\n\r\nDans le DSS d'un Shard Ring entrer : DefaultCharRingAccess f7:j7:l6:d7:p13:g9:a9', 1155722296, 1, 0), (9, 27, 'Start (EGS to high?)', 'If [EGS] is to high on startup: \r\n \r\n [shut down egs] \r\n [5 mins] \r\n \r\n [IOS] & [GPMS] (shut down at same time) \r\n \r\n After the services are down follow "UP" process with timers again. \r\n \r\n IOS \r\n [3 mins] \r\n GPMS \r\n [3 mins] \r\n EGS \r\n [5 mins] \r\n bla bla...', 1153929658, 1, 0); +INSERT IGNORE INTO `neltool_notes` (`note_id`, `note_user_id`, `note_title`, `note_data`, `note_date`, `note_active`, `note_global`) VALUES (2, 27, 'Welcome', 'Welcome to the shard administration website!\r\n\r\nThis website is used to monitor and restart shards.\r\n\r\nIt also gives some player characters information.', 1272378065, 1, 1), (3, 27, 'Shard Start', '# At the same time : NS and TS\r\n[1 min] : all MS, you can boot them all at the same time\r\n[1 min] : IOS\r\n[3 mins] : GMPS\r\n[3 mins] : EGS\r\n[5 mins] : AI Fyros\r\n[1 min 30] : AI Zorai\r\n[1 min 30] : AI Matis\r\n[1 min 30] : AI TNP\r\n[1 min 30] : AI NPE\r\n[1 min 30] : AI Tryker\r\n[1 min 30] : All FS and SBS at the same time\r\n[30 secs] : WS (atm the WS starts in OPEN mode by default, so be fast before CSR checkage, fix for that inc soon)\r\n\r\nNOTE: you can check the uptime for those timers in the right column of the admin tool: UpTime\r\n', 1158751126, 1, 0), (5, 27, 'shutting supplementary', 'the writing wont change when lock the ws\r\n\r\nuntick previous boxes as you shut down\r\n\r\nwait 5 between the ws and the egs ie egs is 5 past rest is 10 past', 1153395380, 1, 0), (4, 27, 'Shard Stop', '1. Broadcast to warn players\r\n\r\n2. 10 mins before shutdown, lock the WS\r\n\r\n3. At the right time shut down WS\r\n\r\n4. Shut down EGS\r\nOnly the EGS. Wait 5 reals minutes. Goal is to give enough time to egs, in order to save all the info he has to, and letting him sending those message to all services who need it.\r\n\r\n5. Shut down the rest, et voilà, you're done.', 1153314198, 1, 0), (6, 27, 'Start (EGS to high?)', 'If [EGS] is to high on startup:\r\n\r\n[shut down egs]\r\n[5 mins]\r\n\r\n[IOS] & [GPMS] (shut down at same time)\r\n\r\nAfter the services are down follow "UP" process with timers again.\r\n\r\nIOS\r\n[3 mins]\r\nGPMS\r\n[3 mins]\r\nEGS\r\n[5 mins]\r\nbla bla...', 1153395097, 1, 0), (7, 27, 'opening if the egs is too high on reboot', '<kadael> here my note on admin about egs to high on startup\r\n<kadael> ---\r\n<kadael> If [EGS] is to high on startup:\r\n<kadael> [shut down egs]\r\n<kadael> [5 mins]\r\n<kadael> [IOS] & [GPMS] (at same time shut down )\r\n<kadael> after the services are down follow "UP" process with timers again.\r\n<kadael> IOS\r\n<kadael> [3 mins]\r\n<kadael> GPMS\r\n<kadael> [3 mins]\r\n<kadael> EGS\r\n<kadael> [5 mins]\r\n<kadael> bla bla...\r\n<kadael> ---', 1153395362, 1, 0), (10, 27, 'Ring points', 'Commande pour donner tout les points ring à tout le monde :\r\n\r\nDans le DSS d'un Shard Ring entrer : DefaultCharRingAccess f7:j7:l6:d7:p13:g9:a9', 1155722296, 1, 0), (9, 27, 'Start (EGS to high?)', 'If [EGS] is to high on startup: \r\n \r\n [shut down egs] \r\n [5 mins] \r\n \r\n [IOS] & [GPMS] (shut down at same time) \r\n \r\n After the services are down follow "UP" process with timers again. \r\n \r\n IOS \r\n [3 mins] \r\n GPMS \r\n [3 mins] \r\n EGS \r\n [5 mins] \r\n bla bla...', 1153929658, 1, 0); /*!40000 ALTER TABLE `neltool_notes` ENABLE KEYS */; # Dumping data for table nel_tool.neltool_restart_groups: 4 rows diff --git a/code/ryzom/tools/server/sql/ryzom_tables.sql b/code/ryzom/tools/server/sql/ryzom_tables.sql index 25bfc1fac..158d359a4 100644 --- a/code/ryzom/tools/server/sql/ryzom_tables.sql +++ b/code/ryzom/tools/server/sql/ryzom_tables.sql @@ -68,7 +68,7 @@ CREATE TABLE IF NOT EXISTS `shard` ( `MOTD` text NOT NULL, `prim` int(10) unsigned NOT NULL AUTO_INCREMENT, PRIMARY KEY (`prim`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='contains all shards informations for login system'; +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='contains all shards information for login system'; # Data exporting was unselected. @@ -125,7 +125,7 @@ CREATE TABLE IF NOT EXISTS `user` ( KEY `Community` (`Community`), KEY `Email` (`Email`), KEY `GMId` (`GMId`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='contains all users informations for login system'; +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='contains all users information for login system'; # Data exporting was unselected. # -------------------------------------------------------- diff --git a/code/ryzom/tools/server/www/login/r2_login.php b/code/ryzom/tools/server/www/login/r2_login.php index b4f7adf74..c6a9de6f2 100644 --- a/code/ryzom/tools/server/www/login/r2_login.php +++ b/code/ryzom/tools/server/www/login/r2_login.php @@ -31,7 +31,7 @@ if ($resultCode == 0 && $cookie != "") { - // gather the domain informations (server version, patch urls and backup patch url + // gather the domain information (server version, patch urls and backup patch url global $DBHost, $DBUserName, $DBPassword, $DBName, $AutoInsertInRing; $link = mysql_connect($DBHost, $DBUserName, $DBPassword) or die (errorMsgBlock(3004, 'main', $DBHost, $DBUserName)); diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/cache.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/cache.php index 65ed53ca2..045be2227 100644 --- a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/cache.php +++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/cache.php @@ -62,7 +62,7 @@ class CacheHelper extends AppHelper { * @param string $file File to cache * @param string $out output to cache * @param boolean $cache Whether or not a cache file should be written. - * @return string view ouput + * @return string view output */ function cache($file, $out, $cache = false) { $cacheTime = 0; diff --git a/code/snowballs2/server/position/src/main.cpp b/code/snowballs2/server/position/src/main.cpp index 98eca639b..a1ea5cedd 100644 --- a/code/snowballs2/server/position/src/main.cpp +++ b/code/snowballs2/server/position/src/main.cpp @@ -73,7 +73,7 @@ struct _player typedef map _pmap; _pmap playerList; -// Define informations used for the snowballs management +// Define information used for the snowballs management struct _snowball { _snowball( uint32 Id, uint32 Owner, CTrajectory Traj, float ExplosionRadius ) : @@ -434,7 +434,7 @@ void cbSnowball (CMessage &msgin, const std::string &serviceName, TServiceId sid msgin.serial( explosionRadius ); nldebug( "SB: Received SNOWBALL line." ); - // Store new snowballs informations + // Store new snowballs information CTrajectory traj; traj.init( start, target, speed, CTime::getLocalTime() + THROW_ANIM_OFFSET ); _snowball snowball = _snowball( snowballId, playerId, traj, explosionRadius ); diff --git a/code/tool/build/build b/code/tool/build/build index 708030bc4..e1ea7df5e 100644 --- a/code/tool/build/build +++ b/code/tool/build/build @@ -28,7 +28,7 @@ # $ build snowballs all install # # As you can see there is no need to specify the installed directory -# of NeL, etc ... These informations are automaticly provided to the +# of NeL, etc ... These information are automaticly provided to the # configure script. # # Check the following variables to get an idea of the place of the @@ -410,7 +410,7 @@ case $1 in && cp -Rfdp $NEL_SRC/include $BUILD_DIR/nel # Remove from the compilation directory the useless CVS - # informations + # information cd $BUILD_DIR/nel/include \ && find . -prune -type d -name CVS -exec rm -rf \{\} \; diff --git a/code/web/api/common/auth.php b/code/web/api/common/auth.php index 3f06d28d5..05cda2dba 100644 --- a/code/web/api/common/auth.php +++ b/code/web/api/common/auth.php @@ -107,7 +107,7 @@ function ryzom_app_authenticate(&$user, $ask_login=true, $welcome_message='', $w $_SESSION['lang'] = $lang; define('RYZOM_IG', $user['ig']); - // get user informations + // get user information $ig = $user['ig']; $user = ryzom_user_get_info($cid, $webprivs); @@ -137,7 +137,7 @@ function ryzom_app_authenticate(&$user, $ask_login=true, $welcome_message='', $w if (isset($user['last_played_date'])) $_SESSION['last_played_date'] = $user['last_played_date']; - // don't send this informations to external apps + // don't send this information to external apps unset($user['last_played_date']); unset($user['creation_date']); return true; From 39668984c146f466eb8b57b6ce32f2a1ff3d56e5 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 8 Feb 2013 13:26:07 +0100 Subject: [PATCH 3/9] Changed: Typo fixes (thanks to Vagrant!) --- code/nel/src/misc/path.cpp | 8 ++++---- code/nel/tools/misc/bnp_make/main.cpp | 8 ++++---- code/ryzom/client/src/login_patch.cpp | 8 ++++---- code/ryzom/client/src/permanent_ban.cpp | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/code/nel/src/misc/path.cpp b/code/nel/src/misc/path.cpp index c59aabf0c..f92b0bda7 100644 --- a/code/nel/src/misc/path.cpp +++ b/code/nel/src/misc/path.cpp @@ -1222,18 +1222,18 @@ void CFileContainer::addSearchBigFile (const string &sBigFilename, bool recurse, //nlfseek64 (Handle, 0, SEEK_END); //uint32 nFileSize = ftell (Handle); nlfseek64 (Handle, nFileSize-4, SEEK_SET); - uint32 nOffsetFromBegining; - if (fread (&nOffsetFromBegining, sizeof(uint32), 1, Handle) != 1) + uint32 nOffsetFromBeginning; + if (fread (&nOffsetFromBeginning, sizeof(uint32), 1, Handle) != 1) { fclose(Handle); return; } #ifdef NL_BIG_ENDIAN - NLMISC_BSWAP32(nOffsetFromBegining); + NLMISC_BSWAP32(nOffsetFromBeginning); #endif - nlfseek64 (Handle, nOffsetFromBegining, SEEK_SET); + nlfseek64 (Handle, nOffsetFromBeginning, SEEK_SET); uint32 nNbFile; if (fread (&nNbFile, sizeof(uint32), 1, Handle) != 1) { diff --git a/code/nel/tools/misc/bnp_make/main.cpp b/code/nel/tools/misc/bnp_make/main.cpp index 8bfc4c8a1..06025d80c 100644 --- a/code/nel/tools/misc/bnp_make/main.cpp +++ b/code/nel/tools/misc/bnp_make/main.cpp @@ -148,18 +148,18 @@ struct BNPHeader uint32 nFileSize=CFile::getFileSize (filename); nlfseek64 (f, nFileSize-sizeof(uint32), SEEK_SET); - uint32 nOffsetFromBegining; - if (fread (&nOffsetFromBegining, sizeof(uint32), 1, f) != 1) + uint32 nOffsetFromBeginning; + if (fread (&nOffsetFromBeginning, sizeof(uint32), 1, f) != 1) { fclose (f); return false; } #ifdef NL_BIG_ENDIAN - NLMISC_BSWAP32(nOffsetFromBegining); + NLMISC_BSWAP32(nOffsetFromBeginning); #endif - if (nlfseek64 (f, nOffsetFromBegining, SEEK_SET) != 0) + if (nlfseek64 (f, nOffsetFromBeginning, SEEK_SET) != 0) { fclose (f); return false; diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp index bf3910dcf..860f5c7f2 100644 --- a/code/ryzom/client/src/login_patch.cpp +++ b/code/ryzom/client/src/login_patch.cpp @@ -1701,18 +1701,18 @@ bool CPatchManager::readBNPHeader(const string &SourceName, vector &Fi uint32 nFileSize = NLMISC::CFile::getFileSize (SourceName); nlfseek64 (f, nFileSize-sizeof(uint32), SEEK_SET); - uint32 nOffsetFromBegining; - if (fread (&nOffsetFromBegining, sizeof(uint32), 1, f) != 1) + uint32 nOffsetFromBeginning; + if (fread (&nOffsetFromBeginning, sizeof(uint32), 1, f) != 1) { fclose(f); return false; } #ifdef NL_BIG_ENDIAN - NLMISC_BSWAP32(nOffsetFromBegining); + NLMISC_BSWAP32(nOffsetFromBeginning); #endif - if (nlfseek64 (f, nOffsetFromBegining, SEEK_SET) != 0) + if (nlfseek64 (f, nOffsetFromBeginning, SEEK_SET) != 0) { fclose(f); return false; diff --git a/code/ryzom/client/src/permanent_ban.cpp b/code/ryzom/client/src/permanent_ban.cpp index e176240c4..fe56446d2 100644 --- a/code/ryzom/client/src/permanent_ban.cpp +++ b/code/ryzom/client/src/permanent_ban.cpp @@ -150,18 +150,18 @@ static void markBNPFile(std::string &path) return; } - uint32 nOffsetFromBegining; - if (fread (&nOffsetFromBegining, sizeof(uint32), 1, f) != 1) + uint32 nOffsetFromBeginning; + if (fread (&nOffsetFromBeginning, sizeof(uint32), 1, f) != 1) { fclose (f); return; } #ifdef NL_BIG_ENDIAN - NLMISC_BSWAP32(nOffsetFromBegining); + NLMISC_BSWAP32(nOffsetFromBeginning); #endif - if (nlfseek64 (f, nOffsetFromBegining, SEEK_SET) != 0) + if (nlfseek64 (f, nOffsetFromBeginning, SEEK_SET) != 0) { fclose (f); return; From dc285731700b8f5f2d1bfdd42986a03d74a16327 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 8 Feb 2013 13:29:17 +0100 Subject: [PATCH 4/9] Changed: Preliminary memory leaks detection under Windows --- code/nel/src/misc/co_task.cpp | 8 ++++++++ code/nel/src/misc/common.cpp | 6 ++++++ code/nel/src/misc/config_file/config_file.cpp | 5 +++++ code/nel/src/misc/contiguous_block_allocator.cpp | 5 +++++ code/nel/src/misc/debug.cpp | 9 ++++++++- code/nel/src/misc/displayer.cpp | 5 +++++ code/nel/src/misc/fixed_size_allocator.cpp | 7 ++++++- code/nel/src/misc/heap_memory.cpp | 4 ++++ code/nel/src/misc/log.cpp | 7 ++++++- code/nel/src/misc/object_arena_allocator.cpp | 4 ++++ 10 files changed, 57 insertions(+), 3 deletions(-) diff --git a/code/nel/src/misc/co_task.cpp b/code/nel/src/misc/co_task.cpp index 8fdfb6449..91b0132a9 100644 --- a/code/nel/src/misc/co_task.cpp +++ b/code/nel/src/misc/co_task.cpp @@ -15,9 +15,13 @@ // along with this program. If not, see . #include "stdmisc.h" + +#include "nel/misc/types_nl.h" #include "nel/misc/co_task.h" #include "nel/misc/tds.h" #include "nel/misc/time_nl.h" +#include "nel/misc/debug.h" + // Flag to use thread instead of coroutine primitives (i.e windows fibers or gcc context) #ifndef NL_OS_WINDOWS #define NL_USE_THREAD_COTASK @@ -59,6 +63,10 @@ #endif #endif //NL_USE_THREAD_COTASK +#ifdef DEBUG_NEW + #define new DEBUG_NEW +#endif + namespace NLMISC { diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp index 347569976..36e167260 100644 --- a/code/nel/src/misc/common.cpp +++ b/code/nel/src/misc/common.cpp @@ -16,6 +16,9 @@ #include "stdmisc.h" +#include "nel/misc/types_nl.h" +#include "nel/misc/common.h" + #ifdef NL_OS_WINDOWS # define NOMINMAX # include @@ -68,6 +71,9 @@ extern "C" long _ftol2( double dblSource ) { return _ftol( dblSource ); } #endif // NL_OS_WINDOWS +#ifdef DEBUG_NEW + #define new DEBUG_NEW +#endif namespace NLMISC { diff --git a/code/nel/src/misc/config_file/config_file.cpp b/code/nel/src/misc/config_file/config_file.cpp index f502d327e..6113a7a2c 100644 --- a/code/nel/src/misc/config_file/config_file.cpp +++ b/code/nel/src/misc/config_file/config_file.cpp @@ -14,6 +14,7 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +#include "../stdmisc.h" #include "nel/misc/config_file.h" #include @@ -27,6 +28,10 @@ #include "nel/misc/mem_stream.h" #include "locale.h" +#ifdef DEBUG_NEW + #define new DEBUG_NEW +#endif + using namespace std; using namespace NLMISC; diff --git a/code/nel/src/misc/contiguous_block_allocator.cpp b/code/nel/src/misc/contiguous_block_allocator.cpp index 7d4ae1e0f..6db4b0d63 100644 --- a/code/nel/src/misc/contiguous_block_allocator.cpp +++ b/code/nel/src/misc/contiguous_block_allocator.cpp @@ -15,8 +15,13 @@ // along with this program. If not, see . #include "stdmisc.h" + #include "nel/misc/contiguous_block_allocator.h" +#ifdef DEBUG_NEW + #define new DEBUG_NEW +#endif + namespace NLMISC { diff --git a/code/nel/src/misc/debug.cpp b/code/nel/src/misc/debug.cpp index b37f16d57..28f40f641 100644 --- a/code/nel/src/misc/debug.cpp +++ b/code/nel/src/misc/debug.cpp @@ -16,6 +16,9 @@ #include "stdmisc.h" +#include "nel/misc/types_nl.h" +#include "nel/misc/debug.h" + #ifdef HAVE_NELCONFIG_H # include "nelconfig.h" #endif // HAVE_NELCONFIG_H @@ -27,6 +30,7 @@ #include "nel/misc/report.h" #include "nel/misc/path.h" #include "nel/misc/variable.h" +#include "nel/misc/system_info.h" #ifdef NL_OS_WINDOWS # define _WIN32_WINDOWS 0x0410 @@ -79,6 +83,9 @@ using namespace std; // If true, debug system will trap crash even if the application is in debugger static const bool TrapCrashInDebugger = false; +#ifdef DEBUG_NEW + #define new DEBUG_NEW +#endif namespace NLMISC { @@ -90,7 +97,7 @@ namespace NLMISC bool DisableNLDebug= false; NLMISC::CVariablePtr _DisableNLDebug("nel","DisableNLDebug","Disables generation and output of nldebug logs (no code associated with the log generation is executed)",&DisableNLDebug,true); -static std::string LogPath = ""; +static std::string LogPath; //bool DebugNeedAssert = false; //bool NoAssert = false; diff --git a/code/nel/src/misc/displayer.cpp b/code/nel/src/misc/displayer.cpp index d8b8f0306..d91193759 100644 --- a/code/nel/src/misc/displayer.cpp +++ b/code/nel/src/misc/displayer.cpp @@ -16,6 +16,7 @@ #include "stdmisc.h" +#include "nel/misc/types_nl.h" #ifdef NL_OS_WINDOWS # include @@ -49,6 +50,10 @@ using namespace std; +#ifdef DEBUG_NEW + #define new DEBUG_NEW +#endif + namespace NLMISC { diff --git a/code/nel/src/misc/fixed_size_allocator.cpp b/code/nel/src/misc/fixed_size_allocator.cpp index f16e87dd4..790275ec6 100644 --- a/code/nel/src/misc/fixed_size_allocator.cpp +++ b/code/nel/src/misc/fixed_size_allocator.cpp @@ -15,8 +15,13 @@ // along with this program. If not, see . #include "stdmisc.h" -#include "nel/misc/fixed_size_allocator.h" +#include "nel/misc/fixed_size_allocator.h" +#include "nel/misc/debug.h" + +#ifdef DEBUG_NEW + #define new DEBUG_NEW +#endif namespace NLMISC { diff --git a/code/nel/src/misc/heap_memory.cpp b/code/nel/src/misc/heap_memory.cpp index de9f794f2..0c3918ba0 100644 --- a/code/nel/src/misc/heap_memory.cpp +++ b/code/nel/src/misc/heap_memory.cpp @@ -17,9 +17,13 @@ #include "stdmisc.h" #include "nel/misc/heap_memory.h" +#include "nel/misc/debug.h" using namespace std; +#ifdef DEBUG_NEW + #define new DEBUG_NEW +#endif namespace NLMISC { diff --git a/code/nel/src/misc/log.cpp b/code/nel/src/misc/log.cpp index ee7cc67c0..85ec59e04 100644 --- a/code/nel/src/misc/log.cpp +++ b/code/nel/src/misc/log.cpp @@ -16,6 +16,8 @@ #include "stdmisc.h" +#include "nel/misc/log.h" + #ifdef NL_OS_WINDOWS # define NOMINMAX # include @@ -31,6 +33,9 @@ using namespace std; +#ifdef DEBUG_NEW + #define new DEBUG_NEW +#endif namespace NLMISC { @@ -430,7 +435,7 @@ void CLog::displayRawString (const char *str) (*idi)->display( *args, disp ); } } - TempString = ""; + TempString.clear(); unsetPosition(); } diff --git a/code/nel/src/misc/object_arena_allocator.cpp b/code/nel/src/misc/object_arena_allocator.cpp index 35a786c1a..9c73f5059 100644 --- a/code/nel/src/misc/object_arena_allocator.cpp +++ b/code/nel/src/misc/object_arena_allocator.cpp @@ -18,6 +18,10 @@ #include "nel/misc/object_arena_allocator.h" #include "nel/misc/fixed_size_allocator.h" +#ifdef DEBUG_NEW + #define new DEBUG_NEW +#endif + namespace NLMISC { From 2b9dc61e3eb1e8d9d4d5aa9c4aa2e3b7bae37c9c Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 8 Feb 2013 18:17:42 +0100 Subject: [PATCH 5/9] Changed: Warnings with clang --- code/nel/include/nel/misc/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/nel/include/nel/misc/debug.h b/code/nel/include/nel/misc/debug.h index 8d469b133..8c2efc62e 100644 --- a/code/nel/include/nel/misc/debug.h +++ b/code/nel/include/nel/misc/debug.h @@ -478,7 +478,7 @@ do { \ #endif // NL_NO_DEBUG -#define nlunreferenced(identifier) (identifier) +#define nlunreferenced(identifier) (void)identifier #define nlstop \ do { \ From 8409d5a3715eeae854c5d0592ed26e2c3fb0c221 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 9 Feb 2013 10:05:32 +0100 Subject: [PATCH 6/9] Changed: Typo fixes (thanks to Vagrant!) --- code/nel/include/nel/3d/vertex_program_parse.h | 2 +- code/nel/src/3d/particle_system_shape.cpp | 2 +- code/nel/src/3d/tessellation.cpp | 4 ++-- .../particle_system/located_bindable_page.cpp | 8 ++++---- .../tools/3d/plugin_max/nel_export/nel_export.rc | 2 +- .../admin_executor_service.cpp | 6 +++--- .../data/gamedev/interfaces_v3/widgets.xml | 6 +++--- code/ryzom/client/src/character_cl.cpp | 4 ++-- .../client/src/client_sheets/item_sheet.cpp | 8 ++++---- code/ryzom/client/src/client_sheets/item_sheet.h | 2 +- .../entities_game_service/client_messages.cpp | 16 ++++++++-------- .../entities_game_service.cpp | 2 +- .../guild_manager/fame_manager.cpp | 4 ++-- .../guild_manager/fame_manager.h | 6 +++--- .../player_manager/character.cpp | 12 ++++++------ .../player_manager/character.h | 2 +- .../player_manager/character_inlines.h | 2 +- .../character_inventory_manipulation.cpp | 4 ++-- .../src/input_output_service/CMakeLists.txt | 2 +- .../georges_dll/georges_implementation.cpp | 2 +- code/ryzom/tools/translation_tools/main.cpp | 4 ++-- 21 files changed, 50 insertions(+), 50 deletions(-) diff --git a/code/nel/include/nel/3d/vertex_program_parse.h b/code/nel/include/nel/3d/vertex_program_parse.h index 8c7ec7f9b..cd9f414c9 100644 --- a/code/nel/include/nel/3d/vertex_program_parse.h +++ b/code/nel/include/nel/3d/vertex_program_parse.h @@ -188,7 +188,7 @@ public: * \warning: Only syntax is checked. It doesn't check that a register has been initialised before use. * \param src The input text of a vertex program, in OpenGL format. * \param result The result program. - * \param errorOuput If parsing failed, contains the reason + * \param errorOutput If parsing failed, contains the reason * \result true if the parsing succeeded */ bool parse(const char *src, TProgram &result, std::string &errorOutput); diff --git a/code/nel/src/3d/particle_system_shape.cpp b/code/nel/src/3d/particle_system_shape.cpp index 6810bd6ef..7acbea6d4 100644 --- a/code/nel/src/3d/particle_system_shape.cpp +++ b/code/nel/src/3d/particle_system_shape.cpp @@ -173,7 +173,7 @@ void CParticleSystemShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream) ///=========================================================================== void CParticleSystemShape::buildFromPS(const CParticleSystem &ps) { - // must be sure that we are writting in the stream + // must be sure that we are writing in the stream if (_ParticleSystemProto.isReading()) { _ParticleSystemProto.invert(); diff --git a/code/nel/src/3d/tessellation.cpp b/code/nel/src/3d/tessellation.cpp index 8940358c3..58171c40f 100644 --- a/code/nel/src/3d/tessellation.cpp +++ b/code/nel/src/3d/tessellation.cpp @@ -1774,7 +1774,7 @@ void CTessFace::refineAll() /* if(psRefineThreshold*2), the face is fully splitted/geomoprhed (tests reported on sons...). */ @@ -1831,7 +1831,7 @@ void CTessFace::refineAll() // Split or merge, and meaning of errorMetric: /* if(errorMetricRefineThreshold*2), the face is fully splitted/geomoprhed. */ diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_page.cpp index 084c44f50..26643200b 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_page.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_page.cpp @@ -64,8 +64,8 @@ CLocatedBindablePage::CLocatedBindablePage(QWidget *parent) _ui.blurCoeffWidget->setWrapper(&_MotionBlurCoeffWrapper); // Fake motion blur threshold - _ui.blurTresholdWidget->setRange(0.0, 5.0); - _ui.blurTresholdWidget->setWrapper(&_MotionBlurThresholdWrapper); + _ui.blurThresholdWidget->setRange(0.0, 5.0); + _ui.blurThresholdWidget->setWrapper(&_MotionBlurThresholdWrapper); // Shock wave radius cut _ui.radiusCutWidget->setRange(0, 1); @@ -275,7 +275,7 @@ void CLocatedBindablePage::setEditedItem(CWorkspaceNode *ownerNode, NL3D::CPSLoc _MotionBlurThresholdWrapper.P = fla; _MotionBlurThresholdWrapper.OwnerNode = _Node; - _ui.blurTresholdWidget->updateUi(); + _ui.blurThresholdWidget->updateUi(); _ui.zalignCheckBox->show(); _ui.alignCheckBox->show(); @@ -633,7 +633,7 @@ void CLocatedBindablePage::updateValidWidgetForAlignOnMotion(bool align) _ui.blurCoeffLabel->setEnabled(align); _ui.blurCoeffWidget->setEnabled(align); _ui.blurTreshholdLabel->setEnabled(align); - _ui.blurTresholdWidget->setEnabled(align); + _ui.blurThresholdWidget->setEnabled(align); _ui.zalignCheckBox->setEnabled(align); } diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc b/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc index c25a08456..a2f49f0da 100644 --- a/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc +++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc @@ -121,7 +121,7 @@ BEGIN 8 PUSHBUTTON "Interrupt",IDC_BUTTONCANCEL,129,23,50,14,BS_NOTIFY LTEXT "Object progression",IDC_STATIC,7,28,79,8 - LTEXT "Lightmaps Informations...",IDC_STATICINFO,7,60,172,114 + LTEXT "Lightmaps Information...",IDC_STATICINFO,7,60,172,114 END IDD_LOD DIALOG DISCARDABLE 0, 0, 360, 200 diff --git a/code/nelns/admin_executor_service/admin_executor_service.cpp b/code/nelns/admin_executor_service/admin_executor_service.cpp index f3c5476fd..c7bbb02f7 100644 --- a/code/nelns/admin_executor_service/admin_executor_service.cpp +++ b/code/nelns/admin_executor_service/admin_executor_service.cpp @@ -205,7 +205,7 @@ uint32 LastPing = 0; // contains the date of the last ping sent to the services // Alarms // -void sendInformations(TServiceId sid) +void sendInformation(TServiceId sid) { CMessage msgout("INFO"); msgout.serialCont(AllAdminAlarms); @@ -1195,7 +1195,7 @@ static void cbAESInfo(CMessage &msgin, const std::string &serviceName, TServiceI { if (Services[j].Connected) { - sendInformations(Services[j].ServiceId); + sendInformation(Services[j].ServiceId); } } } @@ -1309,7 +1309,7 @@ void serviceConnection(const std::string &serviceName, TServiceId sid, void *arg Services[sid.get()].init(serviceName, sid); - sendInformations(sid); + sendInformation(sid); nlinfo("%s-%hu connected", Services[sid.get()].ShortName.c_str(), Services[sid.get()].ServiceId.get()); diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml index 982bdf6e9..f272c6735 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml @@ -90,9 +90,9 @@ inherit_gc_alpha="#inherit_gc_alpha" /> - - - + + + diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp index 2f947e198..60171614d 100644 --- a/code/ryzom/client/src/character_cl.cpp +++ b/code/ryzom/client/src/character_cl.cpp @@ -3345,7 +3345,7 @@ void CCharacterCL::showOrHideBodyParts( bool objectsVisible ) { // Right Hand if(rHandInstIdx<_Instances.size()) - if( !(_Items[rHandInstIdx].Sheet && _Items[rHandInstIdx].Sheet->NeverHideWhenEquiped ) ) + if( !(_Items[rHandInstIdx].Sheet && _Items[rHandInstIdx].Sheet->NeverHideWhenEquipped ) ) if(!_Instances[rHandInstIdx].Current.empty()) { _Instances[rHandInstIdx].Current.hide(); @@ -3353,7 +3353,7 @@ void CCharacterCL::showOrHideBodyParts( bool objectsVisible ) } // Left Hand if(lHandInstIdx <_Instances.size()) - if( !(_Items[lHandInstIdx].Sheet && _Items[lHandInstIdx].Sheet->NeverHideWhenEquiped ) ) + if( !(_Items[lHandInstIdx].Sheet && _Items[lHandInstIdx].Sheet->NeverHideWhenEquipped ) ) if(!_Instances[lHandInstIdx].Current.empty()) { _Instances[lHandInstIdx].Current.hide(); diff --git a/code/ryzom/client/src/client_sheets/item_sheet.cpp b/code/ryzom/client/src/client_sheets/item_sheet.cpp index 6da0eefab..1e7894b79 100644 --- a/code/ryzom/client/src/client_sheets/item_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/item_sheet.cpp @@ -100,7 +100,7 @@ CItemSheet::CItemSheet() Type = CEntitySheet::ITEM; Bulk= 0.f; EquipTime= 0; - NeverHideWhenEquiped = false; + NeverHideWhenEquipped = false; RequiredCharac = CHARACTERISTICS::Unknown; RequiredCharacLevel = 0; RequiredSkill = SKILLS::unknown; @@ -214,8 +214,8 @@ void CItemSheet::build(const NLGEORGES::UFormElm &item) IconText = strlwr (IconText); IdIconText = ClientSheetsStrings.add(IconText); - // See if this item can be hiden when equiped - if(!item.getValueByName (NeverHideWhenEquiped, "3d.never hide when equiped")) + // See if this item can be hiden when equipped + if(!item.getValueByName (NeverHideWhenEquipped, "3d.never hide when equiped")) debug("key '3d.never hide when equiped."); // Load the different slot in wicth the item can be equipped. @@ -633,7 +633,7 @@ void CItemSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) f.serial(HasFx); // Serialize the has fx. f.serial(DropOrSell); f.serial(IsItemNoRent); - f.serial(NeverHideWhenEquiped); + f.serial(NeverHideWhenEquipped); f.serial(Stackable); f.serial(IsConsumable); f.serial(Bulk); diff --git a/code/ryzom/client/src/client_sheets/item_sheet.h b/code/ryzom/client/src/client_sheets/item_sheet.h index a44820fda..250f8411e 100644 --- a/code/ryzom/client/src/client_sheets/item_sheet.h +++ b/code/ryzom/client/src/client_sheets/item_sheet.h @@ -330,7 +330,7 @@ public: /// Equip Time uint32 EquipTime; /// true if this item can be hidden when equipped - bool NeverHideWhenEquiped; + bool NeverHideWhenEquipped; // FX CItemFXSheet FX; diff --git a/code/ryzom/server/src/entities_game_service/client_messages.cpp b/code/ryzom/server/src/entities_game_service/client_messages.cpp index 58dc114e2..239f3da4e 100644 --- a/code/ryzom/server/src/entities_game_service/client_messages.cpp +++ b/code/ryzom/server/src/entities_game_service/client_messages.cpp @@ -108,12 +108,12 @@ void cbClientItemEquip( NLNET::CMessage& msgin, const std::string &serviceName, { H_AUTO(cbClientItemEquip); - uint16 equipedInventory, equipedSlot, bagSlot; + uint16 equippedInventory, equippedSlot, bagSlot; CEntityId id; msgin.serial( id ); - msgin.serial( equipedInventory ); - msgin.serial( equipedSlot ); + msgin.serial( equippedInventory ); + msgin.serial( equippedSlot ); msgin.serial( bagSlot ); CCharacter *c = (CCharacter * ) CEntityBaseManager::getEntityBasePtr( id ); @@ -125,7 +125,7 @@ void cbClientItemEquip( NLNET::CMessage& msgin, const std::string &serviceName, // if player is stunned or dead cancel action if (c->isDead() || c->isStunned()) return; - c->equipCharacter( INVENTORIES::TInventory(equipedInventory), equipedSlot, bagSlot, true ); + c->equipCharacter( INVENTORIES::TInventory(equippedInventory), equippedSlot, bagSlot, true ); } } @@ -134,12 +134,12 @@ void cbClientItemUnequip( NLNET::CMessage& msgin, const std::string &serviceName { H_AUTO(cbClientItemUnequip); - uint16 equipedInventory, equipedSlot; + uint16 equippedInventory, equippedSlot; CEntityId id; msgin.serial( id ); - msgin.serial( equipedInventory ); - msgin.serial( equipedSlot ); + msgin.serial( equippedInventory ); + msgin.serial( equippedSlot ); CCharacter *c = (CCharacter * ) CEntityBaseManager::getEntityBasePtr( id ); if( c ) @@ -151,7 +151,7 @@ void cbClientItemUnequip( NLNET::CMessage& msgin, const std::string &serviceName if (c->isDead() || c->isStunned()) return; - c->unequipCharacter( INVENTORIES::TInventory(equipedInventory), equipedSlot, true ); + c->unequipCharacter( INVENTORIES::TInventory(equippedInventory), equippedSlot, true ); } } diff --git a/code/ryzom/server/src/entities_game_service/entities_game_service.cpp b/code/ryzom/server/src/entities_game_service/entities_game_service.cpp index ef0f9404e..085d67aae 100644 --- a/code/ryzom/server/src/entities_game_service/entities_game_service.cpp +++ b/code/ryzom/server/src/entities_game_service/entities_game_service.cpp @@ -251,7 +251,7 @@ CCharacterBotChatBeginEnd CharacterBotChatBeginEnd; CCharacterDynChatBeginEnd CharacterDynChatBeginEnd; //*** Removed by Sadge *** //// Transport class for EGS asking information about creatures/Npc -//CCreatureAskInformationMsg CreatureNpcInformations; +//CCreatureAskInformationMsg CreatureNpcInformation; //*** *** // Transport class sent to AIS to set bot mode as death. CBSAIDeathReport BotDeathReport; diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp b/code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp index cef7560a0..e054fe0cb 100644 --- a/code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp @@ -1344,7 +1344,7 @@ sint32 CFameManager::getMaxFameByFactionIndex(std::pair _FactionIndexToTribeThresholdIndex; // :OPTIM: init/doInit is dual to inline the _FactionIndexToTribeThresholdIndex.empty() test - void initTribeTresholdIndex() + void initTribeThresholdIndex() { if(_FactionIndexToTribeThresholdIndex.empty()) - doInitTribeTresholdIndex(); + doInitTribeThresholdIndex(); } - void doInitTribeTresholdIndex(); + void doInitTribeThresholdIndex(); // FameStart - starting values for fame, [player's group][target group] // - There are no None or Neutral clans for starting fame, so leave those out. diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp index a28d65b30..2b088fab6 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp @@ -187,7 +187,7 @@ extern float CarriedItemsDecayRate; extern uint8 TeamMembersStatusMaxValue; extern CCharacterBotChatBeginEnd CharacterBotChatBeginEnd; //*** Removed by Sadge *** -//extern CCreatureAskInformationMsg CreatureNpcInformations; +//extern CCreatureAskInformationMsg CreatureNpcInformation; //*** *** extern float MaxHarvestDistance; extern float MaxMountDistance; @@ -3503,8 +3503,8 @@ void CCharacter::setTarget( const CEntityId &targetId, bool sendMessage ) //*** Removed by Sadge *** // // Ask information about target to AI service -// CreatureNpcInformations.Character.push_back( _EntityRowId ); -// CreatureNpcInformations.Creature.push_back( target->getEntityRowId() ); +// CreatureNpcInformation.Character.push_back( _EntityRowId ); +// CreatureNpcInformation.Creature.push_back( target->getEntityRowId() ); //*** *** } else // target == NULL @@ -7811,9 +7811,9 @@ void CCharacter::endHarvest(bool sendCloseTempImpulsion) _HarvestOpened = false; _DepositSearchSkill = SKILLS::unknown; _MpIndex = 0xff; - _DepositHarvestInformations.DepositIndex = 0xffffffff; + _DepositHarvestInformation.DepositIndex = 0xffffffff; - if ( _DepositHarvestInformations.Sheet != CSheetId::Unknown/*_DepositHarvestInformations.EndCherchingTime != 0xffffffff && _DepositHarvestInformations.EndCherchingTime > CTickEventHandler::getGameCycle()*/ ) + if ( _DepositHarvestInformation.Sheet != CSheetId::Unknown/*_DepositHarvestInformation.EndCherchingTime != 0xffffffff && _DepositHarvestInformation.EndCherchingTime > CTickEventHandler::getGameCycle()*/ ) { if ( sendCloseTempImpulsion ) { @@ -14041,7 +14041,7 @@ bool CCharacter::pickUpRawMaterial( uint32 indexInTempInv, bool * lastMaterial ) } clearHarvestDB(); - //CZoneManager::getInstance().removeRmFromDeposit( this, _DepositHarvestInformations.DepositIndex, _DepositHarvestInformations.DepositIndexContent,_HarvestedQuantity); + //CZoneManager::getInstance().removeRmFromDeposit( this, _DepositHarvestInformation.DepositIndex, _DepositHarvestInformation.DepositIndexContent,_HarvestedQuantity); } } } 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 8a3c127da..e46cd0a88 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 @@ -3201,7 +3201,7 @@ private: /// if harvesting a deposit, the skill used SKILLS::ESkills _DepositSearchSkill; /// Harvest deposit information - HARVEST_INFOS::CHarvestInfos _DepositHarvestInformations; + HARVEST_INFOS::CHarvestInfos _DepositHarvestInformation; //@} /// the tick value of the nex decay of player items diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h b/code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h index 615ddaeb8..d0bfe3358 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h @@ -168,7 +168,7 @@ inline uint16 CCharacter::harvestedMpQuantity() const inline HARVEST_INFOS::CHarvestInfos& CCharacter::getHarvestInfos() { - return _DepositHarvestInformations; + return _DepositHarvestInformation; } //------------------------------------------------------------------------------ diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp index 9594a0701..2ce09282c 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp @@ -2127,8 +2127,8 @@ void CCharacter::clearTempInventory() case TEMP_INV_MODE::Quarter: case TEMP_INV_MODE::Harvest: - _DepositHarvestInformations.Sheet = CSheetId::Unknown; - _DepositHarvestInformations.EndCherchingTime = 0xffffffff; + _DepositHarvestInformation.Sheet = CSheetId::Unknown; + _DepositHarvestInformation.EndCherchingTime = 0xffffffff; endHarvest(); break; diff --git a/code/ryzom/server/src/input_output_service/CMakeLists.txt b/code/ryzom/server/src/input_output_service/CMakeLists.txt index 9064ad0a3..56b5a07eb 100644 --- a/code/ryzom/server/src/input_output_service/CMakeLists.txt +++ b/code/ryzom/server/src/input_output_service/CMakeLists.txt @@ -25,7 +25,7 @@ TARGET_LINK_LIBRARIES(ryzom_ios_service nelgeorges nelligo) -NL_DEFAULT_PROPS(ryzom_ios_service "Ryzom, Services: Input Ouput Service (IOS)") +NL_DEFAULT_PROPS(ryzom_ios_service "Ryzom, Services: Input Output Service (IOS)") NL_ADD_RUNTIME_FLAGS(ryzom_ios_service) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_implementation.cpp b/code/ryzom/tools/leveldesign/georges_dll/georges_implementation.cpp index b97c22dba..2422d4b65 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/georges_implementation.cpp +++ b/code/ryzom/tools/leveldesign/georges_dll/georges_implementation.cpp @@ -517,7 +517,7 @@ void CGeorgesImpl::MakeTyp( const std::string& filename, TType type, TUI ui, con } catch (Exception &e) { - nlwarning ("Error during writting file '%s' : ", filename.c_str (), e.what ()); + nlwarning ("Error during writing file '%s' : ", filename.c_str (), e.what ()); } } else diff --git a/code/ryzom/tools/translation_tools/main.cpp b/code/ryzom/tools/translation_tools/main.cpp index 61a4ac914..d8839f1ff 100644 --- a/code/ryzom/tools/translation_tools/main.cpp +++ b/code/ryzom/tools/translation_tools/main.cpp @@ -664,7 +664,7 @@ int makeStringDiff(int argc, char *argv[]) } else { - LOG("Writting difference file for %s.\n", Languages[l].c_str()); + LOG("Writing difference file for %s.\n", Languages[l].c_str()); // build the diff file for each language. ucstring str = prepareStringFile(diff, false); @@ -1669,7 +1669,7 @@ int makeWorksheetDiff(int argc, char *argv[], const std::string &additionFilenam } else { - LOG("Writting difference file for %s.\n", referenceFilename.c_str()); + LOG("Writing difference file for %s.\n", referenceFilename.c_str()); // build the diff file for each language. ucstring str = prepareExcelSheet(diff); From 5794497a79136409d84e0060af787164b4bfb718 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 11 Feb 2013 22:24:48 +0100 Subject: [PATCH 7/9] Changed: French comments translated to English --- .../driver/opengl/mac/cocoa_event_emitter.cpp | 2 +- .../plugin_max/nel_patch_converter/script.cpp | 18 +++++++++--------- code/nel/tools/3d/tile_edit/TileCtrl.h | 2 +- .../src/interfaces_manager/chat_control.cpp | 2 +- .../ryzom/server/src/ai_service/ai_bot_npc.cpp | 4 ++-- .../server/src/ai_service/ai_grp_fauna.cpp | 8 ++++---- .../server/src/ai_service/alias_tree_owner.cpp | 2 +- .../server/src/ai_service/family_behavior.cpp | 2 +- .../building_manager/building_unit_test.cpp | 2 +- .../game_item_manager/player_inv_xchg.h | 2 +- .../game_item_manager/player_inventory.h | 2 +- .../outpost_manager/outpost.h | 2 +- .../outpost_manager/outpost_guild_db_updater.h | 6 +++--- .../outpost_manager/outpost_squad.h | 2 +- .../outpost_manager/outpost_version_adapter.h | 2 +- .../player_manager/character_respawn_points.h | 2 +- .../player_manager/item_service_manager.cpp | 4 ++-- .../player_manager/item_service_manager.h | 2 +- .../pvp_manager/pvp_safe_zone.h | 2 +- .../pvp_manager/pvp_zone.h | 6 +++--- .../server/src/entities_game_service/stat_db.h | 6 +++--- .../src/mail_forum_service/hof_generator.h | 2 +- .../mail_forum_service/shard_stat_db_manager.h | 10 +++++----- .../server/src/server_share/stat_db_tree.h | 2 +- .../src/server_share/stat_db_tree_visitor.h | 2 +- .../world_editor_plugin/plugin.cpp | 4 ++-- code/ryzom/tools/translation_tools/main.cpp | 2 +- 27 files changed, 51 insertions(+), 51 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp b/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp index 15bb40d28..d290e0cee 100644 --- a/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp +++ b/code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp @@ -209,7 +209,7 @@ static bool isTextKeyEvent(NSEvent* event) /* TODO check why iswprint(character) does not solve it. - it always returns false, even for Ï€, é, ... + it always returns false, even for non-ASCII characters */ // characters > 127 but not printable if( nelKey == NLMISC::KeyF1 || nelKey == NLMISC::KeyF2 || diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp b/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp index c2e80e06b..8acae94bd 100644 --- a/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp +++ b/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp @@ -78,9 +78,9 @@ namespace std #include "nel/misc/file.h" #include "nel/misc/common.h" -#include "..\nel_patch_lib\rpo.h" -#include "..\nel_mesh_lib\export_nel.h" -#include "..\nel_mesh_lib\export_appdata.h" +#include "../nel_patch_lib/rpo.h" +#include "../nel_mesh_lib/export_nel.h" +#include "../nel_mesh_lib/export_appdata.h" #include "nel/3d/zone.h" #include "nel/3d/zone_symmetrisation.h" @@ -135,12 +135,12 @@ def_visible_primitive( set_tile_bank, "NelSetTileBank"); def_visible_primitive( export_zone, "ExportRykolZone"); def_visible_primitive( import_zone, "NeLImportZone"); -/* permettre l'acces Eauto/manual intrior edges -faire une methode pour interfacer la fonction compute interior edge -donner un acces Etiledmode/patchmode (on/off) -faire un getselectedvertex -faire un getselectedpatch -faire un getselectedtile */ +/* allows access to auto/manual interior edges +create a method to interface compute interior edge function +give access to tiledmode/patchmode (on/off) +use getselectedvertex +use getselectedpatch +use getselectedtile */ /*def_visible_primitive( set_interior_mode, "SetRykolInteriorMode"); def_visible_primitive( set_vertex_count, "GetRykolVertexCount");*/ diff --git a/code/nel/tools/3d/tile_edit/TileCtrl.h b/code/nel/tools/3d/tile_edit/TileCtrl.h index 9d1f54327..bbb5eca08 100644 --- a/code/nel/tools/3d/tile_edit/TileCtrl.h +++ b/code/nel/tools/3d/tile_edit/TileCtrl.h @@ -72,7 +72,7 @@ public: void DeleteAll(); //efface provisoirement les sections DIB et les *Bits; void Reload(CDC *pDC,tilelist::iterator iFirst,int n); //recharge en memoire une tranche de tiles int last_id; - tilelist::iterator iFirst,iLast; //index du premier et du dernier element chargé en memoire + tilelist::iterator iFirst,iLast; // first and last index loaded in memory }; diff --git a/code/ryzom/client/src/interfaces_manager/chat_control.cpp b/code/ryzom/client/src/interfaces_manager/chat_control.cpp index 9be33a153..44068c84a 100644 --- a/code/ryzom/client/src/interfaces_manager/chat_control.cpp +++ b/code/ryzom/client/src/interfaces_manager/chat_control.cpp @@ -274,7 +274,7 @@ void CChatControl::add(const ucstring &text) //----------------------------------------------- void CChatControl::display() { - // \todo GUIGUI : remove this damn thing after the UBI démo. + // \todo GUIGUI : remove this damn thing after the UBI demo. const CRGBA playerColors[10] = { CRGBA(250,250, 10), // 0 : Jaune diff --git a/code/ryzom/server/src/ai_service/ai_bot_npc.cpp b/code/ryzom/server/src/ai_service/ai_bot_npc.cpp index a87b05865..cb183850e 100644 --- a/code/ryzom/server/src/ai_service/ai_bot_npc.cpp +++ b/code/ryzom/server/src/ai_service/ai_bot_npc.cpp @@ -875,9 +875,9 @@ Colors are something like that: 2: VERT CITRON VERT CITRON GREEN 3: VERT VERT TURQUOISE 4: BLEU BLEU BLUE -5: ROUGE foncé ROUGE (tout court) CRIMSON +5: ROUGE fonce ROUGE (tout court) CRIMSON 6: BLANC JAUNE WHITE -7: NOIR BLEU très foncé BLACK +7: NOIR BLEU tres fonce BLACK 3D column is (probably) used for equipment */ diff --git a/code/ryzom/server/src/ai_service/ai_grp_fauna.cpp b/code/ryzom/server/src/ai_service/ai_grp_fauna.cpp index bebaa89b3..2bab5200d 100644 --- a/code/ryzom/server/src/ai_service/ai_grp_fauna.cpp +++ b/code/ryzom/server/src/ai_service/ai_grp_fauna.cpp @@ -197,12 +197,12 @@ CBotFauna* CSpawnGroupFauna::findLeader() while (it!=itEnd) { CBotFauna* botPtr = static_cast(*it); - if (botPtr->isSpawned()) // si le bot est spawné. + if (botPtr->isSpawned()) // if bot is spawned { - if (botPtr->getSpawnObj()->isAlive()) // s'il est en vie. + if (botPtr->getSpawnObj()->isAlive()) // is alive { possibleLeader=botPtr; - if (_TargetPlace->atPlace(possibleLeader->getSpawn()->pos())) // et éventuellement s'il est dans la place. + if (_TargetPlace->atPlace(possibleLeader->getSpawn()->pos())) // and eventually in place return possibleLeader; } } @@ -1032,7 +1032,7 @@ void CGrpFauna::setPopulation(CPopulation* pop) if (pop && pop->size()==0) // no population record :( pop=NULL; - if (sameAliasPop) // Alias already présent ? + if (sameAliasPop) // Alias already present ? { index = sameAliasPop->getChildIndex(); _Populations.addChild(pop, index); // automatic deletion with smart pointers diff --git a/code/ryzom/server/src/ai_service/alias_tree_owner.cpp b/code/ryzom/server/src/ai_service/alias_tree_owner.cpp index fe47e9635..d8c963c9e 100644 --- a/code/ryzom/server/src/ai_service/alias_tree_owner.cpp +++ b/code/ryzom/server/src/ai_service/alias_tree_owner.cpp @@ -129,7 +129,7 @@ void CAliasTreeOwner::updateAliasTree(const CAIAliasDescriptionNode &newTree) CAliasTreeOwner* child = cont->getAliasChildByAlias(newAliasChild->getAlias()); if (!child) // a child related to this alias not yet exists .. { - // so we ask to create one objet of this type ( implémentation is specialized :) ) + // so we ask to create one objet of this type ( implementation is specialized :) ) // giving it the so precious CAIAliasDescriptionNode. // assumes that it adds the child to its parent ( check by the next assert ). child=childOwner->createChild(cont,newAliasChild); diff --git a/code/ryzom/server/src/ai_service/family_behavior.cpp b/code/ryzom/server/src/ai_service/family_behavior.cpp index f178c21b7..6612d19db 100644 --- a/code/ryzom/server/src/ai_service/family_behavior.cpp +++ b/code/ryzom/server/src/ai_service/family_behavior.cpp @@ -421,7 +421,7 @@ void CFamilyBehavior::update(uint32 nbTicks) || !grp->isSpawned()) break; -// rajouter un test sur la validité du groupe par rapport aux flags des zones occupées pour savoir s'il faut le despawner .. :) +// add a check if group is valid related to used regions flags to know if we need to despawn it bool alreadyDespawned=false; breakable diff --git a/code/ryzom/server/src/entities_game_service/building_manager/building_unit_test.cpp b/code/ryzom/server/src/entities_game_service/building_manager/building_unit_test.cpp index a93bcf185..977696af7 100644 --- a/code/ryzom/server/src/entities_game_service/building_manager/building_unit_test.cpp +++ b/code/ryzom/server/src/entities_game_service/building_manager/building_unit_test.cpp @@ -66,7 +66,7 @@ static CEntityId createFakeCharacter(uint32 playerId, const string & name, EGSPD /** * Class used to test building manager - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date 2004 */ diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_xchg.h b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_xchg.h index ab468098b..65b875723 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_xchg.h +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_xchg.h @@ -26,7 +26,7 @@ /** * CExchangeView * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Matthieu 'Trap' Besson * \author Nevrax France * \date February 2005 diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.h b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.h index 76494810b..e88c9bf88 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.h +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.h @@ -381,7 +381,7 @@ private: /** * CCharacterInvView * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date February 2005 */ diff --git a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.h b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.h index a0f37df42..64b6c893d 100644 --- a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.h +++ b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.h @@ -34,7 +34,7 @@ * All classes in this file : * \author Nicolas Brigand * \author Olivier Cado - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Jérôme Vuarand * \author Nevrax France * \date 2005 diff --git a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_guild_db_updater.h b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_guild_db_updater.h index 91c470eb2..55be3dbee 100644 --- a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_guild_db_updater.h +++ b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_guild_db_updater.h @@ -30,7 +30,7 @@ class COutpost; /** * Base class to manipulate the outpost guild client database. * - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date october 2005 */ @@ -102,7 +102,7 @@ private: /** * This class updates the outpost guild client database. * - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date october 2005 */ @@ -158,7 +158,7 @@ typedef NLMISC::CSmartPtr COutpostGuildDBUpdaterPtr; /** * This class clears the outpost guild client database. * - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date october 2005 */ diff --git a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.h b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.h index 16ad90783..15e2040fd 100644 --- a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.h +++ b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.h @@ -25,7 +25,7 @@ * All classes in this file : * \author Nicolas Brigand * \author Olivier Cado - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Jérôme Vuarand * \author Nevrax France * \date 2005 diff --git a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_version_adapter.h b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_version_adapter.h index 88eaea193..89fa637f7 100644 --- a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_version_adapter.h +++ b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_version_adapter.h @@ -22,7 +22,7 @@ class COutpost; /** * Singleton class used to adapt different version of COutpost - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 */ diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_respawn_points.h b/code/ryzom/server/src/entities_game_service/player_manager/character_respawn_points.h index 9c972748b..b53329096 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character_respawn_points.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/character_respawn_points.h @@ -34,7 +34,7 @@ class CCharacter; /** * CCharacterRespawnPoints * This class contains code and data relative to the player respawn points. - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 */ diff --git a/code/ryzom/server/src/entities_game_service/player_manager/item_service_manager.cpp b/code/ryzom/server/src/entities_game_service/player_manager/item_service_manager.cpp index c21346bbc..2644c4f87 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/item_service_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/item_service_manager.cpp @@ -48,7 +48,7 @@ CItemServiceManager * CItemServiceManager::_Instance = NULL; /** * Base class for persistent item service providers (ISP) * WARNING: this class should never modify client->getPersistentItemServices() vector (only CItemServiceManager should do) - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date 2005 */ @@ -76,7 +76,7 @@ private: /** * Base class for item service providers * WARNING: this class should never modify client->getPersistentItemServices() vector (only CItemServiceManager should do) - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date 2005 */ diff --git a/code/ryzom/server/src/entities_game_service/player_manager/item_service_manager.h b/code/ryzom/server/src/entities_game_service/player_manager/item_service_manager.h index ce2758b8a..c896fb13f 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/item_service_manager.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/item_service_manager.h @@ -33,7 +33,7 @@ class IItemServiceProvider; /** * This class provides services associated to items (aka "item services") - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date 2005 */ diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_safe_zone.h b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_safe_zone.h index 5d51285b2..05f529ffe 100644 --- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_safe_zone.h +++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_safe_zone.h @@ -26,7 +26,7 @@ /** * A PVP safe zone - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date 2004 */ diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_zone.h b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_zone.h index 8370a40d4..132c02d95 100644 --- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_zone.h +++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_zone.h @@ -60,7 +60,7 @@ class CPVPSafeZone; /** * Base class of PVP zones - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date 2004 */ @@ -188,7 +188,7 @@ private: /** * A PVP versus zone : 2 clans fight there - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date 2004 */ @@ -257,7 +257,7 @@ private: /** * A PVP guild zone : guilds fight there - * \author Sébastien Guignot + * \author Sebastien Guignot * \author Nevrax France * \date 2004 */ diff --git a/code/ryzom/server/src/entities_game_service/stat_db.h b/code/ryzom/server/src/entities_game_service/stat_db.h index 39ca77a67..ac25b1c5e 100644 --- a/code/ryzom/server/src/entities_game_service/stat_db.h +++ b/code/ryzom/server/src/entities_game_service/stat_db.h @@ -30,7 +30,7 @@ class CFileDescription; /** * This class collects leaves and furnishes their persistent data for backup * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ @@ -63,7 +63,7 @@ private: /** * This class collects all leaves and furnishes the message data for MFS init * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ @@ -83,7 +83,7 @@ private: /** * This class displays a node of SDB * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ diff --git a/code/ryzom/server/src/mail_forum_service/hof_generator.h b/code/ryzom/server/src/mail_forum_service/hof_generator.h index a7b2774d6..96381d7ee 100644 --- a/code/ryzom/server/src/mail_forum_service/hof_generator.h +++ b/code/ryzom/server/src/mail_forum_service/hof_generator.h @@ -27,7 +27,7 @@ * It parses all the 'HoF Data Template' files (.hdt) * and generates data in PHP scripts for all shards * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ diff --git a/code/ryzom/server/src/mail_forum_service/shard_stat_db_manager.h b/code/ryzom/server/src/mail_forum_service/shard_stat_db_manager.h index 68b2f212c..dde776280 100644 --- a/code/ryzom/server/src/mail_forum_service/shard_stat_db_manager.h +++ b/code/ryzom/server/src/mail_forum_service/shard_stat_db_manager.h @@ -26,7 +26,7 @@ typedef NLMISC::CSmartPtr CShardStatDBPtr; /** * This class manages player and guild names for SDB * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ @@ -52,7 +52,7 @@ private: /** * This class displays a node of SDB * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ @@ -105,7 +105,7 @@ private: /** * This class provides a read-only access to a shard SDB copy * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ @@ -143,7 +143,7 @@ private: /** * A shard SDB copy * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ @@ -189,7 +189,7 @@ private: * This manager keeps copies of shard statistical databases up-to-date * and furnishes a read-only access to the shard SDB copies * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ diff --git a/code/ryzom/server/src/server_share/stat_db_tree.h b/code/ryzom/server/src/server_share/stat_db_tree.h index 3b98be248..7e512a40f 100644 --- a/code/ryzom/server/src/server_share/stat_db_tree.h +++ b/code/ryzom/server/src/server_share/stat_db_tree.h @@ -229,7 +229,7 @@ private: /** * This class removes entities (players and guilds) through a SDB node * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ diff --git a/code/ryzom/server/src/server_share/stat_db_tree_visitor.h b/code/ryzom/server/src/server_share/stat_db_tree_visitor.h index 6baf0242e..d4d44ee6f 100644 --- a/code/ryzom/server/src/server_share/stat_db_tree_visitor.h +++ b/code/ryzom/server/src/server_share/stat_db_tree_visitor.h @@ -27,7 +27,7 @@ class CStatDBTableLeaf; /** * SDB node visitor (visitor design pattern). * - * \author Sébastien 'kxu' Guignot + * \author Sebastien 'kxu' Guignot * \author Nevrax France * \date 2005 July */ diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp index ecd051b0b..3cf2a00b7 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp @@ -38,9 +38,9 @@ Voici la d -5) World_Editor_Service utilise un cache pour stocker les déplacements des joueurs, afin de n'envoyer que ce qui bouge +5) World_Editor_Service uses a cache to save players moves, to be able to send only moving entities -6) World_Editor_Plugin utilise aussi un cache avec un pointeur sur les Primitives, afin de ne modifier dans WE que ce qui bouge +6) World_Editor_Plugin uses too a cache with a pointer on Primitives, to modify only moving entities in WE */ #include "stdafx.h" diff --git a/code/ryzom/tools/translation_tools/main.cpp b/code/ryzom/tools/translation_tools/main.cpp index d8839f1ff..3ec5a8b4a 100644 --- a/code/ryzom/tools/translation_tools/main.cpp +++ b/code/ryzom/tools/translation_tools/main.cpp @@ -3139,7 +3139,7 @@ int main(int argc, char *argv[]) { uint64 hash = makeHash(ucstring("Bonjour le monde !")); nldebug("%s", hashToString(hash).c_str()); - hash = makeHash(ucstring("Une autre cléf")); + hash = makeHash(ucstring("Une autre clef")); nldebug("%s", hashToString(hash).c_str()); } */ From 1bf4109e5bb24fd2e6637873f62316285cd54836 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 11 Feb 2013 22:34:24 +0100 Subject: [PATCH 8/9] Changed: Typo fixes (Thanks to DuDraig!) --- .../src/plugins/object_viewer/widgets/edit_range_widget.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_widget.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_widget.h index d84b93b67..7223e5380 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_widget.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_widget.h @@ -33,7 +33,7 @@ namespace NLQT /** @class CEditRangeUIntWidget -@brief The widget provides a horizontal slider and 3 QSpinBox(to set start/end value range and Ñurrent value from this range.). +@brief The widget provides a horizontal slider and 3 QSpinBox(to set start/end value range and current value from this range.). @details Slider sets the uint32 value within a specified range (start/end QSpinBox). The values range can be set through the class methods: setRange() or setRangeMin(), setRangeMax(). Or the user input values in the widgets start/end QSpinBox. From b368cae7a5dacbc0321625b1098ba1d9d73154ae Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 12 Feb 2013 17:07:38 +0100 Subject: [PATCH 9/9] Changed: Typo fixes (Thanks to DuDraig!) --- .../plugins/object_viewer/particle_system/particle_node.h | 2 +- .../object_viewer/particle_system/particle_tree_model.h | 2 +- .../src/plugins/object_viewer/widgets/edit_range_widget.h | 6 +++--- .../src/plugins/translation_manager/editor_worksheet.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_node.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_node.h index 9bc3de885..9ae36fd49 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_node.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_node.h @@ -235,7 +235,7 @@ public: virtual void nodeModifiedFlagChanged(CWorkspaceNode &node) = 0; virtual void nodeSkelParentChanged(CWorkspaceNode &node) = 0; // called when fx has been linked / unlinked from a skeleton parent }; - /// Сonstructor + /// Constructor CParticleWorkspace(); /// Destructor ~CParticleWorkspace(); diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_tree_model.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_tree_model.h index 2ab5dbe89..9cf73d9d5 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_tree_model.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/particle_tree_model.h @@ -59,7 +59,7 @@ struct ItemType /** @class CParticleTreeItem @brief Basic elements tree model particles workspace. -Сontains pointer to items particle workspace and type icons. +Contains pointer to items particle workspace and type icons. */ class CParticleTreeItem { diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_widget.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_widget.h index 7223e5380..ae617d10d 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_widget.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/widgets/edit_range_widget.h @@ -33,7 +33,7 @@ namespace NLQT /** @class CEditRangeUIntWidget -@brief The widget provides a horizontal slider and 3 QSpinBox(to set start/end value range and current value from this range.). +@brief The widget provides a horizontal slider and 3 QSpinBox(to set start/end value range and current value from this range.). @details Slider sets the uint32 value within a specified range (start/end QSpinBox). The values range can be set through the class methods: setRange() or setRangeMin(), setRangeMax(). Or the user input values in the widgets start/end QSpinBox. @@ -120,7 +120,7 @@ private: /** @class CEditRangeIntWidget -@brief The widget provides a horizontal slider and 3 QSpinBox(to set start/end value range and Ñurrent value from this range.). +@brief The widget provides a horizontal slider and 3 QSpinBox(to set start/end value range and current value from this range.). @details Slider sets the sint32 value within a specified range (start/end QSpinBox). The values range can be set through the class methods: setRange() or setRangeMin(), setRangeMax(). Or the user input values in the widgets start/end QSpinBox. @@ -207,7 +207,7 @@ private: /** @class CEditRangeFloatWidget -@brief The widget provides a horizontal slider and 3 QDoubleSpinBox(to set start/end value range and Ñurrent value from this range.). +@brief The widget provides a horizontal slider and 3 QDoubleSpinBox(to set start/end value range and current value from this range.). @details Slider sets the float value within a specified range (start/end QDoubleSpinBox). The values range can be set through the class methods: setRange() or setRangeMin(), setRangeMax(). Or the user input values in the widgets start/end QDoubleSpinBox. diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.cpp index 9df0655ac..c353bb1aa 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.cpp @@ -1,4 +1,4 @@ -// Translation Manager Plugin - OVQT Plugin +// Translation Manager Plugin - OVQT Plugin // Copyright (C) 2010 Winch Gate Property Limited // Copyright (C) 2011 Emanuel Costea //