From 804170c6f067782d6378ae83b88b1b5c9e7fef3f Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 13 Jun 2010 16:58:11 +0200 Subject: [PATCH 1/4] Changed: #878 Fix typos in comments/code --- code/nel/include/nel/3d/index_buffer.h | 2 +- code/nel/include/nel/3d/landscape.h | 2 +- code/nel/include/nel/3d/mesh_base.h | 2 +- code/nel/include/nel/3d/mesh_base_instance.h | 2 +- code/nel/include/nel/3d/mesh_vertex_program.h | 2 +- code/nel/include/nel/3d/particle_system.h | 2 +- code/nel/include/nel/3d/shape.h | 2 +- .../nel/3d/u_visual_collision_entity.h | 8 ++--- code/nel/include/nel/3d/vertex_program.h | 2 +- .../include/nel/3d/visual_collision_entity.h | 6 ++-- code/nel/include/nel/3d/zone.h | 2 +- code/nel/include/nel/3d/zone_symmetrisation.h | 6 ++-- code/nel/include/nel/georges/load_form.h | 2 +- code/nel/include/nel/ligo/primitive.h | 2 +- code/nel/include/nel/misc/eval_num_expr.h | 22 ++++++------ code/nel/include/nel/misc/traits_nl.h | 2 +- code/nel/include/nel/net/admin.h | 2 +- code/nel/include/nel/net/module.h | 4 +-- code/nel/include/nel/net/module_gateway.h | 2 +- code/nel/include/nel/pacs/u_move_container.h | 4 +-- code/nel/include/nel/sound/driver/buffer.h | 2 +- code/nel/include/nel/sound/source_common.h | 2 +- code/nel/include/nel/sound/stream_source.h | 2 +- code/nel/include/nel/sound/u_stream_source.h | 2 +- .../src/3d/driver/opengl/driver_opengl.cpp | 4 ++- .../driver/opengl/driver_opengl_extension.cpp | 2 +- .../driver/opengl/driver_opengl_material.cpp | 2 +- .../opengl/driver_opengl_vertex_program.cpp | 2 +- code/nel/src/3d/particle_system.cpp | 2 +- code/nel/src/3d/zone_lighter.cpp | 14 ++++---- code/nel/src/ligo/ligo_error.cpp | 2 +- code/nel/src/ligo/ligo_error.h | 2 +- code/nel/src/misc/debug.cpp | 2 +- code/nel/src/misc/eid_translator.cpp | 4 +-- code/nel/src/misc/eval_num_expr.cpp | 14 ++++---- code/nel/src/misc/system_info.cpp | 2 +- code/nel/src/net/admin.cpp | 8 ++--- code/nel/src/net/module_gateway.cpp | 6 ++-- code/nel/src/net/service.cpp | 2 +- code/nel/src/pacs/move_container.h | 4 +-- .../src/sound/driver/dsound/buffer_dsound.cpp | 2 +- .../src/sound/driver/dsound/buffer_dsound.h | 2 +- .../nel/src/sound/driver/fmod/buffer_fmod.cpp | 2 +- code/nel/src/sound/driver/fmod/buffer_fmod.h | 2 +- .../nel/src/sound/driver/openal/buffer_al.cpp | 2 +- code/nel/src/sound/driver/openal/buffer_al.h | 2 +- .../sound/driver/xaudio2/buffer_xaudio2.cpp | 2 +- .../src/sound/driver/xaudio2/buffer_xaudio2.h | 2 +- code/nel/src/sound/stream_source.cpp | 2 +- .../tools/3d/build_gamedata/Howto export.txt | 6 ++-- code/nel/tools/3d/file_info/main.cpp | 8 ++--- .../tools/3d/ig_lighter_lib/ig_lighter_lib.h | 2 +- .../tools/3d/object_viewer/object_viewer.cpp | 8 ++--- .../tools/3d/object_viewer/object_viewer.h | 2 +- .../3d/object_viewer/particle_workspace.h | 2 +- .../tools/3d/panoply_maker/panoply_maker.cpp | 2 +- .../tools/3d/tile_edit/SelectionTerritoire.h | 6 ++-- .../admin_executor_service.cpp | 2 +- code/nelns/admin_service/admin_service.cpp | 36 +++++++++---------- code/ryzom/client/src/character_cl.cpp | 14 ++++---- code/ryzom/client/src/character_cl.h | 8 ++--- .../client_sheets/automaton_list_sheet.cpp | 2 +- .../src/client_sheets/automaton_list_sheet.h | 2 +- code/ryzom/client/src/color_slot_manager.h | 6 ++-- code/ryzom/client/src/commands.cpp | 4 +-- code/ryzom/client/src/continent.cpp | 4 +-- code/ryzom/client/src/debug_client.cpp | 10 +++--- code/ryzom/client/src/entities.cpp | 4 +-- .../client/src/entity_animation_manager.cpp | 2 +- .../client/src/entity_animation_manager.h | 4 +-- code/ryzom/client/src/entity_cl.cpp | 2 +- code/ryzom/client/src/entity_cl.h | 4 +-- code/ryzom/client/src/init.cpp | 4 +-- .../src/interface_v3/action_handler_help.cpp | 8 ++--- .../client/src/interface_v3/chat_window.cpp | 2 +- .../client/src/interface_v3/group_editbox.h | 2 +- .../client/src/interface_v3/group_html_cs.cpp | 4 +-- code/ryzom/client/src/login_patch.h | 5 ++- .../client/src/login_progress_post_thread.h | 4 +-- code/ryzom/client/src/main_loop.cpp | 13 +++---- code/ryzom/client/src/player_cl.cpp | 6 ++-- code/ryzom/client/src/player_cl.h | 2 +- code/ryzom/client/src/player_r2_cl.cpp | 6 ++-- code/ryzom/client/src/player_r2_cl.h | 2 +- code/ryzom/client/src/r2/tool.cpp | 2 +- code/ryzom/client/src/sheet_manager.cpp | 4 +-- code/ryzom/client/src/streamable_ig.cpp | 4 +-- code/ryzom/client/src/time_client.cpp | 4 +-- code/ryzom/client/src/time_client.h | 2 +- code/ryzom/client/src/user_entity.cpp | 2 +- code/ryzom/client/src/user_entity.h | 2 +- .../common/src/game_share/data_set_base.cpp | 2 +- .../src/game_share/ring_session_manager_itf.h | 4 +-- .../game_share/server_animation_module.cpp | 2 +- code/ryzom/server/src/ai_service/commands.cpp | 2 +- .../src/entities_game_service/admin.cpp | 2 +- .../entities_game_service.cpp | 2 +- .../entity_manager/entity_manager.cpp | 2 +- .../game_item_manager/guild_inv.h | 2 +- .../game_item_manager/player_inv_bag.h | 2 +- .../game_item_manager/player_inv_equip.h | 2 +- .../game_item_manager/player_inv_hand.h | 2 +- .../game_item_manager/player_inv_pet.h | 2 +- .../game_item_manager/player_inv_room.h | 2 +- .../game_item_manager/player_inventory.h | 4 +-- .../mission_manager/mission_log.h | 4 +-- .../modules/animation_session_manager.cpp | 2 +- .../player_manager/character.cpp | 8 ++--- .../player_manager/character.h | 10 +++--- .../pvp_faction_reward_manager/totem_base.cpp | 2 +- .../pvp_faction_reward_manager/totem_base.h | 2 +- .../shop_type/shop_type_manager.cpp | 2 +- .../shop_type/shop_type_manager.h | 2 +- .../entities_game_service/world_instances.h | 2 +- .../server/src/gpm_service/world_entity.h | 2 +- .../string_manager_parser.cpp | 2 +- .../server/src/server_share/msg_ai_service.h | 2 +- .../session_browser_server.cpp | 2 +- .../world_editor/world_editor_doc.cpp | 2 +- 119 files changed, 234 insertions(+), 236 deletions(-) diff --git a/code/nel/include/nel/3d/index_buffer.h b/code/nel/include/nel/3d/index_buffer.h index 3ff3ba7a7..365f11b13 100644 --- a/code/nel/include/nel/3d/index_buffer.h +++ b/code/nel/include/nel/3d/index_buffer.h @@ -477,7 +477,7 @@ private: }; /** - * Index buffer driver informations. + * Index buffer driver information. */ // *** IMPORTANT ******************** // *** IF YOU MODIFY THE STRUCTURE OF THIS CLASS, PLEASE INCREMENT IDriver::InterfaceVersion TO INVALIDATE OLD DRIVER DLL diff --git a/code/nel/include/nel/3d/landscape.h b/code/nel/include/nel/3d/landscape.h index 5e6541de7..df845c5a1 100644 --- a/code/nel/include/nel/3d/landscape.h +++ b/code/nel/include/nel/3d/landscape.h @@ -420,7 +420,7 @@ public: void setPointLightFactor(const CScene &scene); - // To init lightmap informations + // To init lightmap information void initAnimatedLightIndex(const CScene &scene); diff --git a/code/nel/include/nel/3d/mesh_base.h b/code/nel/include/nel/3d/mesh_base.h index 0925d21d6..15b0b0add 100644 --- a/code/nel/include/nel/3d/mesh_base.h +++ b/code/nel/include/nel/3d/mesh_base.h @@ -305,7 +305,7 @@ protected: CRayMesh _SystemGeometry; protected: - /// Just copy informations from a CMeshBaseBuild. + /// Just copy information from a CMeshBaseBuild. void buildMeshBase(CMeshBaseBuild &m); /// instanciate MeshBase part to an instance (a CMeshBaseInstance). diff --git a/code/nel/include/nel/3d/mesh_base_instance.h b/code/nel/include/nel/3d/mesh_base_instance.h index 30dc067c5..bde0da843 100644 --- a/code/nel/include/nel/3d/mesh_base_instance.h +++ b/code/nel/include/nel/3d/mesh_base_instance.h @@ -106,7 +106,7 @@ public: void getLightMapName( uint32 nLightMapNb, std::string &LightMapName ); // @} - // To init lightmap informations + // To init lightmap information void initAnimatedLightIndex (const CScene &scene); /// \name BlendShape properties diff --git a/code/nel/include/nel/3d/mesh_vertex_program.h b/code/nel/include/nel/3d/mesh_vertex_program.h index 2bc2d5468..aa5940f46 100644 --- a/code/nel/include/nel/3d/mesh_vertex_program.h +++ b/code/nel/include/nel/3d/mesh_vertex_program.h @@ -87,7 +87,7 @@ public: CScene *scene, CVertexBuffer *vb) = 0; - // Test whether this vertex program need tangent space informations (stored in the last texture coordinate of the mesh) + // Test whether this vertex program need tangent space information (stored in the last texture coordinate of the mesh) virtual bool needTangentSpace() const { return false; } diff --git a/code/nel/include/nel/3d/particle_system.h b/code/nel/include/nel/3d/particle_system.h index 4769a7365..d68fd1072 100644 --- a/code/nel/include/nel/3d/particle_system.h +++ b/code/nel/include/nel/3d/particle_system.h @@ -63,7 +63,7 @@ const uint MaxPSUserParam = 4; * It can be used directly to create a shape. * If you plan to use this without a particle system model, make sure : * - you've setup the driver before calls to step() - * - you've setup the font manager if you want to display font informations + * - you've setup the font manager if you want to display font information * \author Nicolas Vizerie * \author Nevrax France * \date 2001 diff --git a/code/nel/include/nel/3d/shape.h b/code/nel/include/nel/3d/shape.h index ffe682cd3..ad920674e 100644 --- a/code/nel/include/nel/3d/shape.h +++ b/code/nel/include/nel/3d/shape.h @@ -114,7 +114,7 @@ public: void setDistMax(float distMax); /** Profiling. Called in RenderPass if Current Frame profiled. No-Op by default - * Informations must be added in rdrTrav->Scene + * Information must be added in rdrTrav->Scene */ virtual void profileSceneRender(CRenderTrav * /* rdrTrav */, CTransformShape * /* trans */, bool /* opaquePass */) { } diff --git a/code/nel/include/nel/3d/u_visual_collision_entity.h b/code/nel/include/nel/3d/u_visual_collision_entity.h index 96830b1f2..6fd8aae43 100644 --- a/code/nel/include/nel/3d/u_visual_collision_entity.h +++ b/code/nel/include/nel/3d/u_visual_collision_entity.h @@ -99,12 +99,12 @@ public: virtual void setSnapToRenderedTesselation(bool snapMode) =0; virtual bool getSnapToRenderedTesselation() const =0; - /// \name Surface Informations + /// \name Surface Information - /** Get surface informations. + /** Get surface information. * pos is checked with polygons that are at least (cache dependent) at +- 10m in altitude. - * \param info will be filled with surface informations if the method returns true. - * \return true if the surface has been found and informations has been filled. + * \param info will be filled with surface information if the method returns true. + * \return true if the surface has been found and information has been filled. */ virtual bool getSurfaceInfo(const CVector &pos, CSurfaceInfo &info) =0; diff --git a/code/nel/include/nel/3d/vertex_program.h b/code/nel/include/nel/3d/vertex_program.h index f84ac960d..bda3823e1 100644 --- a/code/nel/include/nel/3d/vertex_program.h +++ b/code/nel/include/nel/3d/vertex_program.h @@ -98,7 +98,7 @@ private: std::string _Program; public: - /// The driver informations. For the driver implementation only. + /// The driver information. For the driver implementation only. NLMISC::CRefPtr _DrvInfo; }; diff --git a/code/nel/include/nel/3d/visual_collision_entity.h b/code/nel/include/nel/3d/visual_collision_entity.h index 08ed2b74b..acd34568d 100644 --- a/code/nel/include/nel/3d/visual_collision_entity.h +++ b/code/nel/include/nel/3d/visual_collision_entity.h @@ -89,10 +89,10 @@ public: bool getSnapToRenderedTesselation() const {return _SnapToRenderedTesselation;} - /** Get surface informations. + /** Get surface information. * pos is checked with polygons that are at least (cache dependent) at +- 10m in altitude. - * \param info will be filled with surface informations if the method returns true. - * \return true if the surface has been found and informations has been filled. + * \param info will be filled with surface information if the method returns true. + * \return true if the surface has been found and information has been filled. */ bool getSurfaceInfo(const CVector &pos, CSurfaceInfo &info); diff --git a/code/nel/include/nel/3d/zone.h b/code/nel/include/nel/3d/zone.h index 29c87104c..bb09dc1d5 100644 --- a/code/nel/include/nel/3d/zone.h +++ b/code/nel/include/nel/3d/zone.h @@ -218,7 +218,7 @@ public: * Transform an array of patchInfo by a symmetry on OY axis followed by a 90deg CCW rotation (0, 1, 2, 3). * * The method doesn't transform vertices. - * If symmetry, the method invert 0-3 and 1-2 vertices indexes to get CCW oriented patches. It will fix bind informations. + * If symmetry, the method invert 0-3 and 1-2 vertices indexes to get CCW oriented patches. It will fix bind information. * The method fixes tile and color vertex arrays. * The method fixes tile rotation, 256 cases and tile transistions. * diff --git a/code/nel/include/nel/3d/zone_symmetrisation.h b/code/nel/include/nel/3d/zone_symmetrisation.h index a9bafad95..13dba3268 100644 --- a/code/nel/include/nel/3d/zone_symmetrisation.h +++ b/code/nel/include/nel/3d/zone_symmetrisation.h @@ -31,7 +31,7 @@ class CTileBank; /** * Environnement used to symmetrise zones * - * This class build symmetry specific informations needed to know how + * This class build symmetry specific information needed to know how * transform tiles when a zone is symmetrise. * * There is two states for a tile : Regular or Goofy. @@ -88,9 +88,9 @@ public: bool getOrientedTileCorner (uint patch, uint tile); /** - * Build symmetry informations + * Build symmetry information * - * \param zone is the zone to build symmetry informations + * \param zone is the zone to build symmetry information * \param snapCell is the unit size of the zones * \param weldThreshold is the threshold used to check vertex over snaped positions * \param errorDesc is a structure used to return errors diff --git a/code/nel/include/nel/georges/load_form.h b/code/nel/include/nel/georges/load_form.h index 7252cfe63..c506104dd 100644 --- a/code/nel/include/nel/georges/load_form.h +++ b/code/nel/include/nel/georges/load_form.h @@ -1027,7 +1027,7 @@ void loadForm (const std::vector &sheetFilters, const std::string & { if (dependencyDates[depends[i]] > packedFiledate) { - nldebug("Dependancy on %s for %s not up to date !", + nldebug("Dependency on %s for %s not up to date !", dictionnary[depends[i]].c_str(), sheetNames[k].c_str()); NeededToRecompute.push_back(k); break; diff --git a/code/nel/include/nel/ligo/primitive.h b/code/nel/include/nel/ligo/primitive.h index 733834722..6438e017b 100644 --- a/code/nel/include/nel/ligo/primitive.h +++ b/code/nel/include/nel/ligo/primitive.h @@ -34,7 +34,7 @@ namespace NLLIGO /** - * Ligo primitives are used to add logical geometrical gameplay informations. + * Ligo primitives are used to add logical geometrical gameplay information. * Ligo primitives are NODES, POINTS, PATHES or ZONES. * Ligo primitives have a CLASS. * diff --git a/code/nel/include/nel/misc/eval_num_expr.h b/code/nel/include/nel/misc/eval_num_expr.h index 377defce9..70f1eb205 100644 --- a/code/nel/include/nel/misc/eval_num_expr.h +++ b/code/nel/include/nel/misc/eval_num_expr.h @@ -33,12 +33,12 @@ public: enum TReturnState { NoError, // No error - UnkownValue, // Unkown value has been parsed + UnknownValue, // Unknown value has been parsed ValueError, // Error during user defined value evaluation - UnkownFunction, // Unkown function has been parsed + UnknownFunction, // Unknown function has been parsed FunctionError, // Error during user defined function evaluation NumberSyntaxError, // Syntax error in a number expression - UnkownOperator, // Unkown operator + UnknownOperator, // Unknown operator MustBeOpen, // Should be a open parenthesis MustBeClose, // Should be a close parenthesis MustBeComa, // Should be a coma character @@ -166,21 +166,21 @@ protected: /// Overridable functions /** - * Eval a user defined value. Default implementation returns UnkownValue. - * The user can parse the value and fill the result double and return NoError, UnkownValue or + * Eval a user defined value. Default implementation returns UnknownValue. + * The user can parse the value and fill the result double and return NoError, UnknownValue or * ValueError. * * \param value is the value to parse. - * \param result is the result to fill if the value has been succesfully parsed. + * \param result is the result to fill if the value has been successfully parsed. * \param userData is a user data used by user eval function. - * \return UnkownValue if the value is not known, ValueError is the value evaluation failed or NoError + * \return UnknownValue if the value is not known, ValueError is the value evaluation failed or NoError * if it has been parsed. */ virtual TReturnState evalValue (const char *value, double &result, uint32 userData); /** - * Eval a user defined function. Default implementation returns UnkownFunction. - * The user can parse the function name and fill the result double and return NoError, UnkownFunction + * Eval a user defined function. Default implementation returns UnknownFunction. + * The user can parse the function name and fill the result double and return NoError, UnknownFunction * or FunctionError. * * To convert double argu in boolean argu, use (round (value) != 0.0) ? true : false @@ -188,8 +188,8 @@ protected: * \param funcName is the name of the function to evaluate. * \param arg0 is the first parameter passed to the function. * \param arg1 is the second parameter passed to the function. - * \param result is the result to fill if the value has been succesfully parsed. - * \return UnkownFunction if the function doesn't exist, FunctionError if the function evaluation + * \param result is the result to fill if the value has been successfully parsed. + * \return UnknownFunction if the function doesn't exist, FunctionError if the function evaluation * failed, NoError if it has been parsed. */ virtual TReturnState evalFunction (const char *funcName, double arg0, double &result); diff --git a/code/nel/include/nel/misc/traits_nl.h b/code/nel/include/nel/misc/traits_nl.h index b5ec6ae09..66f09fa3e 100644 --- a/code/nel/include/nel/misc/traits_nl.h +++ b/code/nel/include/nel/misc/traits_nl.h @@ -24,7 +24,7 @@ namespace NLMISC { -/** Class that gives informations about a type. Useful to do some optimization in templates functions / class +/** Class that gives information about a type. Useful to do some optimization in templates functions / class * This class is intended to be specialized and taylored for each type of interest * * \author Nicolas Vizerie diff --git a/code/nel/include/nel/net/admin.h b/code/nel/include/nel/net/admin.h index f6b1e5030..e454e11dd 100644 --- a/code/nel/include/nel/net/admin.h +++ b/code/nel/include/nel/net/admin.h @@ -90,7 +90,7 @@ void initAdmin (bool dontUseAES); void updateAdmin (); -void setInformations (const std::vector &alarms, const std::vector &graphupdate); +void setInformation (const std::vector &alarms, const std::vector &graphupdate); void serviceGetView (uint32 rid, const std::string &rawvarpath, TAdminViewResult& answer, bool async=false); diff --git a/code/nel/include/nel/net/module.h b/code/nel/include/nel/net/module.h index b1b7a8508..ac62afccc 100644 --- a/code/nel/include/nel/net/module.h +++ b/code/nel/include/nel/net/module.h @@ -793,7 +793,7 @@ namespace NLNET /// base module command table NLMISC_COMMAND_HANDLER_TABLE_BEGIN(CModuleBase) - NLMISC_COMMAND_HANDLER_ADD(CModuleBase, dump, "display informations about module instance status", "no args") + NLMISC_COMMAND_HANDLER_ADD(CModuleBase, dump, "display information about module instance status", "no args") NLMISC_COMMAND_HANDLER_ADD(CModuleBase, plug, "plug the module in a module socket", "") NLMISC_COMMAND_HANDLER_ADD(CModuleBase, unplug, "unplug the module out of a module socket", "") NLMISC_COMMAND_HANDLER_ADD(CModuleBase, sendPing, "send a ping message to another module using the first available route", "") @@ -812,7 +812,7 @@ namespace NLNET friend class CModuleManager; friend class CStandardGateway; - /// The gateway that received the module informations + /// The gateway that received the module information IModuleGateway *_Gateway; /// The route to use for reaching the module CGatewayRoute *_Route; diff --git a/code/nel/include/nel/net/module_gateway.h b/code/nel/include/nel/net/module_gateway.h index a23b1d832..da4685230 100644 --- a/code/nel/include/nel/net/module_gateway.h +++ b/code/nel/include/nel/net/module_gateway.h @@ -420,7 +420,7 @@ namespace NLNET std::set FirewallDisclosed; //@{ - /// @name Informations on the next module message to dispatch + /// @name Information on the next module message to dispatch /// next message type, set to CModuleMessageHeaderCodec::mt_invalid when no module message are awaited CModuleMessageHeaderCodec::TMessageType NextMessageType; diff --git a/code/nel/include/nel/pacs/u_move_container.h b/code/nel/include/nel/pacs/u_move_container.h index 34f2321d3..9bf2bb15d 100644 --- a/code/nel/include/nel/pacs/u_move_container.h +++ b/code/nel/include/nel/pacs/u_move_container.h @@ -208,10 +208,10 @@ public: /// \name Triggers info. - /// Get number of trigger informations + /// Get number of trigger information virtual uint getNumTriggerInfo() const=0; - /// Get the n-th trigger informations + /// Get the n-th trigger information virtual const UTriggerInfo &getTriggerInfo (uint id) const=0; /// \name Create methods. diff --git a/code/nel/include/nel/sound/driver/buffer.h b/code/nel/include/nel/sound/driver/buffer.h index b330b8f0a..f82eea5a6 100644 --- a/code/nel/include/nel/sound/driver/buffer.h +++ b/code/nel/include/nel/sound/driver/buffer.h @@ -69,7 +69,7 @@ public: /// Set the sample format. (channels = 1, 2, ...; bitsPerSample = 8, 16; frequency = samples per second, 44100, ...) virtual void setFormat(TBufferFormat format, uint8 channels, uint8 bitsPerSample, uint32 frequency) = 0; - /// Return the sample format informations. + /// Return the sample format information. virtual void getFormat(TBufferFormat &format, uint8 &channels, uint8 &bitsPerSample, uint32 &frequency) const = 0; /// Set the storage mode of this buffer, call before filling this buffer. Storage mode is always software if OptionSoftwareBuffer is enabled. Default is auto. virtual void setStorageMode(TStorageMode storageMode = IBuffer::StorageAuto) = 0; diff --git a/code/nel/include/nel/sound/source_common.h b/code/nel/include/nel/sound/source_common.h index 017ebb880..b1803d585 100644 --- a/code/nel/include/nel/sound/source_common.h +++ b/code/nel/include/nel/sound/source_common.h @@ -100,7 +100,7 @@ public: //@{ /// Set the sample format. (channels = 1, 2, ...; bitsPerSample = 8, 16; frequency = samples per second, 44100, ...) virtual void setFormat(uint8 channels, uint8 bitsPerSample, uint32 frequency) { nlassert(false); } - /// Return the sample format informations. + /// Return the sample format information. virtual void getFormat(uint8 &channels, uint8 &bitsPerSample, uint32 &frequency) const { nlassert(false); } /// Get a writable pointer to the buffer of specified size. Use capacity to specify the required bytes. Returns NULL when all the buffer space is already filled. Call setFormat() first. virtual uint8 *lock(uint capacity) { nlassert(false); return NULL; } diff --git a/code/nel/include/nel/sound/stream_source.h b/code/nel/include/nel/sound/stream_source.h index ec55601dd..a5ac7c9f8 100644 --- a/code/nel/include/nel/sound/stream_source.h +++ b/code/nel/include/nel/sound/stream_source.h @@ -104,7 +104,7 @@ public: //@{ /// Set the sample format. (channels = 1, 2, ...; bitsPerSample = 8, 16; frequency = samples per second, 44100, ...) virtual void setFormat(uint8 channels, uint8 bitsPerSample, uint32 frequency); - /// Return the sample format informations. + /// Return the sample format information. virtual void getFormat(uint8 &channels, uint8 &bitsPerSample, uint32 &frequency) const; /// Get a writable pointer to the buffer of specified size. Use capacity to specify the required bytes. Returns NULL when all the buffer space is already filled. Call setFormat() first. virtual uint8 *lock(uint capacity); diff --git a/code/nel/include/nel/sound/u_stream_source.h b/code/nel/include/nel/sound/u_stream_source.h index e0722c999..78ebbfd77 100644 --- a/code/nel/include/nel/sound/u_stream_source.h +++ b/code/nel/include/nel/sound/u_stream_source.h @@ -45,7 +45,7 @@ public: //@{ /// Set the sample format. (channels = 1, 2, ...; bitsPerSample = 8, 16; frequency = samples per second, 44100, ...) virtual void setFormat(uint8 channels, uint8 bitsPerSample, uint32 frequency) = 0; - /// Return the sample format informations. + /// Return the sample format information. virtual void getFormat(uint8 &channels, uint8 &bitsPerSample, uint32 &frequency) const = 0; /// Get a writable pointer to the buffer of specified size. Use capacity to specify the required bytes. Returns NULL when all the buffer space is already filled. Call setFormat() first. virtual uint8 *lock(uint capacity) = 0; diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.cpp b/code/nel/src/3d/driver/opengl/driver_opengl.cpp index e3b5b39a6..d4c2fe61c 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl.cpp @@ -956,8 +956,10 @@ bool CDriverGL::release() _AGPVertexArrayRange= NULL; _VRAMVertexArrayRange= NULL; + // destroy window and associated ressources destroyWindow(); + // other uninitializations unInit(); // released @@ -1324,7 +1326,7 @@ void CDriverGL::setupFog(float start, float end, CRGBA color) { if (!_ATIFogRangeFixed) { - // last constant is used to store fog informations (fog must be rescaled to [0, 1], because of a driver bug) + // last constant is used to store fog information (fog must be rescaled to [0, 1], because of a driver bug) if (start != end) { setConstant(_EVSNumConstant, 1.f / (start - end), - end / (start - end), 0, 0); diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp index f329b067f..3c9e372d8 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp @@ -800,7 +800,7 @@ static bool setupEXTVertexShader(const char *glext) glGetIntegerv(GL_MAX_VERTEX_SHADER_LOCALS_EXT, &numVSLocals); if (numVSLocals < 4 * (12 + 4) + 1 + 3) { - nlwarning("EXT_vertex_shader extension has not much register. Some vertex programm may fail loading"); + nlwarning("EXT_vertex_shader extension has not much register. Some vertex program may fail loading"); return false; } // diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp index 8870170c8..028dd1614 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp @@ -2274,7 +2274,7 @@ void CDriverGL::endWaterMultiPass() { H_AUTO_OGL(CDriverGL_endWaterMultiPass) nlassert(_CurrentMaterial->getShader() == CMaterial::Water); - // NB : as fragment shaders / programms bypass the texture envs, no special env enum is added (c.f CTexEnvSpecial) + // NB : as fragment shaders / programs bypass the texture envs, no special env enum is added (c.f CTexEnvSpecial) if (_Extensions.NVTextureShader) return; if (ARBWaterShader[0]) { diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp index cf6855ab2..125654ad4 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp @@ -356,7 +356,7 @@ static void doSwizzle(GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum ou } -// Perform write mask and output de bug informations +// Perform write mask and output de bug information static void doWriteMask(GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW) { H_AUTO_OGL(doWriteMask) diff --git a/code/nel/src/3d/particle_system.cpp b/code/nel/src/3d/particle_system.cpp index c4d02d8b0..cd0e464ff 100644 --- a/code/nel/src/3d/particle_system.cpp +++ b/code/nel/src/3d/particle_system.cpp @@ -861,7 +861,7 @@ void CParticleSystem::serial(NLMISC::IStream &f) throw(NLMISC::EStream) } } - if (version > 4) // lifetime informations + if (version > 4) // lifetime information { bool destroyModelWhenOutOfRange = _DestroyModelWhenOutOfRange; // read from bitfield f.serial(destroyModelWhenOutOfRange); diff --git a/code/nel/src/3d/zone_lighter.cpp b/code/nel/src/3d/zone_lighter.cpp index 7c23c6f5c..838cca575 100644 --- a/code/nel/src/3d/zone_lighter.cpp +++ b/code/nel/src/3d/zone_lighter.cpp @@ -501,7 +501,7 @@ void RenderTriangle (const CZoneLighter::CTriangle &triangle, const CZoneLighter gradientTriangle.computeGradient (triangle.V[0], triangle.V[1], triangle.V[2], vGradient); } - // Texture informations + // Texture information uint width=0; uint height=0; const CObjectVector *pixels = 0; @@ -1142,7 +1142,7 @@ void CZoneLighter::light (CLandscape &landscape, CZone& output, uint zoneToLight vector > lumels; lumels.resize (patchCount); - // Build zone informations + // Build zone information buildZoneInformation (landscape, listZone, description); @@ -1717,7 +1717,7 @@ void CZoneLighter::addTriangles (const CMeshBase &meshBase, const CMeshGeom &mes // ** Get the bitmap - // Texture informations, not NULL only if texture is used for alpha test + // Texture information, not NULL only if texture is used for alpha test CBitmap *texture; bool clampU; bool clampV; @@ -1801,7 +1801,7 @@ void CZoneLighter::addTriangles (const CMeshBase &meshBase, const CMeshGeom &mes bool CZoneLighter::getTexture (const CMaterial &material, CBitmap *&result, bool &clampU, bool &clampV, uint8 &alphaTestThreshold, bool &doubleSided) { - // Texture informations, not NULL only if texture is used for alpha test + // Texture information, not NULL only if texture is used for alpha test result = NULL; clampU = false; clampV = false; @@ -1885,7 +1885,7 @@ void CZoneLighter::addTriangles (const CMeshBase &meshBase, const CMeshMRMGeom & // ** Get the bitmap - // Texture informations, not NULL only if texture is used for alpha test + // Texture information, not NULL only if texture is used for alpha test CBitmap *texture; bool clampU; bool clampV; @@ -2361,7 +2361,7 @@ void CZoneLighter::buildZoneInformation (CLandscape &landscape, const vectorgetNumPatchs(); @@ -2478,7 +2478,7 @@ void CZoneLighter::buildZoneInformation (CLandscape &landscape, const vectorgetNumPatchs(); diff --git a/code/nel/src/ligo/ligo_error.cpp b/code/nel/src/ligo/ligo_error.cpp index 974a79048..bebaaddfe 100644 --- a/code/nel/src/ligo/ligo_error.cpp +++ b/code/nel/src/ligo/ligo_error.cpp @@ -94,7 +94,7 @@ const char* CLigoError::_StringError[CLigoError::ErrorCount]= "A edge has two times the same corner", // TwoCornerVertices "A corner is missing in this edge", // CornerIsMissing "A boundary vertex is used by multiple edges", // VertexAlreadyUsed - "Unkown error", // UnknownError + "Unknown error", // UnknownError }; // *************************************************************************** diff --git a/code/nel/src/ligo/ligo_error.h b/code/nel/src/ligo/ligo_error.h index 9beae5629..d322087ae 100644 --- a/code/nel/src/ligo/ligo_error.h +++ b/code/nel/src/ligo/ligo_error.h @@ -84,7 +84,7 @@ public: /// Boundary vertex used by multiple edge VertexAlreadyUsed, - /// Unkown error + /// Unknown error UnknownError, /// Error count diff --git a/code/nel/src/misc/debug.cpp b/code/nel/src/misc/debug.cpp index c3e5b1151..d406aef89 100644 --- a/code/nel/src/misc/debug.cpp +++ b/code/nel/src/misc/debug.cpp @@ -1273,7 +1273,7 @@ std::string CInstanceCounterManager::displayCounters() const map counters; { - // gather counter informations + // gather counter information std::set::const_iterator first2(_InstanceCounterMgrs.begin()), last2(_InstanceCounterMgrs.end()); for (; first2 != last2; ++first2) { diff --git a/code/nel/src/misc/eid_translator.cpp b/code/nel/src/misc/eid_translator.cpp index cfc765a4d..af4f8f593 100644 --- a/code/nel/src/misc/eid_translator.cpp +++ b/code/nel/src/misc/eid_translator.cpp @@ -803,12 +803,12 @@ NLMISC_CATEGORISED_COMMAND(nel,entityNameValid,"Tell if an entity name is valid return true; } -NLMISC_CATEGORISED_COMMAND(nel,playerInfo,"Get informations about a player or all players in CEntityIdTranslator","[|||]") +NLMISC_CATEGORISED_COMMAND(nel,playerInfo,"Get information about a player or all players in CEntityIdTranslator","[|||]") { if (args.size () == 0) { const map &res = CEntityIdTranslator::getInstance()->getRegisteredEntities (); - log.displayNL("%d result(s) for 'all players informations'", res.size()); + log.displayNL("%d result(s) for 'all players information'", res.size()); for (map::const_iterator it = res.begin(); it != res.end(); it++) { const CEntityIdTranslator::CEntity &entity = it->second; diff --git a/code/nel/src/misc/eval_num_expr.cpp b/code/nel/src/misc/eval_num_expr.cpp index 449277bbc..24d7bb7ba 100644 --- a/code/nel/src/misc/eval_num_expr.cpp +++ b/code/nel/src/misc/eval_num_expr.cpp @@ -242,7 +242,7 @@ CEvalNumExpr::TReturnState CEvalNumExpr::getNextToken (TToken &token) } // Can't found the operator - return UnkownOperator; + return UnknownOperator; } } // Is End, '(', ')', '.' ? @@ -1173,21 +1173,21 @@ const bool CEvalNumExpr::_StringChar[128] = CEvalNumExpr::TReturnState CEvalNumExpr::evalValue (const char *value, double &result, uint32 userData) { - return UnkownValue; + return UnknownValue; } // *************************************************************************** CEvalNumExpr::TReturnState CEvalNumExpr::evalFunction (const char *funcName, double arg0, double &result) { - return UnkownFunction; + return UnknownFunction; } // *************************************************************************** CEvalNumExpr::TReturnState CEvalNumExpr::evalFunction (const char *funcName, double arg0, double arg1, double &result) { - return UnkownFunction; + return UnknownFunction; } // *************************************************************************** @@ -1259,12 +1259,12 @@ const CEvalNumExpr::TToken CEvalNumExpr::_ReservedWordToken[ReservedWordCount] = const char *CEvalNumExpr::_ErrorString[ReturnValueCount]= { "No error", - "Unkown value", + "Unknown value", "Error during user defined value evaluation", - "Unkown function", + "Unknown function", "Error during user defined function evaluation", "Syntax error in a number expression", - "Unkown operator", + "Unknown operator", "Should be a open parentesis", "Should be a close parentesis", "Should be a coma character", diff --git a/code/nel/src/misc/system_info.cpp b/code/nel/src/misc/system_info.cpp index e48c305b9..446b39320 100644 --- a/code/nel/src/misc/system_info.cpp +++ b/code/nel/src/misc/system_info.cpp @@ -1169,7 +1169,7 @@ uint64 CSystemInfo::getAllocatedSystemMemory () { uint64 systemMemory = 0; #ifdef NL_OS_WINDOWS - // Get system memory informations + // Get system memory information HANDLE hHeap[100]; DWORD heapCount = GetProcessHeaps (100, hHeap); diff --git a/code/nel/src/net/admin.cpp b/code/nel/src/net/admin.cpp index c5b120861..700ce1f5a 100644 --- a/code/nel/src/net/admin.cpp +++ b/code/nel/src/net/admin.cpp @@ -91,14 +91,14 @@ uint32 RequestTimeout = 4; // in second static void cbInfo (CMessage &msgin, const std::string &/* serviceName */, TServiceId /* sid */) { - nlinfo ("ADMIN: Updating admin informations"); + nlinfo ("ADMIN: Updating admin information"); vector alarms; msgin.serialCont (alarms); vector graphupdate; msgin.serialCont (graphupdate); - setInformations (alarms, graphupdate); + setInformation (alarms, graphupdate); } static void cbServGetView (CMessage &msgin, const std::string &/* serviceName */, TServiceId sid) @@ -779,7 +779,7 @@ void updateAdmin() } } -void setInformations (const vector &alarms, const vector &graphupdate) +void setInformation (const vector &alarms, const vector &graphupdate) { uint i; sint tmp; @@ -860,7 +860,7 @@ void setInformations (const vector &alarms, const vector &graphu // Commands // -NLMISC_CATEGORISED_COMMAND(nel, displayInformations, "displays all admin informations", "") +NLMISC_CATEGORISED_COMMAND(nel, displayInformation, "displays all admin information", "") { nlunreferenced(rawCommandString); nlunreferenced(args); diff --git a/code/nel/src/net/module_gateway.cpp b/code/nel/src/net/module_gateway.cpp index f3933bb29..e6c9f9cf8 100644 --- a/code/nel/src/net/module_gateway.cpp +++ b/code/nel/src/net/module_gateway.cpp @@ -914,7 +914,7 @@ namespace NLNET } } - /** A gateway send new modules informations */ + /** A gateway send new modules information */ void onReceiveModuleAdd(CGatewayRoute *from, const CMessage &msgin) { H_AUTO(CModuleGetaway_onReceiveModuleAdd); @@ -1765,7 +1765,7 @@ namespace NLNET } CModuleProxy *modProx = static_cast(it2->second.getPtr()); - // remove module informations + // remove module information pair range; range = _KnownModules.equal_range(modProx->_FullyQualifiedModuleName); nlassert(range.first != range.second); @@ -2327,7 +2327,7 @@ namespace NLNET NLMISC_CLASS_COMMAND_CALL_BASE(CModuleBase, dump); log.displayNL("------------------------------"); - log.displayNL("Dumping gateway informations :"); + log.displayNL("Dumping gateway information :"); log.displayNL("------------------------------"); log.displayNL("The gateway has %u locally plugged module :", _PluggedModules.getAToBMap().size()); diff --git a/code/nel/src/net/service.cpp b/code/nel/src/net/service.cpp index 1fccea0ca..960121b22 100644 --- a/code/nel/src/net/service.cpp +++ b/code/nel/src/net/service.cpp @@ -1566,7 +1566,7 @@ sint IService::main (const char *serviceShortName, const char *serviceLongName, WindowDisplayer = NULL; } - nlinfo ("SERVICE: Service released succesfully"); + nlinfo ("SERVICE: Service released successfully"); } catch (EFatalError &) { diff --git a/code/nel/src/pacs/move_container.h b/code/nel/src/pacs/move_container.h index 32c678d85..d728c4ad3 100644 --- a/code/nel/src/pacs/move_container.h +++ b/code/nel/src/pacs/move_container.h @@ -117,13 +117,13 @@ public: return _Retriever; } - /// Get number of trigger informations + /// Get number of trigger information uint getNumTriggerInfo() const { return (uint)_Triggers.size(); } - /// Get the n-th trigger informations + /// Get the n-th trigger information const UTriggerInfo &getTriggerInfo (uint id) const { // check diff --git a/code/nel/src/sound/driver/dsound/buffer_dsound.cpp b/code/nel/src/sound/driver/dsound/buffer_dsound.cpp index 29095ccf9..5eaef33dd 100644 --- a/code/nel/src/sound/driver/dsound/buffer_dsound.cpp +++ b/code/nel/src/sound/driver/dsound/buffer_dsound.cpp @@ -192,7 +192,7 @@ bool CBufferDSound::fill(const uint8 *src, uint size) return unlock(size); } -/// Return the sample format informations. +/// Return the sample format information. void CBufferDSound::getFormat(TBufferFormat &format, uint8 &channels, uint8 &bitsPerSample, uint32 &frequency) const { sampleFormatToBufferFormat(_Format, format, channels, bitsPerSample); diff --git a/code/nel/src/sound/driver/dsound/buffer_dsound.h b/code/nel/src/sound/driver/dsound/buffer_dsound.h index 09dbeb9cf..ae985ad49 100644 --- a/code/nel/src/sound/driver/dsound/buffer_dsound.h +++ b/code/nel/src/sound/driver/dsound/buffer_dsound.h @@ -53,7 +53,7 @@ public: /// Set the sample format. (channels = 1, 2, ...; bitsPerSample = 8, 16; frequency = samples per second, 44100, ...) virtual void setFormat(TBufferFormat format, uint8 channels, uint8 bitsPerSample, uint32 frequency); - /// Return the sample format informations. + /// Return the sample format information. virtual void getFormat(TBufferFormat &format, uint8 &channels, uint8 &bitsPerSample, uint32 &frequency) const; /// Set the storage mode of this buffer, call before filling this buffer. Storage mode is always software if OptionSoftwareBuffer is enabled. Default is auto. virtual void setStorageMode(TStorageMode storageMode = IBuffer::StorageAuto); diff --git a/code/nel/src/sound/driver/fmod/buffer_fmod.cpp b/code/nel/src/sound/driver/fmod/buffer_fmod.cpp index be2dda84b..3492b02fb 100644 --- a/code/nel/src/sound/driver/fmod/buffer_fmod.cpp +++ b/code/nel/src/sound/driver/fmod/buffer_fmod.cpp @@ -96,7 +96,7 @@ bool CBufferFMod::fill(const uint8 *src, uint size) return _FModSample != NULL; } -/// Return the sample format informations. +/// Return the sample format information. void CBufferFMod::getFormat(TBufferFormat &format, uint8 &channels, uint8 &bitsPerSample, uint &frequency) const { sampleFormatToBufferFormat(_Format, format, channels, bitsPerSample); diff --git a/code/nel/src/sound/driver/fmod/buffer_fmod.h b/code/nel/src/sound/driver/fmod/buffer_fmod.h index 95fab47ec..3f2fb1411 100644 --- a/code/nel/src/sound/driver/fmod/buffer_fmod.h +++ b/code/nel/src/sound/driver/fmod/buffer_fmod.h @@ -81,7 +81,7 @@ public: /// Set the sample format. (channels = 1, 2, ...; bitsPerSample = 8, 16; frequency = samples per second, 44100, ...) virtual void setFormat(TBufferFormat format, uint8 channels, uint8 bitsPerSample, uint32 frequency); - /// Return the sample format informations. + /// Return the sample format information. virtual void getFormat(TBufferFormat &format, uint8 &channels, uint8 &bitsPerSample, uint32 &frequency) const; /// Set the storage mode of this buffer, call before filling this buffer. Storage mode is always software if OptionSoftwareBuffer is enabled. Default is auto. virtual void setStorageMode(TStorageMode storageMode = IBuffer::StorageAuto); diff --git a/code/nel/src/sound/driver/openal/buffer_al.cpp b/code/nel/src/sound/driver/openal/buffer_al.cpp index f4b770a29..f9c37e3f3 100644 --- a/code/nel/src/sound/driver/openal/buffer_al.cpp +++ b/code/nel/src/sound/driver/openal/buffer_al.cpp @@ -166,7 +166,7 @@ bool CBufferAL::fill(const uint8 *src, uint size) return _IsLoaded; } -/// Return the sample format informations. +/// Return the sample format information. void CBufferAL::getFormat(TBufferFormat &format, uint8 &channels, uint8 &bitsPerSample, uint32 &frequency) const { TSampleFormat sampleFormat; diff --git a/code/nel/src/sound/driver/openal/buffer_al.h b/code/nel/src/sound/driver/openal/buffer_al.h index 32546c716..c7cc5836b 100644 --- a/code/nel/src/sound/driver/openal/buffer_al.h +++ b/code/nel/src/sound/driver/openal/buffer_al.h @@ -54,7 +54,7 @@ public: /// Set the sample format. (channels = 1, 2, ...; bitsPerSample = 8, 16; frequency = samples per second, 44100, ...) virtual void setFormat(TBufferFormat format, uint8 channels, uint8 bitsPerSample, uint32 frequency); - /// Return the sample format informations. + /// Return the sample format information. virtual void getFormat(TBufferFormat &format, uint8 &channels, uint8 &bitsPerSample, uint32 &frequency) const; /// Set the storage mode of this buffer, call before filling this buffer. Storage mode is always software if OptionSoftwareBuffer is enabled. Default is auto. virtual void setStorageMode(TStorageMode storageMode = IBuffer::StorageAuto); diff --git a/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.cpp b/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.cpp index a5e9bc672..e00076ed1 100644 --- a/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.cpp +++ b/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.cpp @@ -129,7 +129,7 @@ void CBufferXAudio2::setFormat(TBufferFormat format, uint8 channels, uint8 bitsP _BitsPerSample = bitsPerSample; } -/// Return the sample format informations. +/// Return the sample format information. void CBufferXAudio2::getFormat(TBufferFormat &format, uint8 &channels, uint8 &bitsPerSample, uint32 &frequency) const { format = _Format; diff --git a/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h b/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h index dd978bbd4..244ff7ea1 100644 --- a/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h +++ b/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h @@ -86,7 +86,7 @@ public: /// Set the sample format. (channels = 1, 2, ...; bitsPerSample = 8, 16; frequency = samples per second, 44100, ...) virtual void setFormat(TBufferFormat format, uint8 channels, uint8 bitsPerSample, uint32 frequency); - /// Return the sample format informations. + /// Return the sample format information. virtual void getFormat(TBufferFormat &format, uint8 &channels, uint8 &bitsPerSample, uint32 &frequency) const; /// Set the storage mode of this buffer, call before filling this buffer. Storage mode is always software if OptionSoftwareBuffer is enabled. Default is auto. virtual void setStorageMode(TStorageMode storageMode = IBuffer::StorageAuto); diff --git a/code/nel/src/sound/stream_source.cpp b/code/nel/src/sound/stream_source.cpp index 9f0e3a533..c61533807 100644 --- a/code/nel/src/sound/stream_source.cpp +++ b/code/nel/src/sound/stream_source.cpp @@ -348,7 +348,7 @@ void CStreamSource::setFormat(uint8 channels, uint8 bitsPerSample, uint32 freque m_BytesPerSecond = ((uint)bitsPerSample * (uint)frequency * (uint)channels) / 8; } -/// Return the sample format informations. +/// Return the sample format information. void CStreamSource::getFormat(uint8 &channels, uint8 &bitsPerSample, uint32 &frequency) const { IBuffer::TBufferFormat bufferFormat; diff --git a/code/nel/tools/3d/build_gamedata/Howto export.txt b/code/nel/tools/3d/build_gamedata/Howto export.txt index 878461680..f17a5f1a3 100644 --- a/code/nel/tools/3d/build_gamedata/Howto export.txt +++ b/code/nel/tools/3d/build_gamedata/Howto export.txt @@ -563,7 +563,7 @@ Each automatic data process must have the following batch command files: * All sucessful export should be log in the log file prefixed bt the word "OK ". - * All others warning and error informations are welcome in the log file. + * All others warning and error information are welcome in the log file. * The export process must use "build_gamedata/the config.cfg" file to get the database or 3dsmax directories. @@ -587,7 +587,7 @@ Each automatic data process must have the following batch command files: * All sucessful build should be log in the log file prefixed bt the word "OK " - * All others warning and error informations are welcome in the log file. + * All others warning and error information are welcome in the log file. - build_gamedata/processes/my_process/4_install.bat: This command will install exported / builded files in the client directory. @@ -610,6 +610,6 @@ Each automatic data process must have the following batch command files: * All sucessful install should be log in the log file prefixed bt the word "OK " - * All others warning and error informations are welcome in the log file. + * All others warning and error information are welcome in the log file. ----------------------------------------------------------------------------------------------------- diff --git a/code/nel/tools/3d/file_info/main.cpp b/code/nel/tools/3d/file_info/main.cpp index 3e2fef7ef..ef8318f3b 100644 --- a/code/nel/tools/3d/file_info/main.cpp +++ b/code/nel/tools/3d/file_info/main.cpp @@ -253,7 +253,7 @@ void displayInfoFileInStream(FILE *logStream, const char *fileName, const setSaved.PlayList = readed[i].PlayList; - // Set the slot informations + // Set the slot information for (uint slot=0; slotSaved.SlotInfo[slot] = readed[i].SlotInfo[slot]; } @@ -1840,11 +1840,11 @@ void CObjectViewer::serial (NLMISC::IStream& f) } else { - // Build informations + // Build information std::vector readed (_ListInstance.size()); for (uint instance=0; instance<_ListInstance.size(); instance++) { - // Copy the save insformation + // Copy the save information readed[instance] = _ListInstance[instance]->Saved; } @@ -3485,7 +3485,7 @@ void CInstanceSave::serial (NLMISC::IStream &f) // Slot info for this object nlassert (NL3D::CChannelMixer::NumAnimationSlot == 8); for (uint slot=0; slot<8; slot++) - // Serial the slot informations + // Serial the slot information f.serial (SlotInfo[slot]); // Input file diff --git a/code/nel/tools/3d/object_viewer/object_viewer.h b/code/nel/tools/3d/object_viewer/object_viewer.h index 5cc135a0c..4ae69f1bf 100644 --- a/code/nel/tools/3d/object_viewer/object_viewer.h +++ b/code/nel/tools/3d/object_viewer/object_viewer.h @@ -197,7 +197,7 @@ public: // True, must delete this shape bool MustDelete; - // Save informations + // Save information CInstanceSave Saved; // The current playlist diff --git a/code/nel/tools/3d/object_viewer/particle_workspace.h b/code/nel/tools/3d/object_viewer/particle_workspace.h index 6dc61d1ac..76d3330b4 100644 --- a/code/nel/tools/3d/object_viewer/particle_workspace.h +++ b/code/nel/tools/3d/object_viewer/particle_workspace.h @@ -57,7 +57,7 @@ public: const std::string &getRelativePath() const { return _RelativePath; } std::string getFullPath() const; std::string getFilename() const { return NLMISC::CFile::getFilename(_RelativePath); } - // Serial node informations into workspace stream. This does not save the particle system shape, only a reference to its file + // Serial node information into workspace stream. This does not save the particle system shape, only a reference to its file void serial(NLMISC::IStream &f); // Save the particle system target file void savePS() throw(NLMISC::EStream); diff --git a/code/nel/tools/3d/panoply_maker/panoply_maker.cpp b/code/nel/tools/3d/panoply_maker/panoply_maker.cpp index fcc0e097f..933ec4e0d 100644 --- a/code/nel/tools/3d/panoply_maker/panoply_maker.cpp +++ b/code/nel/tools/3d/panoply_maker/panoply_maker.cpp @@ -209,7 +209,7 @@ int main(int argc, char* argv[]) infoMaskGen.init(); infoMaskGen.process(); } - else if( !strcmp(argv[2], "cgi")) /// colorized informations + else if( !strcmp(argv[2], "cgi")) /// colorized information { CInfoColorGeneration infoColor(_Path_Input_TexBases, _Path_Input_Masks, diff --git a/code/nel/tools/3d/tile_edit/SelectionTerritoire.h b/code/nel/tools/3d/tile_edit/SelectionTerritoire.h index 53ed1cd97..a5f42bf91 100644 --- a/code/nel/tools/3d/tile_edit/SelectionTerritoire.h +++ b/code/nel/tools/3d/tile_edit/SelectionTerritoire.h @@ -24,9 +24,9 @@ public: SelectionTerritoire(CWnd* pParent = NULL); // standard constructor //owner data - CString DefautPath; //repertoire qui contient toutes les informations - CString MainFileName; //nom du fichier txt principale (contient la liste des territoires) - CString CurrentTerritory; //nom du territoire en cours d'edition + CString DefautPath; // folder which contains all data + CString MainFileName; // txt main filename (contains territories list) + CString CurrentTerritory; // territory name currently being editing int MainFileOk; // Dialog Data diff --git a/code/nelns/admin_executor_service/admin_executor_service.cpp b/code/nelns/admin_executor_service/admin_executor_service.cpp index 6ad1af592..ab2dc28a1 100644 --- a/code/nelns/admin_executor_service/admin_executor_service.cpp +++ b/code/nelns/admin_executor_service/admin_executor_service.cpp @@ -1188,7 +1188,7 @@ static void cbAESInfo(CMessage &msgin, const std::string &serviceName, TServiceI msgin.serialCont(AllGraphUpdates); // set our own alarms for this service - setInformations(AllAdminAlarms, AllGraphUpdates); + setInformation(AllAdminAlarms, AllGraphUpdates); // now send alarms to all services for (uint j = 0; j < Services.size(); j++) diff --git a/code/nelns/admin_service/admin_service.cpp b/code/nelns/admin_service/admin_service.cpp index 488ece7a6..e3fe53270 100644 --- a/code/nelns/admin_service/admin_service.cpp +++ b/code/nelns/admin_service/admin_service.cpp @@ -665,49 +665,49 @@ void sqlInit () //////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////// -void sendAESInformations (TServiceId sid) +void sendAESInformation (TServiceId sid) { AESIT aesit = findAES (sid); - vector informations; + vector information; CMessage msgout("AES_INFO"); // // send services that should be running on this AES // - informations.clear (); + information.clear (); MYSQL_ROW row = sqlQuery ("select name from service where server='%s'", (*aesit).Name.c_str()); while (row != NULL) { string service = row[0]; nlinfo ("Adding '%s' in registered services to AES-%hu", row[0], sid.get()); - informations.push_back (service); + information.push_back (service); row = sqlNextRow (); } sqlFlushResult(); - msgout.serialCont (informations); + msgout.serialCont (information); // // send variable alarms for services that should running on this AES // - informations.clear (); + information.clear (); row = sqlQuery ("select path, error_bound, alarm_order from variable where error_bound!=-1"); while (row != NULL) { nlinfo ("Adding '%s' '%s' '%s' in alarm to AES-%hu", row[0], row[1], row[2], sid.get()); - informations.push_back (row[0]); - informations.push_back (row[1]); - informations.push_back (row[2]); + information.push_back (row[0]); + information.push_back (row[1]); + information.push_back (row[2]); row = sqlNextRow (); } sqlFlushResult(); - msgout.serialCont (informations); + msgout.serialCont (information); // // send graph update for services that should running on this AES // - informations.clear (); + information.clear (); row = sqlQuery ("select path, graph_update from variable where graph_update!=0"); while (row != NULL) { @@ -726,8 +726,8 @@ void sendAESInformations (TServiceId sid) if(varpath2.Destination[j].first == "*" || varpath2.Destination[j].first == (*aesit).Name) { nlinfo ("Adding '%s' '%s' in graph to AES-%hu", row[0], row[1], sid.get()); - informations.push_back (row[0]); - informations.push_back (row[1]); + information.push_back (row[0]); + information.push_back (row[1]); } } } @@ -735,9 +735,9 @@ void sendAESInformations (TServiceId sid) row = sqlNextRow (); } sqlFlushResult(); - msgout.serialCont (informations); + msgout.serialCont (information); - nlinfo ("Sending all informations about %s AES-%hu (hostedservices, alarms,grapupdate)", (*aesit).Name.c_str(), (*aesit).SId.get()); + nlinfo ("Sending all information about %s AES-%hu (hostedservices, alarms,grapupdate)", (*aesit).Name.c_str(), (*aesit).SId.get()); CUnifiedNetwork::getInstance ()->send (sid, msgout); } @@ -798,7 +798,7 @@ static void cbNewAESConnection (const std::string &serviceName, TServiceId sid, nlinfo ("%s-%hu, server name %s, for shard %s connected and added in the list", serviceName.c_str(), sid.get(), server.c_str(), shard.c_str()); // send him services that should run on this server - sendAESInformations (sid); + sendAESInformation (sid); } // i'm disconnected from an admin executor service @@ -855,7 +855,7 @@ void cbRegisterAES(CMessage &msgin, const std::string &serviceName, TServiceId s nlinfo ("%s-%hu, server name %s, for shard %s connected and added in the list", serviceName.c_str(), sid.get(), server.c_str(), shard.c_str()); // send him services that should run on this server - sendAESInformations (sid); + sendAESInformation (sid); } static void cbView (CMessage &msgin, const std::string &serviceName, TServiceId sid) @@ -965,7 +965,7 @@ void addRequest (const string &rawvarpath, TSockId from) // it means the we have to resend the list of services managed by AES from the mysql tables for (AESIT aesit = AdminExecutorServices.begin(); aesit != AdminExecutorServices.end(); aesit++) { - sendAESInformations ((*aesit).SId); + sendAESInformation ((*aesit).SId); } // send an empty string to say to php that there's nothing diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp index 48b277e9c..2420c1ccd 100644 --- a/code/ryzom/client/src/character_cl.cpp +++ b/code/ryzom/client/src/character_cl.cpp @@ -4675,7 +4675,7 @@ void CCharacterCL::applyBehaviour(const CBehaviourContext &bc) // virtual performCurrentAttackEnd(bc, selfSpell && isOffensif, targetHitDates, combatAnimState); } - // INFO : display some debug informations. + // INFO : display some debug information. if((VerboseAnimUser && _Slot==0) || (VerboseAnimSelection && _Slot == UserEntity->selection())) nlinfo("CH:applyBeh:%d: '%d(%s)'", _Slot, behaviour.Behaviour, behaviourToString((EBehaviour)behaviour.Behaviour).c_str()); @@ -5302,7 +5302,7 @@ bool CCharacterCL::applyCurrentStage() else nlwarning("CCharacterCL::applyCurrentStage: there is no stage."); - // Upate informations from remaining stages. + // Update information from remaining stages. updateStages(); return bRet; @@ -5345,7 +5345,7 @@ void CCharacterCL::applyAllStagesToFirstPos() else nlwarning("CH:applyAllStagesToFirstPos:%d: There is no stage with a position.", _Slot); - // Upate informations from remaining stages. + // Upate information from remaining stages. updateStages(); }// applyAllStagesToFirstPos // @@ -5451,7 +5451,7 @@ ADD_METHOD(void CCharacterCL::playToEndAnim(const double &startTimeOffset, doubl //----------------------------------------------- // updateStages : -// Call this method to give a time for each stage, compute distance to destination and some more informations. +// Call this method to give a time for each stage, compute distance to destination and some more information. // \todo GUIGUI : clean up //----------------------------------------------- void CCharacterCL::updateStages() @@ -5513,7 +5513,7 @@ void CCharacterCL::updateStages() } - // ***** Compute Stages to give them a time and get some informations from those stages. + // ***** Compute Stages to give them a time and get some information from those stages. // yoyo: use any stage with no LCT, until it is to be played AFTER a position bool stageForceLCTFound= false; CStageSet::TStageSet::iterator itTmp; @@ -6836,7 +6836,7 @@ void CCharacterCL::updateAllPostRender() //----------------------------------------------- void CCharacterCL::processFrame(const TTime ¤tTimeInMs) { - // Prepare stages and update informations from them. + // Prepare stages and update information from them. updateStages(); // Compute the time remaining until frame completely processed. @@ -8274,7 +8274,7 @@ void CCharacterCL::setAlive() // virtual //--------------------------------------------------- // displayDebug : -// Display Debug Informations. +// Display Debug Information. //--------------------------------------------------- ADD_METHOD(void CCharacterCL::displayDebug(float x, float &y, float lineStep)) // virtual CInterfaceManager *IM = CInterfaceManager::getInstance (); diff --git a/code/ryzom/client/src/character_cl.h b/code/ryzom/client/src/character_cl.h index 7e4ffc77e..85f408fa7 100644 --- a/code/ryzom/client/src/character_cl.h +++ b/code/ryzom/client/src/character_cl.h @@ -84,7 +84,7 @@ public: enum { MaxNumAura = 2 }; enum TAtkHeight { - AtkUnkownHeight = 0, + AtkUnknownHeight = 0, AtkLow, AtkMiddle, AtkHigh @@ -289,9 +289,9 @@ public: std::string currentAnimationSetName(TAnimationType animType) const; /// Change the entity colors. virtual void changeColors(sint userColor, sint hair, sint eyes, sint part); - /// Display Debug Informations. + /// Display Debug Information. virtual void displayDebug(float x, float &y, float lineStep); - /// Display Debug Informations for property stages + /// Display Debug Information for property stages virtual void displayDebugPropertyStages(float x, float &y, float lineStep); /// set the NameId for debug in local void debugSetNameId(uint32 nameId) {updateVisualPropertyName(0, nameId);} @@ -899,7 +899,7 @@ protected: /// Play the time step for the loop and truncate to End Anim if Time Step too big. void playToEndAnim(const double &startTimeOffset, double &length); - /// Call this method to give a time for each stage, compute distance to destination and some more informations. + /// Call this method to give a time for each stage, compute distance to destination and some more information. void updateStages(); /** diff --git a/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp b/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp index 090d5d0dc..ae76b823b 100644 --- a/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/automaton_list_sheet.cpp @@ -500,7 +500,7 @@ void CAutomatonListSheet::build(const NLGEORGES::UFormElm &rootList) string modeName = NLMISC::strlwr(MBEHAV::modeToString((MBEHAV::EMode)mode)); // Compute the automaton name string filename = NLMISC::strlwr(automatonType) + "_" + modeName + ".automaton"; - // Push some informations + // Push some information nlinfo("loading automaton '%s'.", filename.c_str()); // Load the automaton's form. form = formLoader->loadForm(filename.c_str()); diff --git a/code/ryzom/client/src/client_sheets/automaton_list_sheet.h b/code/ryzom/client/src/client_sheets/automaton_list_sheet.h index f31746b29..61f0db5d3 100644 --- a/code/ryzom/client/src/client_sheets/automaton_list_sheet.h +++ b/code/ryzom/client/src/client_sheets/automaton_list_sheet.h @@ -185,7 +185,7 @@ public: void serial(class NLMISC::IStream &f) throw(NLMISC::EStream); /** - * Return a pointer on the informations about the state corresponding to the key. + * Return a pointer on the information about the state corresponding to the key. * \param key : state key. * \return CAutomatonStateSheet * : pointer on the state or 0. */ diff --git a/code/ryzom/client/src/color_slot_manager.h b/code/ryzom/client/src/color_slot_manager.h index ea07c5587..480c1e46b 100644 --- a/code/ryzom/client/src/color_slot_manager.h +++ b/code/ryzom/client/src/color_slot_manager.h @@ -87,7 +87,7 @@ public: * \param path the path textures should be retrieved from. * \param validExtensions an array of the valid bitmap files extensions. * \param numExtensions number of texture extensions in the array - * \return true if all texture where added succesfully + * \return true if all texture where added successfully */ bool addTexturesFromPath(const std::string &path, const char *validExtensions[] = _DefaultTextureExtension, @@ -98,7 +98,7 @@ public: * \param instance the instance to change * \param slotID The slot to change * \param the value to assign to that slot - * \return true if all slots where changed succesfully + * \return true if all slots where changed successfully * NB : If you must activate a texture slot on an instance, you should do it before calling this method. */ bool setInstanceSlot(NL3D::UInstance instance, uint slotID, uint value) const; @@ -107,7 +107,7 @@ public: * \param instance the instance to change * \param slotIDs An array of pairs (slotID, slotValue) * \param numValues Number of values in the array - * \return true if all slots where changed succesfully + * \return true if all slots where changed successfully * NB : If you must activate a texture slot on an instance, you should do it before calling this method. */ bool setInstanceSlot(NL3D::UInstance instance, TIntCouple *slotIDs, uint numValues) const; diff --git a/code/ryzom/client/src/commands.cpp b/code/ryzom/client/src/commands.cpp index 353ab705c..46e42cd9f 100644 --- a/code/ryzom/client/src/commands.cpp +++ b/code/ryzom/client/src/commands.cpp @@ -601,7 +601,7 @@ NLMISC_COMMAND(dump, "Command to create a file with the current state of the cli return true; } -NLMISC_COMMAND(verbose, "Enable/Disable some Debug Informations", "none or magic") +NLMISC_COMMAND(verbose, "Enable/Disable some Debug Information", "none or magic") { // Check parameters. if(args.size() != 1) @@ -4901,7 +4901,7 @@ NLMISC_COMMAND(luaScript, "Execute a lua script", "direct_script_code") } } -NLMISC_COMMAND(luaInfo, "Dump some informations on LUA state", "detaillevel from 0 to 2") +NLMISC_COMMAND(luaInfo, "Dump some information on LUA state", "detaillevel from 0 to 2") { CInterfaceManager *pIM= CInterfaceManager::getInstance(); if(ClientCfg.AllowDebugLua) diff --git a/code/ryzom/client/src/continent.cpp b/code/ryzom/client/src/continent.cpp index e432df203..dc1d0fdaf 100644 --- a/code/ryzom/client/src/continent.cpp +++ b/code/ryzom/client/src/continent.cpp @@ -536,7 +536,7 @@ void CContinent::select(const CVectorD &pos, NLMISC::IProgressCallback &progress if(igZone == outpostZone) { nlctassert(RZ_MAX_BUILDING_PER_OUTPOST==4); - // Check there is all informations in the IG for a ZC and initialize. + // Check there is all information in the IG for a ZC and initialize. bool zcOK[RZ_MAX_BUILDING_PER_OUTPOST+1] = {false, false, false, false, false}; UInstanceGroup *ig = igsWithNames[i].first; uint k; @@ -564,7 +564,7 @@ void CContinent::select(const CVectorD &pos, NLMISC::IProgressCallback &progress } } - // There are not enough informations in the IG for ZC. + // There are not enough information in the IG for ZC. for (k=0; kprintfAt(0.01f, line, "STREAMING INFORMATIONS"); + TextContext->printfAt(0.01f, line, "STREAMING INFORMATION"); if(deltaTimeSmooth != 0.f) TextContext->printfAt(0.8f, line,"%.1f fps", 1.f/deltaTimeSmooth); else @@ -519,7 +519,7 @@ string getDebugInformation() } else { - str += "No user entity informations\n"; + str += "No user entity information\n"; } str += toString("ViewPosition: %.2f %.2f %.2f\n", View.viewPos().x, View.viewPos().y, View.viewPos().z); @@ -634,7 +634,7 @@ void displayNetDebug () TextContext->setHotSpot(UTextContext::BottomLeft); float xUser= 0.3f; float xWatched= 0.5f; - // Display informations about the debug entity slot. + // Display information about the debug entity slot. if(WatchedEntitySlot != CLFECOMMON::INVALID_SLOT) { line = 0.f; @@ -645,7 +645,7 @@ void displayNetDebug () if(watchedEntity) watchedEntity->displayDebugPropertyStages(xWatched, line, lineStep); } - // Display informations about the user + // Display information about the user if(UserEntity) { line = 0.f; diff --git a/code/ryzom/client/src/entities.cpp b/code/ryzom/client/src/entities.cpp index b1780e042..fc2aa43de 100644 --- a/code/ryzom/client/src/entities.cpp +++ b/code/ryzom/client/src/entities.cpp @@ -1462,7 +1462,7 @@ void CEntityManager::updatePostRender() //----------------------------------------------- void CEntityManager::updateVisualProperty(const NLMISC::TGameCycle &gameCycle, const uint &slot, const uint &prop, const NLMISC::TGameCycle &predictedInterval) { - // INFO : log some debug informations about visual properties. + // INFO : log some debug information about visual properties. if(verboseVP(NULL)) nlinfo("EM:updateVP: received prop '%d' for the slot '%d'.", prop, slot); @@ -1476,7 +1476,7 @@ void CEntityManager::updateVisualProperty(const NLMISC::TGameCycle &gameCycle, c // Entity still not allocated -> backup values received for the entity. if(_Entities[slot] == 0) { - // INFO : log some debug informations about visual properties. + // INFO : log some debug information about visual properties. if(verboseVP(NULL)) nlinfo("EM:updateVP: backup the property as long as the entity is not allocated.", prop, slot); diff --git a/code/ryzom/client/src/entity_animation_manager.cpp b/code/ryzom/client/src/entity_animation_manager.cpp index 0e16168ce..c91192e83 100644 --- a/code/ryzom/client/src/entity_animation_manager.cpp +++ b/code/ryzom/client/src/entity_animation_manager.cpp @@ -236,7 +236,7 @@ void CEntityAnimationManager::load(NLMISC::IProgressCallback &/* progress */, bo } } - // Flush debug informations + // Flush debug information flushDebugStack("-- ANIMATIONS OTHER --"); // Stop to Log in the animation file. diff --git a/code/ryzom/client/src/entity_animation_manager.h b/code/ryzom/client/src/entity_animation_manager.h index c2def7a33..0fa4edf0b 100644 --- a/code/ryzom/client/src/entity_animation_manager.h +++ b/code/ryzom/client/src/entity_animation_manager.h @@ -197,8 +197,8 @@ public : void processLogic(const std::string &animListName, TAnimStateKey animationId, CAnimationTime startTimeOffset, CAnimationTime endTimeOffset, NL3D::UTrack *&soundTrack, std::vector& result); - /** \name INFORMATIONS ABOUT ANIMATIONS - * Methods to get informations about an animation. + /** \name INFORMATION ABOUT ANIMATIONS + * Methods to get information about an animation. */ //@{ /** diff --git a/code/ryzom/client/src/entity_cl.cpp b/code/ryzom/client/src/entity_cl.cpp index f215af2ff..9e303bba3 100644 --- a/code/ryzom/client/src/entity_cl.cpp +++ b/code/ryzom/client/src/entity_cl.cpp @@ -2093,7 +2093,7 @@ void CEntityCL::setEntityName(const ucstring &name) //--------------------------------------------------- // displayDebug : -// Display Debug Informations. +// Display Debug Information. //--------------------------------------------------- void CEntityCL::displayDebug(float x, float &y, float lineStep) // virtual { diff --git a/code/ryzom/client/src/entity_cl.h b/code/ryzom/client/src/entity_cl.h index 21402ee0d..7f97eeec8 100644 --- a/code/ryzom/client/src/entity_cl.h +++ b/code/ryzom/client/src/entity_cl.h @@ -602,9 +602,9 @@ public: /// Change the entity colors. virtual void changeColors(sint /* userColor */, sint /* hair */, sint /* eyes */, sint /* part */) { } - /// Display Debug Informations. + /// Display Debug Information. virtual void displayDebug(float x, float &y, float lineStep); - /// Display Debug Informations for property stages + /// Display Debug Information for property stages virtual void displayDebugPropertyStages(float x, float &y, float lineStep); //@} diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp index a232b835f..ef3d57c39 100644 --- a/code/ryzom/client/src/init.cpp +++ b/code/ryzom/client/src/init.cpp @@ -413,7 +413,7 @@ string getVersionString (uint64 version) } -string getSystemInformations() +string getSystemInformation() { string s; s += "Memory: " + bytesToHumanReadable(CSystemInfo::availablePhysicalMemory()) + "/" + bytesToHumanReadable(CSystemInfo::totalPhysicalMemory()) + "\n"; @@ -452,7 +452,7 @@ string getSystemInformations() static string crashCallback() { string s = getDebugInformation(); - s += getSystemInformations(); + s += getSystemInformation(); #ifdef NL_OS_WINDOWS if (Driver) diff --git a/code/ryzom/client/src/interface_v3/action_handler_help.cpp b/code/ryzom/client/src/interface_v3/action_handler_help.cpp index 2645135de..4de275c9b 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_help.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_help.cpp @@ -2811,7 +2811,7 @@ void getSabrinaBrickText(CSBrickSheet *pBR, ucstring &brickText) // Display the ToolType required. strFindReplace(brickText, "%tool", CI18N::get("tool"+TOOL_TYPE::toString(pBR->FaberPlan.ToolType))); - // --- Display MP itempart informations + // --- Display MP itempart information if(pBR->FaberPlan.ItemPartMps.empty()) { strFindReplace(brickText, "%mpinfo", CI18N::get("uihelpMpNone")); @@ -2832,7 +2832,7 @@ void getSabrinaBrickText(CSBrickSheet *pBR, ucstring &brickText) strFindReplace(brickText, "%mpinfo", mpInfo); } - // --- Display MP formula informations + // --- Display MP formula information if(pBR->FaberPlan.FormulaMps.empty()) { strFindReplace(brickText, "%mpformula", CI18N::get("uihelpMpNone")); @@ -3664,7 +3664,7 @@ void updateStatReport () // *************************************************************************** -extern string getSystemInformations(); +extern string getSystemInformation(); class CAHSendStatReport : public IActionHandler { public: @@ -3674,7 +3674,7 @@ public: CInterfaceManager *pIM = CInterfaceManager::getInstance(); pIM->displaySystemInfo(CI18N::get ("uiSendingStatReport")); string s = getDebugInformation(); - s += getSystemInformations(); + s += getSystemInformation(); string progname; char name[1024] = ""; diff --git a/code/ryzom/client/src/interface_v3/chat_window.cpp b/code/ryzom/client/src/interface_v3/chat_window.cpp index 6be8d315b..411c7789d 100644 --- a/code/ryzom/client/src/interface_v3/chat_window.cpp +++ b/code/ryzom/client/src/interface_v3/chat_window.cpp @@ -947,7 +947,7 @@ void CChatGroupWindow::loadFreeTeller(NLMISC::IStream &f) CGroupContainer *pGC = createFreeTeller(sTitle, ""); - // With version 1 all tells are active because windows informations have "title based" ids and no "sID based". + // With version 1 all tells are active because windows information have "title based" ids and no "sID based". if ((ver == 1) && (pGC != NULL)) pGC->setActive(false); } diff --git a/code/ryzom/client/src/interface_v3/group_editbox.h b/code/ryzom/client/src/interface_v3/group_editbox.h index d631a4d84..3b2bc7fc9 100644 --- a/code/ryzom/client/src/interface_v3/group_editbox.h +++ b/code/ryzom/client/src/interface_v3/group_editbox.h @@ -103,7 +103,7 @@ public: // Get the view text const CViewText *getViewText () const {return _ViewText;} - // Get the historic informations + // Get the historic information sint32 getMaxHistoric() const {return _MaxHistoric;} sint32 getCurrentHistoricIndex () const {return _CurrentHistoricIndex;} void setCurrentHistoricIndex (sint32 index) {_CurrentHistoricIndex=index;} diff --git a/code/ryzom/client/src/interface_v3/group_html_cs.cpp b/code/ryzom/client/src/interface_v3/group_html_cs.cpp index d1e2a5f9a..66d884437 100644 --- a/code/ryzom/client/src/interface_v3/group_html_cs.cpp +++ b/code/ryzom/client/src/interface_v3/group_html_cs.cpp @@ -91,7 +91,7 @@ string CGroupHTMLCS::home () // *************************************************************************** extern string getDebugInformation(); -extern string getSystemInformations(); +extern string getSystemInformation(); string convertToHTML (const string &s) { @@ -118,7 +118,7 @@ string convertToHTML (const string &s) void CGroupHTMLCS::getParameters (std::vector ¶meters, bool encodeForUrl) { string s = getDebugInformation(); - s += getSystemInformations(); + s += getSystemInformation(); // For each line string::size_type startOfLine = 0; diff --git a/code/ryzom/client/src/login_patch.h b/code/ryzom/client/src/login_patch.h index 06c5462bd..eec8b0fd3 100644 --- a/code/ryzom/client/src/login_patch.h +++ b/code/ryzom/client/src/login_patch.h @@ -211,9 +211,8 @@ public: void deleteBatchFile(); void reboot(); - // TODO : Revoir ca pour la seconde partie ... - // On a peut etre pas les informations de taille des patches ... voir avec daniel - // pour l'instant c'est un fake qui retourne 1 ! + // TODO : modify it for the second part ... + // Maybe we can't get patchs size ... currently, it only returns 1! int getTotalFilesToGet(); int getCurrentFilesToGet(); diff --git a/code/ryzom/client/src/login_progress_post_thread.h b/code/ryzom/client/src/login_progress_post_thread.h index 14641760b..14e8b8be0 100644 --- a/code/ryzom/client/src/login_progress_post_thread.h +++ b/code/ryzom/client/src/login_progress_post_thread.h @@ -44,7 +44,7 @@ public: /** Notify the http logon server from the various step that have been reached in the client. - * Php scripts on server side use these informations to collect statistics such as : + * Php scripts on server side use these information to collect statistics such as : * - how many player manage to do a successful video driver initialization ? * - how many player did pass the login screen ? * - what is the mean loading time from character selection until in game ? @@ -89,7 +89,7 @@ enum LoginStep_VideoModeSetupHighColor = 2000, LoginStep_LoginScreen = 3000, LoginStep_PostLogin = 4000, - // following are not really part of the login, but are useful informations as well (TODO : find a better name for the class ...) + // following are not really part of the login, but are useful information as well (TODO : find a better name for the class ...) LoginStep_CharacterSelection = 5000, LoginStep_InGameEntry = 6000, LoginStep_GameExit = 7000 diff --git a/code/ryzom/client/src/main_loop.cpp b/code/ryzom/client/src/main_loop.cpp index cacf9c396..f1e6347e7 100644 --- a/code/ryzom/client/src/main_loop.cpp +++ b/code/ryzom/client/src/main_loop.cpp @@ -426,9 +426,6 @@ void displayDebugUIUnderMouse(); // Display an Help. void displayHelp(); -// Draw a Bar to show when the user will be disconnected. -void drawDisco(); - //update the sound manager (listener pos, user walk/run sound...) void updateSound(); @@ -2847,7 +2844,7 @@ bool mainLoop() if(UserEntity->sendToServer(out)) NetMngr.push(out); } - // Give informations to the server about the combat position (ability to strike). + // Give information to the server about the combat position (ability to strike). { CBitMemStream out; if(UserEntity->msgForCombatPos(out)) @@ -3109,7 +3106,7 @@ void displayDebugFps() static NLMISC::CRefPtr HighlightedDebugUI; // displayDebug : -// Display informations about ui elements that are under the mouse +// Display information about ui elements that are under the mouse //--------------------------------------------------- void displayDebugUIUnderMouse() { @@ -3357,14 +3354,14 @@ void displayDebug() // Now Displaying the selection. TextContext->printfAt(0.0f, line, "--*** Watched entity ***--"); line -= lineStep; - // Display informations about the debug entity slot. + // Display information about the debug entity slot. if(WatchedEntitySlot != CLFECOMMON::INVALID_SLOT) { // Get a pointer on the target. CEntityCL *watchedEntity = EntitiesMngr.entity(WatchedEntitySlot); if(watchedEntity) { - // Display Debug Informations about the Selection. + // Display Debug Information about the Selection. watchedEntity->displayDebug(0.0f, line, -lineStep); // Distance of the target @@ -3392,7 +3389,7 @@ void displayDebug() line -= lineStep; TextContext->printfAt(0.0f, line, "Mem Used: %d",nMem);*/ - // 3D Filters informations: + // 3D Filters information: #ifdef _PROFILE_ON_ line-= lineStep; TextContext->printfAt(0.0f, line, "3D Filters:"); diff --git a/code/ryzom/client/src/player_cl.cpp b/code/ryzom/client/src/player_cl.cpp index 90232d90d..c85708ab6 100644 --- a/code/ryzom/client/src/player_cl.cpp +++ b/code/ryzom/client/src/player_cl.cpp @@ -93,7 +93,7 @@ CPlayerCL::CPlayerCL() _HairColor = 0; _EyesColor = 0; - // Not enough informations to display the player. + // Not enough information to display the player. _WaitForAppearance = true; _PlayerCLAsyncTextureLoading= false; @@ -680,7 +680,7 @@ void CPlayerCL::updateVisualPropertyVpa(const NLMISC::TGameCycle &/* gameCycle * { CInterfaceManager *IM = CInterfaceManager::getInstance (); - // Player will now have enough informations to display the character. + // Player will now have enough information to display the character. _WaitForAppearance = false; // Get the property. @@ -1223,7 +1223,7 @@ double CPlayerCL::getMaxSpeed() const// virtual //--------------------------------------------------- // displayDebug : -// Display Debug Informations. +// Display Debug Information. //--------------------------------------------------- void CPlayerCL::displayDebug(float x, float &y, float lineStep) // virtual { diff --git a/code/ryzom/client/src/player_cl.h b/code/ryzom/client/src/player_cl.h index d7c1e4b65..5235eaef4 100644 --- a/code/ryzom/client/src/player_cl.h +++ b/code/ryzom/client/src/player_cl.h @@ -70,7 +70,7 @@ public: * Methods only here for the debug. */ //@{ - /// Display Debug Informations. + /// Display Debug Information. virtual void displayDebug(float x, float &y, float lineStep); //@} diff --git a/code/ryzom/client/src/player_r2_cl.cpp b/code/ryzom/client/src/player_r2_cl.cpp index b858f8f94..504aa6887 100644 --- a/code/ryzom/client/src/player_r2_cl.cpp +++ b/code/ryzom/client/src/player_r2_cl.cpp @@ -92,7 +92,7 @@ CPlayerR2CL::CPlayerR2CL() _HairColor = 0; _EyesColor = 0; - // Not enough informations to display the player. + // Not enough information to display the player. _WaitForAppearance = true; _PlayerCLAsyncTextureLoading= false; @@ -431,7 +431,7 @@ void CPlayerR2CL::updateVisualPropertyVpa(const NLMISC::TGameCycle &/* gameCycle { CInterfaceManager *IM = CInterfaceManager::getInstance (); - // Player will now have enough informations to display the character. + // Player will now have enough information to display the character. _WaitForAppearance = false; // Get the property. @@ -969,7 +969,7 @@ double CPlayerR2CL::getMaxSpeed() const// virtual //--------------------------------------------------- // displayDebug : -// Display Debug Informations. +// Display Debug Information. //--------------------------------------------------- void CPlayerR2CL::displayDebug(float x, float &y, float lineStep) // virtual { diff --git a/code/ryzom/client/src/player_r2_cl.h b/code/ryzom/client/src/player_r2_cl.h index e60f7dcc9..16fad4b53 100644 --- a/code/ryzom/client/src/player_r2_cl.h +++ b/code/ryzom/client/src/player_r2_cl.h @@ -70,7 +70,7 @@ public: * Methods only here for the debug. */ //@{ - /// Display Debug Informations. + /// Display Debug Information. virtual void displayDebug(float x, float &y, float lineStep); //@} diff --git a/code/ryzom/client/src/r2/tool.cpp b/code/ryzom/client/src/r2/tool.cpp index 65887db73..6f8861929 100644 --- a/code/ryzom/client/src/r2/tool.cpp +++ b/code/ryzom/client/src/r2/tool.cpp @@ -525,7 +525,7 @@ CTool::TRayIntersectionType CTool::computeLandscapeRayIntersection(const CWorldV const CArray2D &heightMap = getEditor().getIslandCollision().getHeightMap(); if (!heightMap.empty()) { - // if heightmap is present, use it because it gives us more reliable informations + // if heightmap is present, use it because it gives us more reliable information CVector surfPos; if (!computeNearestValidSurfaceFromHeightMap(inter.x, inter.y, surfPos)) return InvalidPacsPos; static volatile float threshold = 2.f; diff --git a/code/ryzom/client/src/sheet_manager.cpp b/code/ryzom/client/src/sheet_manager.cpp index fcf2b5b1f..810e7a10b 100644 --- a/code/ryzom/client/src/sheet_manager.cpp +++ b/code/ryzom/client/src/sheet_manager.cpp @@ -627,7 +627,7 @@ void CSheetManager::loadAllSheet(NLMISC::IProgressCallback &callBack, bool updat callBack.progress (0); callBack.pushCropedValues (0, 0.5f); - // Get some informations from typ files. + // Get some information from typ files. loadTyp(); // prepare a list of sheets extension to load. @@ -970,7 +970,7 @@ CItemSheet *CSheetManager::getItem(SLOTTYPE::EVisualSlot slot, uint index) //----------------------------------------------- // loadTyp : -// Get Some informations from 'typ' files. +// Get Some information from 'typ' files. //----------------------------------------------- void CSheetManager::loadTyp() { diff --git a/code/ryzom/client/src/streamable_ig.cpp b/code/ryzom/client/src/streamable_ig.cpp index d34579207..6d4ed4fb6 100644 --- a/code/ryzom/client/src/streamable_ig.cpp +++ b/code/ryzom/client/src/streamable_ig.cpp @@ -356,7 +356,7 @@ void CStreamableIG::addLoadedIGToMap() if (!_IGMap) return; for(uint k = 0; k < _IGs.size(); ++k) { - if (_IGs[k].IG && _IGs[k].IG != (NL3D::UInstanceGroup *)-1) // is this a succesfully loaded ig ? + if (_IGs[k].IG && _IGs[k].IG != (NL3D::UInstanceGroup *)-1) // is this a successfully loaded ig ? { // insert the new ig if it hasn't before.. if( _IGMap->insert(std::make_pair(NLMISC::strlwr(_IGs[k].Name), _IGs[k].IG)).second ) @@ -373,7 +373,7 @@ void CStreamableIG::removeLoadedIGFromMap() if (!_IGMap) return; for(uint k = 0; k < _IGs.size(); ++k) { - if (_IGs[k].IG && _IGs[k].IG != (NL3D::UInstanceGroup *)-1) // is this a succesfully loaded ig ? + if (_IGs[k].IG && _IGs[k].IG != (NL3D::UInstanceGroup *)-1) // is this a successfully loaded ig ? { TString2IG::iterator it = _IGMap->find(_IGs[k].Name); if (it != _IGMap->end()) diff --git a/code/ryzom/client/src/time_client.cpp b/code/ryzom/client/src/time_client.cpp index c6cbe3acc..70c7fe0f7 100644 --- a/code/ryzom/client/src/time_client.cpp +++ b/code/ryzom/client/src/time_client.cpp @@ -166,14 +166,14 @@ void removePacket(uint8 numPacket) //----------------------------------------------- // insertPacket : -// Insert the packet received informations in a list. +// Insert the packet received information in a list. //----------------------------------------------- void insertPacket(const CPacketInfos &packetInfos) { // Upadte the last packet received. LastPacketReceived = packetInfos.Num; - // Insert the packet informations. + // Insert the packet information. PacketInfos.insert(make_pair(LastPacketReceived, packetInfos)); // Check Local Time Step with the new packet. diff --git a/code/ryzom/client/src/time_client.h b/code/ryzom/client/src/time_client.h index d98ed8f7f..bc6198607 100644 --- a/code/ryzom/client/src/time_client.h +++ b/code/ryzom/client/src/time_client.h @@ -117,7 +117,7 @@ void insertPacketTime(uint8 numPacket, TTime time); void ackPacketTimeBefore(uint8 ackPacketNumber); void removePacket(uint8 numPacket); -/// Insert the packet received informations in a list. +/// Insert the packet received information in a list. void insertPacket(const CPacketInfos &packetInfos); /// Return the sent time for a given packet or 0 if the packet is not found TTime getSentPacketTime(uint8 numPacket); diff --git a/code/ryzom/client/src/user_entity.cpp b/code/ryzom/client/src/user_entity.cpp index b67d65671..1258512d8 100644 --- a/code/ryzom/client/src/user_entity.cpp +++ b/code/ryzom/client/src/user_entity.cpp @@ -3578,7 +3578,7 @@ CCDBNodeBranch *CUserEntity::getBeastDBEntry( CLFECOMMON::TClientDataSetIndex ui //--------------------------------------------------- // displayDebug : -// Display Debug Informations. +// Display Debug Information. //--------------------------------------------------- void CUserEntity::displayDebug(float x, float &y, float lineStep) // virtual { diff --git a/code/ryzom/client/src/user_entity.h b/code/ryzom/client/src/user_entity.h index 909115908..785a5d0f3 100644 --- a/code/ryzom/client/src/user_entity.h +++ b/code/ryzom/client/src/user_entity.h @@ -344,7 +344,7 @@ public: * Methods only here for the debug. */ //@{ - /// Display Debug Informations. + /// Display Debug Information. virtual void displayDebug(float x, float &y, float lineStep); //@} diff --git a/code/ryzom/common/src/game_share/data_set_base.cpp b/code/ryzom/common/src/game_share/data_set_base.cpp index 829832cea..e153b5d44 100644 --- a/code/ryzom/common/src/game_share/data_set_base.cpp +++ b/code/ryzom/common/src/game_share/data_set_base.cpp @@ -20,7 +20,7 @@ #include "data_set_base.h" #include -// Dependancy on NLNET::IService only for config file access for TDataSetSheet::getConfigDataSetSize() +// Dependency on NLNET::IService only for config file access for TDataSetSheet::getConfigDataSetSize() #include #include "ryzom_entity_id.h" diff --git a/code/ryzom/common/src/game_share/ring_session_manager_itf.h b/code/ryzom/common/src/game_share/ring_session_manager_itf.h index 6530ce008..d874d3fe3 100644 --- a/code/ryzom/common/src/game_share/ring_session_manager_itf.h +++ b/code/ryzom/common/src/game_share/ring_session_manager_itf.h @@ -3601,7 +3601,7 @@ namespace RSMGR // get session info (anim) virtual void on_getSessionInfo(NLNET::TSockId from, uint32 charId, TSessionId sessionId) =0; - // 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 @@ -4012,7 +4012,7 @@ namespace RSMGR _CallbackClient->send(message); } - // 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/common/src/game_share/server_animation_module.cpp b/code/ryzom/common/src/game_share/server_animation_module.cpp index 25397d2cd..a8744e8bf 100644 --- a/code/ryzom/common/src/game_share/server_animation_module.cpp +++ b/code/ryzom/common/src/game_share/server_animation_module.cpp @@ -2483,7 +2483,7 @@ void CServerAnimationModule::addPioneer( TSessionId sessionId, TCharId charId) return; } getEditionModule()->updateCharPioneerRight(charId); - // TODO send this informations only if client + // TODO send this information only if client askMissionItemsDescription(*clientProxyPtr); askActPositionDescriptions(*clientProxyPtr); askUserTriggerDescriptions(*clientProxyPtr); diff --git a/code/ryzom/server/src/ai_service/commands.cpp b/code/ryzom/server/src/ai_service/commands.cpp index 64e4142a3..5ea7837a6 100644 --- a/code/ryzom/server/src/ai_service/commands.cpp +++ b/code/ryzom/server/src/ai_service/commands.cpp @@ -1928,7 +1928,7 @@ NLMISC_COMMAND(displayTarget,"display bot target status for given bot(s) or play if (!found) { - log.displayNL("=> can't display informations for the target of: %s", args[i].c_str()); + log.displayNL("=> can't display information for the target of: %s", args[i].c_str()); } } diff --git a/code/ryzom/server/src/entities_game_service/admin.cpp b/code/ryzom/server/src/entities_game_service/admin.cpp index 7f3421a86..99c3ccd64 100644 --- a/code/ryzom/server/src/entities_game_service/admin.cpp +++ b/code/ryzom/server/src/entities_game_service/admin.cpp @@ -688,7 +688,7 @@ void GET_CHARACTER_Helper(std::string& command, const NLMISC::CEntityId& id, con CCharacter *c = PlayerManager.getChar(eid); \ if (!c) \ { \ - nlwarning("Unkown character '%s'", args[0].c_str()); \ + nlwarning("Unknown character '%s'", args[0].c_str()); \ return false; \ } 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 c7f51539a..0a6381710 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 @@ -245,7 +245,7 @@ float SlowWeaponHit = 5.0f; CCharacterBotChatBeginEnd CharacterBotChatBeginEnd; CCharacterDynChatBeginEnd CharacterDynChatBeginEnd; //*** Removed by Sadge *** -//// Transport class for EGS asking informations about creatures/Npc +//// Transport class for EGS asking information about creatures/Npc //CCreatureAskInformationMsg CreatureNpcInformations; //*** *** // Transport class sent to AIS to set bot mode as death. diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.cpp b/code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.cpp index fefde3a83..c267945c3 100644 --- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.cpp @@ -124,7 +124,7 @@ void CQueryEgsImp::callback (const std::string &name, NLNET::TServiceId id) CCharacter* character = 0; - // the third parameter is the entity id of the player from which we query informations + // the third parameter is the entity id of the player from which we query information if (Params.size() < 3) { nlwarning("Error in CQueryEgsImpl playerId not defined for function '%s'", funName.c_str() ); diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/guild_inv.h b/code/ryzom/server/src/entities_game_service/game_item_manager/guild_inv.h index d3c17eab8..098f0cddf 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/guild_inv.h +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/guild_inv.h @@ -109,7 +109,7 @@ public: /// An item has changed (can be a removing) virtual void onItemChanged(uint32 slot, INVENTORIES::TItemChangeFlags changeFlags); - /// The inventory informations has changed (like total bulk or weight) + /// The inventory information has changed (like total bulk or weight) virtual void onInventoryChanged(INVENTORIES::TInventoryChangeFlags changeFlags); /// Callback from item when an item stack size change (update the weight and bulk of the inventory) diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_bag.h b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_bag.h index 7ba344e34..59dfa7164 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_bag.h +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_bag.h @@ -39,7 +39,7 @@ class CBagInvView : public CCharacterInvView { public: virtual void onItemChanged(uint32 slot, INVENTORIES::TItemChangeFlags changeFlags); - /// The inventory informations has changed (like total bulk or weight) + /// The inventory information has changed (like total bulk or weight) virtual void onInventoryChanged(INVENTORIES::TInventoryChangeFlags changeFlags); }; diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_equip.h b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_equip.h index 0eed6518c..8eeeb8301 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_equip.h +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_equip.h @@ -39,7 +39,7 @@ class CEquipInvView : public CCharacterInvView { public: virtual void onItemChanged(uint32 slot, INVENTORIES::TItemChangeFlags changeFlags); - /// The inventory informations has changed (like total bulk or weight) + /// The inventory information has changed (like total bulk or weight) virtual void onInventoryChanged(INVENTORIES::TInventoryChangeFlags changeFlags); protected: diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_hand.h b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_hand.h index ca9dd2a34..1cae8d8b5 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_hand.h +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_hand.h @@ -45,7 +45,7 @@ class CHandlingInvView : public CCharacterInvView { public: virtual void onItemChanged(uint32 slot, INVENTORIES::TItemChangeFlags changeFlags); - /// The inventory informations has changed (like total bulk or weight) + /// The inventory information has changed (like total bulk or weight) virtual void onInventoryChanged(INVENTORIES::TInventoryChangeFlags changeFlags); protected: diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_pet.h b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_pet.h index 98e781fba..76732845e 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_pet.h +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_pet.h @@ -54,7 +54,7 @@ class CPetInvView : public CCharacterInvView { public: virtual void onItemChanged(uint32 slot, INVENTORIES::TItemChangeFlags changeFlags); - /// The inventory informations has changed (like total bulk or weight) + /// The inventory information has changed (like total bulk or weight) virtual void onInventoryChanged(INVENTORIES::TInventoryChangeFlags changeFlags); }; diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_room.h b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_room.h index 3aefeaa97..75a028ba6 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_room.h +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_room.h @@ -49,7 +49,7 @@ private: class CPlayerRoomInvView : public CCharacterInvView { public: - /// The inventory informations has changed (like total bulk or weight) + /// The inventory information has changed (like total bulk or weight) virtual void onInventoryChanged(INVENTORIES::TInventoryChangeFlags changeFlags); }; 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 f25056326..03bb8b969 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 @@ -225,7 +225,7 @@ public: /// An item has changed (can be a removing) void onItemChanged(uint32 slot, INVENTORIES::TItemChangeFlags changeFlags); - /// The inventory informations has changed (like total bulk or weight) + /// The inventory information has changed (like total bulk or weight) void onInventoryChanged(INVENTORIES::TInventoryChangeFlags changeFlags); //@name item callback @@ -356,7 +356,7 @@ public: //@name Virtual to overload /// An item has changed (can be a removing) virtual void onItemChanged(uint32 slot, INVENTORIES::TItemChangeFlags changeFlags) =0; - /// The inventory informations has changed (like total bulk or weight) + /// The inventory information has changed (like total bulk or weight) virtual void onInventoryChanged(INVENTORIES::TInventoryChangeFlags changeFlags) =0; /** Callback from item when an item stack size change * This callback is used to update the weight and bulk diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_log.h b/code/ryzom/server/src/entities_game_service/mission_manager/mission_log.h index ddbc43ceb..71dd791e2 100644 --- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_log.h +++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_log.h @@ -46,7 +46,7 @@ public: /// the NEL log used for in the mission log NLMISC::CLog *Log; private: - /// the file displayer used to log the mission informations + /// the file displayer used to log the mission information NLMISC::CFileDisplayer _Fd; /// log file name std::string _LogFile; @@ -57,7 +57,7 @@ extern CMissionLog MissionLog; /// macro used to log missions script error #define MISLOG MissionLog.display -/// macro used to log missions informations in verbose mode (at run time) +/// macro used to log missions information in verbose mode (at run time) #define MISDBG if ( !VerboseMissions ){} else MISLOG // Syntax error logged to egs_mission.log diff --git a/code/ryzom/server/src/entities_game_service/modules/animation_session_manager.cpp b/code/ryzom/server/src/entities_game_service/modules/animation_session_manager.cpp index 5602ba053..b4d5d5d8f 100644 --- a/code/ryzom/server/src/entities_game_service/modules/animation_session_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/modules/animation_session_manager.cpp @@ -299,7 +299,7 @@ public: log.displayNL("Dumping AnimSessionManager state"); log.displayNL("--------------------------------"); - // dump some general informations + // dump some general information log.displayNL(" This module know %u ring session manager module, %u server animation module", _RingSessionManagerTracker.getTrackedModules().size(), _ServerAnimationModuleTracker.getTrackedModules().size()); 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 f45122431..6b3bd6ea5 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 @@ -1274,7 +1274,7 @@ uint32 CCharacter::tickUpdate() { H_AUTO(CharacterUpdateTargetCoordinatesCompass); - // update compass coordinates informations + // update compass coordinates information compassDatabaseUpdate(); } if( !checkCharacterStillValide(" Character corrupted : after compassDatabaseUpdate() !!!") ) @@ -2452,7 +2452,7 @@ void CCharacter::processStaticAction() //--------------------------------------------------- -// update compass coordinates informations +// update compass coordinates information //--------------------------------------------------- void CCharacter::compassDatabaseUpdate() { @@ -8746,7 +8746,7 @@ CEvalNumExpr::TReturnState CCharacter::evalValue (const char *value, double &res return CEvalNumExpr::NoError; } } - return CEvalNumExpr::UnkownValue; + return CEvalNumExpr::UnknownValue; } //----------------------------------------------------------------------------- @@ -10549,7 +10549,7 @@ void CCharacter::acceptExchange(uint8 exchangeId) return; } - //if the client had the good trade informations + //if the client had the good trade information if (isExchanging() && c->isExchanging() && exchangeId == c->_ExchangeId) { if (!tempInventoryEmpty()) 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 2932e5fdb..a000613bd 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 @@ -771,7 +771,7 @@ public: void clearHarvestDB(); void openHarvest(); - // get reference on deposit harvest informations + // get reference on deposit harvest information HARVEST_INFOS::CHarvestInfos& getHarvestInfos(); // Process static actions (like harvest, faber...) @@ -1005,7 +1005,7 @@ public: * * \param value is the value to parse. * \param result is the result to fill if the value has been succesfully parsed. - * \return UnkownValue if the value is not known, ValueError is the value evaluation failed or NoError + * \return UnknownValue if the value is not known, ValueError is the value evaluation failed or NoError * if it has been parsed. */ virtual TReturnState evalValue (const char *value, double &result, uint32 userData); @@ -1058,7 +1058,7 @@ public: /// clear bot gift void clearBotGift(); - /// accept the exchange (exchangeId is a counter informing the server of the informations received by the client) + /// accept the exchange (exchangeId is a counter informing the server of the information received by the client) void acceptExchange(uint8 exchangeId); ///exchange money @@ -1209,7 +1209,7 @@ public: /// update scores infos in database void updateScoresInDatabase(); - /// Set database with all character informations + /// Set database with all character information void setDatabase(); /// cancel any static action in progress (ie actions canceled if the player moves like casting, harvest, faber...) @@ -3027,7 +3027,7 @@ private: bool _HarvestDeposit; /// if harvesting a deposit, the skill used SKILLS::ESkills _DepositSearchSkill; - /// Harvest deposit informations + /// Harvest deposit information HARVEST_INFOS::CHarvestInfos _DepositHarvestInformations; //@} diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/totem_base.cpp b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/totem_base.cpp index ea9b49a51..3e8907667 100644 --- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/totem_base.cpp +++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/totem_base.cpp @@ -209,7 +209,7 @@ void CTotemBase::setBotObject( CCreature* botObject ) // if the totem is totem is currently building, it means // that this method was called because of the sheetId change - // we must then restore some informations + // we must then restore some information if ( _IsBuildingFinished == false ) { _BotObject->getScores()._PhysicalScores[SCORES::hit_points].Max = (sint32)_TotemMaxHP; diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/totem_base.h b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/totem_base.h index 50fe0ff85..8afeabe11 100644 --- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/totem_base.h +++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/totem_base.h @@ -150,7 +150,7 @@ private : /// Tick when last time attack message for totem has sended NLMISC::TGameCycle _LastTickAttackMessageSended; - // these informations must be kept or they will be lost + // these information must be kept or they will be lost // while changing the bot object sheetId /// HP Gained during building float _BuildHpGain; diff --git a/code/ryzom/server/src/entities_game_service/shop_type/shop_type_manager.cpp b/code/ryzom/server/src/entities_game_service/shop_type/shop_type_manager.cpp index 3d580328c..7db4c5d6b 100644 --- a/code/ryzom/server/src/entities_game_service/shop_type/shop_type_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/shop_type/shop_type_manager.cpp @@ -1549,7 +1549,7 @@ CEvalNumExpr::TReturnState CShopTypeManager::evalValue (const char *value, doubl { nlwarning(" 'standart.prices_table' still used"); result = userData * pow( 1.2, (int)userData ); - return CEvalNumExpr::UnkownValue; + return CEvalNumExpr::UnknownValue; } diff --git a/code/ryzom/server/src/entities_game_service/shop_type/shop_type_manager.h b/code/ryzom/server/src/entities_game_service/shop_type/shop_type_manager.h index 258d518bb..74cfb62a9 100644 --- a/code/ryzom/server/src/entities_game_service/shop_type/shop_type_manager.h +++ b/code/ryzom/server/src/entities_game_service/shop_type/shop_type_manager.h @@ -134,7 +134,7 @@ public: * \param value is the value to parse. * \param result is the result to fill if the value has been succesfully parsed. * \param userData is quality of evaluated item - * \return UnkownValue if the value is not known, ValueError is the value evaluation failed or NoError if it has been parsed. + * \return UnknownValue if the value is not known, ValueError is the value evaluation failed or NoError if it has been parsed. */ NLMISC::CEvalNumExpr::TReturnState evalValue (const char *value, double &result, uint32 userData); diff --git a/code/ryzom/server/src/entities_game_service/world_instances.h b/code/ryzom/server/src/entities_game_service/world_instances.h index 15cb61daf..eb8c2728c 100644 --- a/code/ryzom/server/src/entities_game_service/world_instances.h +++ b/code/ryzom/server/src/entities_game_service/world_instances.h @@ -43,7 +43,7 @@ class CReportAIInstanceDespawnMsgImp : public CReportAIInstanceDespawnMsg }; -/* This class store instance informations as well as +/* This class store instance information as well as * AIS list with available collision information. * The AIS collision information is used to select the * AIS for spawning a new dynamic instance. diff --git a/code/ryzom/server/src/gpm_service/world_entity.h b/code/ryzom/server/src/gpm_service/world_entity.h index 53e6383c5..d81b64c3d 100644 --- a/code/ryzom/server/src/gpm_service/world_entity.h +++ b/code/ryzom/server/src/gpm_service/world_entity.h @@ -322,7 +322,7 @@ typedef CObjectList TEntityList; /** - * Player Infos : contains all informations specific to players (like vision and original front end) + * Player Infos : contains all information specific to players (like vision and original front end) * \author David Fleury * \author Nevrax France * \date 2002 diff --git a/code/ryzom/server/src/input_output_service/string_manager_parser.cpp b/code/ryzom/server/src/input_output_service/string_manager_parser.cpp index 562563f49..1b305c6a4 100644 --- a/code/ryzom/server/src/input_output_service/string_manager_parser.cpp +++ b/code/ryzom/server/src/input_output_service/string_manager_parser.cpp @@ -997,7 +997,7 @@ bool CStringManager::parseCondition(const CPhrase &phrase, const ucstring &str, cond.Operator = lessEqual; else { - nlwarning("Unkown operator [%s] in condition [%s] part %u", opstr.c_str(), str.toString().c_str(), count); + nlwarning("Unknown operator [%s] in condition [%s] part %u", opstr.c_str(), str.toString().c_str(), count); return false; } diff --git a/code/ryzom/server/src/server_share/msg_ai_service.h b/code/ryzom/server/src/server_share/msg_ai_service.h index 777c208cd..1f6a23053 100644 --- a/code/ryzom/server/src/server_share/msg_ai_service.h +++ b/code/ryzom/server/src/server_share/msg_ai_service.h @@ -34,7 +34,7 @@ // Transport class messages interface for AIS / EGS communication //---------------------------------------------------------------------------- -// EGS ask informations about creatures / npcs against characters +// EGS ask information about creatures / npcs against characters //---------------------------------------------------------------------------- class CCreatureAskInformationMsg : public CMirrorTransportClass { diff --git a/code/ryzom/server/src/session_browser_server/session_browser_server.cpp b/code/ryzom/server/src/session_browser_server/session_browser_server.cpp index a37d7800c..511896c8b 100644 --- a/code/ryzom/server/src/session_browser_server/session_browser_server.cpp +++ b/code/ryzom/server/src/session_browser_server/session_browser_server.cpp @@ -230,7 +230,7 @@ public: } - // 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/tools/leveldesign/world_editor/world_editor/world_editor_doc.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.cpp index 1a67f9107..354e516fd 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.cpp @@ -323,7 +323,7 @@ bool CWorldEditorDoc::loadDocument (const char *filename) else { // Error - theApp.syntaxError (filename, rootNode, "Unkown file header : %s", rootNode->name); + theApp.syntaxError (filename, rootNode, "Unknown file header : %s", rootNode->name); } } From 856efe748421e0221c0ba95eb87ac2ef6552b823 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 13 Jun 2010 17:22:27 +0200 Subject: [PATCH 2/4] Changed: #878 Fix typos in comments/code --- code/nel/include/nel/3d/driver.h | 4 ++-- code/nel/include/nel/3d/u_driver.h | 4 ++-- code/ryzom/client/src/connection.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/nel/include/nel/3d/driver.h b/code/nel/include/nel/3d/driver.h index 2396d9d62..89508e701 100644 --- a/code/nel/include/nel/3d/driver.h +++ b/code/nel/include/nel/3d/driver.h @@ -690,13 +690,13 @@ public: virtual uint32 getImplementationVersion () const = 0; /** - * Get driver informations. + * Get driver information. * get the nel name of the driver (ex: "Opengl 1.2 NeL Driver") */ virtual const char* getDriverInformation () = 0; /** - * Get videocard informations. + * Get videocard information. * get the official name of the driver */ virtual const char* getVideocardInformation () = 0; diff --git a/code/nel/include/nel/3d/u_driver.h b/code/nel/include/nel/3d/u_driver.h index 7641fdb2d..06c95fbe1 100644 --- a/code/nel/include/nel/3d/u_driver.h +++ b/code/nel/include/nel/3d/u_driver.h @@ -477,13 +477,13 @@ public: virtual uint32 getImplementationVersion () const = 0; /** - * Get driver informations. + * Get driver information. * get the nel name of the driver (ex: "Opengl 1.2 NeL Driver") */ virtual const char* getDriverInformation () = 0; /** - * Get videocard informations. + * Get videocard information. * get the official name of the driver */ virtual const char* getVideocardInformation () = 0; diff --git a/code/ryzom/client/src/connection.cpp b/code/ryzom/client/src/connection.cpp index 141b2cff2..a2d784e37 100644 --- a/code/ryzom/client/src/connection.cpp +++ b/code/ryzom/client/src/connection.cpp @@ -2688,7 +2688,7 @@ class CAHScenarioControl : public IActionHandler } setScenarioInformation(scenarioWnd, ""); - // hide description and informations? + // hide description and information? result = scenarioWnd->findFromShortId(string("scenario_info_prop")); if(result) result->setActive(R2::getEditor().isInitialized()); @@ -2863,7 +2863,7 @@ class CAHScenarioInformation : public IActionHandler } } - // active description and informations + // active description and information result = scenarioWnd->findFromShortId(string("scenario_info_prop")); if(result) result->setActive(true); From 60e1f64d6448c8c1ab561805853482b8bf89ec26 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 13 Jun 2010 17:30:58 +0200 Subject: [PATCH 3/4] Fixed: #982 Remove seven_zip dependency for Mac OS and Linux client --- code/ryzom/client/src/login_patch.cpp | 32 ++++++++++++++++++--------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp index f0bb8c359..e24d5df48 100644 --- a/code/ryzom/client/src/login_patch.cpp +++ b/code/ryzom/client/src/login_patch.cpp @@ -38,14 +38,17 @@ #include "nel/misc/big_file.h" #include "nel/misc/i18n.h" +#ifdef NL_OS_WINOWS + #define NL_USE_SEVENZIP 1 +#endif + // 7 zip includes -//extern "C" -//{ -#include "seven_zip/7zCrc.h" -#include "seven_zip/7zIn.h" -#include "seven_zip/7zExtract.h" -#include "seven_zip/LzmaDecode.h" -//}; +#ifdef NL_USE_SEVENZIP + #include "seven_zip/7zCrc.h" + #include "seven_zip/7zIn.h" + #include "seven_zip/7zExtract.h" + #include "seven_zip/LzmaDecode.h" +#endif #include "game_share/bg_downloader_msg.h" @@ -137,8 +140,7 @@ struct EPatchDownloadException : public Exception CPatchManager *CPatchManager::_Instance = NULL; - - +#ifdef NL_USE_SEVENZIP /// Input stream class for 7zip archive class CNel7ZipInStream : public _ISzInStream { @@ -187,7 +189,7 @@ public: } } }; - +#endif // **************************************************************************** @@ -1939,6 +1941,7 @@ void CPatchManager::getCorruptedFileInfo(const SFileToPatch &ftp, ucstring &sTra bool CPatchManager::unpack7Zip(const std::string &sevenZipFile, const std::string &destFileName) { +#ifdef NL_USE_SEVENZIP nlinfo("Uncompressing 7zip archive '%s' to '%s'", sevenZipFile.c_str(), destFileName.c_str()); @@ -2023,10 +2026,14 @@ bool CPatchManager::unpack7Zip(const std::string &sevenZipFile, const std::strin // ok, all is fine, file is unpacked return true; +#else + return false; +#endif } bool CPatchManager::unpackLZMA(const std::string &lzmaFile, const std::string &destFileName) { +#ifdef NL_USE_SEVENZIP nldebug("unpackLZMA : decompression the lzma file '%s' into output file '%s", lzmaFile.c_str(), destFileName.c_str()); CIFile inStream(lzmaFile); uint32 inSize = inStream.getFileSize(); @@ -2087,6 +2094,9 @@ bool CPatchManager::unpackLZMA(const std::string &lzmaFile, const std::string &d outStream.serialBuffer(outBuffer.get(), (uint)fileSize); return true; +#else + return false; +#endif } @@ -3420,7 +3430,7 @@ void CInstallThread::run() std::string correct = CPath::standardizePath (patchPath + _Entries[first].PatchName, false); allowed.insert(correct); } - // Delete file from tmp directory that are not "allowed" (torrent protocol can downlaod partial file that are not asked) + // Delete file from tmp directory that are not "allowed" (torrent protocol can download partial file that are not asked) std::vector vFiles; CPath::getPathContent(patchPath , true, false, true, vFiles); for (uint32 i = 0; i < vFiles.size(); ++i) From 175252cffd5cc5bcdf3d548266f80c5966c8ab63 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 13 Jun 2010 18:01:03 +0200 Subject: [PATCH 4/4] Fixed: #981 Create createWindow and destroyWindow private methods in OpenGL driver --- .../3d/driver/opengl/driver_opengl_window.cpp | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp index a863a898b..e2e91eaac 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp @@ -224,8 +224,10 @@ bool CDriverGL::unInit() _PBuffer = NULL; } - if (!UnregisterClassW(L"NLClass", GetModuleHandle(NULL))) + if (_Registered && !UnregisterClassW(L"NLClass", GetModuleHandle(NULL))) + { nlwarning("Can't unregister NLClass"); + } // Restaure monitor color parameters if (_NeedToRestaureGammaRamp) @@ -563,6 +565,10 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re _win = wnd; } + // associate OpenGL driver to window + SetWindowLongPtr(_win, GWLP_USERDATA, (LONG_PTR)this); + + _hDC=GetDC(_win); wglMakeCurrent(_hDC,NULL); @@ -668,14 +674,14 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re nlerror("glXChooseVisual() failed"); } + _visual_info = visual_info; + _ctx = glXCreateContext (_dpy, visual_info, None, GL_TRUE); if (_ctx == NULL) { nlerror("glXCreateContext() failed"); } - _visual_info = visual_info; - if (wnd == EmptyWindow) { if (!createWindow(mode)) @@ -922,9 +928,6 @@ bool CDriverGL::createWindow(const GfxMode &mode) return false; } - // associate OpenGL driver to window - SetWindowLongPtr(window, GWLP_USERDATA, (LONG_PTR)this); - #elif defined(NL_OS_MAC) && defined(NL_MAC_NATIVE) // TODO @@ -934,8 +937,11 @@ bool CDriverGL::createWindow(const GfxMode &mode) if (_visual_info == NULL) return false; + nlWindow root = RootWindow(_dpy, DefaultScreen(_dpy)); + XSetWindowAttributes attr; attr.background_pixel = BlackPixel(_dpy, DefaultScreen(_dpy)); + attr.colormap = XCreateColormap(_dpy, root, _visual_info->visual, AllocNone); #ifdef XF86VIDMODE // If we're going to attempt fullscreen, we need to set redirect to True, @@ -953,12 +959,7 @@ bool CDriverGL::createWindow(const GfxMode &mode) attr.override_redirect = False; #endif - int attr_flags = CWOverrideRedirect | CWBackPixel; - - nlWindow root = RootWindow(_dpy, DefaultScreen(_dpy)); - - attr.colormap = XCreateColormap(_dpy, root, _visual_info->visual, AllocNone); - attr_flags |= CWColormap; + int attr_flags = CWOverrideRedirect | CWBackPixel | CWColormap; window = XCreateWindow (_dpy, root, 0, 0, mode.Width, mode.Height, 0, _visual_info->depth, InputOutput, _visual_info->visual, attr_flags, &attr); @@ -1538,8 +1539,8 @@ void CDriverGL::getWindowSize(uint32 &width, uint32 &height) { if (_win) { - width = (uint32)(_WindowWidth); - height = (uint32)(_WindowHeight); + width = (uint32)_WindowWidth; + height = (uint32)_WindowHeight; } }