diff --git a/code/nel/include/nel/3d/vertex_program_parse.h b/code/nel/include/nel/3d/vertex_program_parse.h index 8c7ec7f9b..cd9f414c9 100644 --- a/code/nel/include/nel/3d/vertex_program_parse.h +++ b/code/nel/include/nel/3d/vertex_program_parse.h @@ -188,7 +188,7 @@ public: * \warning: Only syntax is checked. It doesn't check that a register has been initialised before use. * \param src The input text of a vertex program, in OpenGL format. * \param result The result program. - * \param errorOuput If parsing failed, contains the reason + * \param errorOutput If parsing failed, contains the reason * \result true if the parsing succeeded */ bool parse(const char *src, TProgram &result, std::string &errorOutput); diff --git a/code/nel/src/3d/particle_system_shape.cpp b/code/nel/src/3d/particle_system_shape.cpp index 6810bd6ef..7acbea6d4 100644 --- a/code/nel/src/3d/particle_system_shape.cpp +++ b/code/nel/src/3d/particle_system_shape.cpp @@ -173,7 +173,7 @@ void CParticleSystemShape::serial(NLMISC::IStream &f) throw(NLMISC::EStream) ///=========================================================================== void CParticleSystemShape::buildFromPS(const CParticleSystem &ps) { - // must be sure that we are writting in the stream + // must be sure that we are writing in the stream if (_ParticleSystemProto.isReading()) { _ParticleSystemProto.invert(); diff --git a/code/nel/src/3d/tessellation.cpp b/code/nel/src/3d/tessellation.cpp index 8940358c3..58171c40f 100644 --- a/code/nel/src/3d/tessellation.cpp +++ b/code/nel/src/3d/tessellation.cpp @@ -1774,7 +1774,7 @@ void CTessFace::refineAll() /* if(psRefineThreshold*2), the face is fully splitted/geomoprhed (tests reported on sons...). */ @@ -1831,7 +1831,7 @@ void CTessFace::refineAll() // Split or merge, and meaning of errorMetric: /* if(errorMetricRefineThreshold*2), the face is fully splitted/geomoprhed. */ diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_page.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_page.cpp index 084c44f50..26643200b 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_page.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_page.cpp @@ -64,8 +64,8 @@ CLocatedBindablePage::CLocatedBindablePage(QWidget *parent) _ui.blurCoeffWidget->setWrapper(&_MotionBlurCoeffWrapper); // Fake motion blur threshold - _ui.blurTresholdWidget->setRange(0.0, 5.0); - _ui.blurTresholdWidget->setWrapper(&_MotionBlurThresholdWrapper); + _ui.blurThresholdWidget->setRange(0.0, 5.0); + _ui.blurThresholdWidget->setWrapper(&_MotionBlurThresholdWrapper); // Shock wave radius cut _ui.radiusCutWidget->setRange(0, 1); @@ -275,7 +275,7 @@ void CLocatedBindablePage::setEditedItem(CWorkspaceNode *ownerNode, NL3D::CPSLoc _MotionBlurThresholdWrapper.P = fla; _MotionBlurThresholdWrapper.OwnerNode = _Node; - _ui.blurTresholdWidget->updateUi(); + _ui.blurThresholdWidget->updateUi(); _ui.zalignCheckBox->show(); _ui.alignCheckBox->show(); @@ -633,7 +633,7 @@ void CLocatedBindablePage::updateValidWidgetForAlignOnMotion(bool align) _ui.blurCoeffLabel->setEnabled(align); _ui.blurCoeffWidget->setEnabled(align); _ui.blurTreshholdLabel->setEnabled(align); - _ui.blurTresholdWidget->setEnabled(align); + _ui.blurThresholdWidget->setEnabled(align); _ui.zalignCheckBox->setEnabled(align); } diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc b/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc index c25a08456..a2f49f0da 100644 --- a/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc +++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export.rc @@ -121,7 +121,7 @@ BEGIN 8 PUSHBUTTON "Interrupt",IDC_BUTTONCANCEL,129,23,50,14,BS_NOTIFY LTEXT "Object progression",IDC_STATIC,7,28,79,8 - LTEXT "Lightmaps Informations...",IDC_STATICINFO,7,60,172,114 + LTEXT "Lightmaps Information...",IDC_STATICINFO,7,60,172,114 END IDD_LOD DIALOG DISCARDABLE 0, 0, 360, 200 diff --git a/code/nelns/admin_executor_service/admin_executor_service.cpp b/code/nelns/admin_executor_service/admin_executor_service.cpp index f3c5476fd..c7bbb02f7 100644 --- a/code/nelns/admin_executor_service/admin_executor_service.cpp +++ b/code/nelns/admin_executor_service/admin_executor_service.cpp @@ -205,7 +205,7 @@ uint32 LastPing = 0; // contains the date of the last ping sent to the services // Alarms // -void sendInformations(TServiceId sid) +void sendInformation(TServiceId sid) { CMessage msgout("INFO"); msgout.serialCont(AllAdminAlarms); @@ -1195,7 +1195,7 @@ static void cbAESInfo(CMessage &msgin, const std::string &serviceName, TServiceI { if (Services[j].Connected) { - sendInformations(Services[j].ServiceId); + sendInformation(Services[j].ServiceId); } } } @@ -1309,7 +1309,7 @@ void serviceConnection(const std::string &serviceName, TServiceId sid, void *arg Services[sid.get()].init(serviceName, sid); - sendInformations(sid); + sendInformation(sid); nlinfo("%s-%hu connected", Services[sid.get()].ShortName.c_str(), Services[sid.get()].ServiceId.get()); diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml index 982bdf6e9..f272c6735 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml @@ -90,9 +90,9 @@ inherit_gc_alpha="#inherit_gc_alpha" /> - - - + + + diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp index 2f947e198..60171614d 100644 --- a/code/ryzom/client/src/character_cl.cpp +++ b/code/ryzom/client/src/character_cl.cpp @@ -3345,7 +3345,7 @@ void CCharacterCL::showOrHideBodyParts( bool objectsVisible ) { // Right Hand if(rHandInstIdx<_Instances.size()) - if( !(_Items[rHandInstIdx].Sheet && _Items[rHandInstIdx].Sheet->NeverHideWhenEquiped ) ) + if( !(_Items[rHandInstIdx].Sheet && _Items[rHandInstIdx].Sheet->NeverHideWhenEquipped ) ) if(!_Instances[rHandInstIdx].Current.empty()) { _Instances[rHandInstIdx].Current.hide(); @@ -3353,7 +3353,7 @@ void CCharacterCL::showOrHideBodyParts( bool objectsVisible ) } // Left Hand if(lHandInstIdx <_Instances.size()) - if( !(_Items[lHandInstIdx].Sheet && _Items[lHandInstIdx].Sheet->NeverHideWhenEquiped ) ) + if( !(_Items[lHandInstIdx].Sheet && _Items[lHandInstIdx].Sheet->NeverHideWhenEquipped ) ) if(!_Instances[lHandInstIdx].Current.empty()) { _Instances[lHandInstIdx].Current.hide(); diff --git a/code/ryzom/client/src/client_sheets/item_sheet.cpp b/code/ryzom/client/src/client_sheets/item_sheet.cpp index 6da0eefab..1e7894b79 100644 --- a/code/ryzom/client/src/client_sheets/item_sheet.cpp +++ b/code/ryzom/client/src/client_sheets/item_sheet.cpp @@ -100,7 +100,7 @@ CItemSheet::CItemSheet() Type = CEntitySheet::ITEM; Bulk= 0.f; EquipTime= 0; - NeverHideWhenEquiped = false; + NeverHideWhenEquipped = false; RequiredCharac = CHARACTERISTICS::Unknown; RequiredCharacLevel = 0; RequiredSkill = SKILLS::unknown; @@ -214,8 +214,8 @@ void CItemSheet::build(const NLGEORGES::UFormElm &item) IconText = strlwr (IconText); IdIconText = ClientSheetsStrings.add(IconText); - // See if this item can be hiden when equiped - if(!item.getValueByName (NeverHideWhenEquiped, "3d.never hide when equiped")) + // See if this item can be hiden when equipped + if(!item.getValueByName (NeverHideWhenEquipped, "3d.never hide when equiped")) debug("key '3d.never hide when equiped."); // Load the different slot in wicth the item can be equipped. @@ -633,7 +633,7 @@ void CItemSheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream) f.serial(HasFx); // Serialize the has fx. f.serial(DropOrSell); f.serial(IsItemNoRent); - f.serial(NeverHideWhenEquiped); + f.serial(NeverHideWhenEquipped); f.serial(Stackable); f.serial(IsConsumable); f.serial(Bulk); diff --git a/code/ryzom/client/src/client_sheets/item_sheet.h b/code/ryzom/client/src/client_sheets/item_sheet.h index a44820fda..250f8411e 100644 --- a/code/ryzom/client/src/client_sheets/item_sheet.h +++ b/code/ryzom/client/src/client_sheets/item_sheet.h @@ -330,7 +330,7 @@ public: /// Equip Time uint32 EquipTime; /// true if this item can be hidden when equipped - bool NeverHideWhenEquiped; + bool NeverHideWhenEquipped; // FX CItemFXSheet FX; diff --git a/code/ryzom/server/src/entities_game_service/client_messages.cpp b/code/ryzom/server/src/entities_game_service/client_messages.cpp index 58dc114e2..239f3da4e 100644 --- a/code/ryzom/server/src/entities_game_service/client_messages.cpp +++ b/code/ryzom/server/src/entities_game_service/client_messages.cpp @@ -108,12 +108,12 @@ void cbClientItemEquip( NLNET::CMessage& msgin, const std::string &serviceName, { H_AUTO(cbClientItemEquip); - uint16 equipedInventory, equipedSlot, bagSlot; + uint16 equippedInventory, equippedSlot, bagSlot; CEntityId id; msgin.serial( id ); - msgin.serial( equipedInventory ); - msgin.serial( equipedSlot ); + msgin.serial( equippedInventory ); + msgin.serial( equippedSlot ); msgin.serial( bagSlot ); CCharacter *c = (CCharacter * ) CEntityBaseManager::getEntityBasePtr( id ); @@ -125,7 +125,7 @@ void cbClientItemEquip( NLNET::CMessage& msgin, const std::string &serviceName, // if player is stunned or dead cancel action if (c->isDead() || c->isStunned()) return; - c->equipCharacter( INVENTORIES::TInventory(equipedInventory), equipedSlot, bagSlot, true ); + c->equipCharacter( INVENTORIES::TInventory(equippedInventory), equippedSlot, bagSlot, true ); } } @@ -134,12 +134,12 @@ void cbClientItemUnequip( NLNET::CMessage& msgin, const std::string &serviceName { H_AUTO(cbClientItemUnequip); - uint16 equipedInventory, equipedSlot; + uint16 equippedInventory, equippedSlot; CEntityId id; msgin.serial( id ); - msgin.serial( equipedInventory ); - msgin.serial( equipedSlot ); + msgin.serial( equippedInventory ); + msgin.serial( equippedSlot ); CCharacter *c = (CCharacter * ) CEntityBaseManager::getEntityBasePtr( id ); if( c ) @@ -151,7 +151,7 @@ void cbClientItemUnequip( NLNET::CMessage& msgin, const std::string &serviceName if (c->isDead() || c->isStunned()) return; - c->unequipCharacter( INVENTORIES::TInventory(equipedInventory), equipedSlot, true ); + c->unequipCharacter( INVENTORIES::TInventory(equippedInventory), equippedSlot, true ); } } diff --git a/code/ryzom/server/src/entities_game_service/entities_game_service.cpp b/code/ryzom/server/src/entities_game_service/entities_game_service.cpp index ef0f9404e..085d67aae 100644 --- a/code/ryzom/server/src/entities_game_service/entities_game_service.cpp +++ b/code/ryzom/server/src/entities_game_service/entities_game_service.cpp @@ -251,7 +251,7 @@ CCharacterBotChatBeginEnd CharacterBotChatBeginEnd; CCharacterDynChatBeginEnd CharacterDynChatBeginEnd; //*** Removed by Sadge *** //// Transport class for EGS asking information about creatures/Npc -//CCreatureAskInformationMsg CreatureNpcInformations; +//CCreatureAskInformationMsg CreatureNpcInformation; //*** *** // Transport class sent to AIS to set bot mode as death. CBSAIDeathReport BotDeathReport; diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp b/code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp index cef7560a0..e054fe0cb 100644 --- a/code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp @@ -1344,7 +1344,7 @@ sint32 CFameManager::getMaxFameByFactionIndex(std::pair _FactionIndexToTribeThresholdIndex; // :OPTIM: init/doInit is dual to inline the _FactionIndexToTribeThresholdIndex.empty() test - void initTribeTresholdIndex() + void initTribeThresholdIndex() { if(_FactionIndexToTribeThresholdIndex.empty()) - doInitTribeTresholdIndex(); + doInitTribeThresholdIndex(); } - void doInitTribeTresholdIndex(); + void doInitTribeThresholdIndex(); // FameStart - starting values for fame, [player's group][target group] // - There are no None or Neutral clans for starting fame, so leave those out. diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp index a28d65b30..2b088fab6 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp @@ -187,7 +187,7 @@ extern float CarriedItemsDecayRate; extern uint8 TeamMembersStatusMaxValue; extern CCharacterBotChatBeginEnd CharacterBotChatBeginEnd; //*** Removed by Sadge *** -//extern CCreatureAskInformationMsg CreatureNpcInformations; +//extern CCreatureAskInformationMsg CreatureNpcInformation; //*** *** extern float MaxHarvestDistance; extern float MaxMountDistance; @@ -3503,8 +3503,8 @@ void CCharacter::setTarget( const CEntityId &targetId, bool sendMessage ) //*** Removed by Sadge *** // // Ask information about target to AI service -// CreatureNpcInformations.Character.push_back( _EntityRowId ); -// CreatureNpcInformations.Creature.push_back( target->getEntityRowId() ); +// CreatureNpcInformation.Character.push_back( _EntityRowId ); +// CreatureNpcInformation.Creature.push_back( target->getEntityRowId() ); //*** *** } else // target == NULL @@ -7811,9 +7811,9 @@ void CCharacter::endHarvest(bool sendCloseTempImpulsion) _HarvestOpened = false; _DepositSearchSkill = SKILLS::unknown; _MpIndex = 0xff; - _DepositHarvestInformations.DepositIndex = 0xffffffff; + _DepositHarvestInformation.DepositIndex = 0xffffffff; - if ( _DepositHarvestInformations.Sheet != CSheetId::Unknown/*_DepositHarvestInformations.EndCherchingTime != 0xffffffff && _DepositHarvestInformations.EndCherchingTime > CTickEventHandler::getGameCycle()*/ ) + if ( _DepositHarvestInformation.Sheet != CSheetId::Unknown/*_DepositHarvestInformation.EndCherchingTime != 0xffffffff && _DepositHarvestInformation.EndCherchingTime > CTickEventHandler::getGameCycle()*/ ) { if ( sendCloseTempImpulsion ) { @@ -14041,7 +14041,7 @@ bool CCharacter::pickUpRawMaterial( uint32 indexInTempInv, bool * lastMaterial ) } clearHarvestDB(); - //CZoneManager::getInstance().removeRmFromDeposit( this, _DepositHarvestInformations.DepositIndex, _DepositHarvestInformations.DepositIndexContent,_HarvestedQuantity); + //CZoneManager::getInstance().removeRmFromDeposit( this, _DepositHarvestInformation.DepositIndex, _DepositHarvestInformation.DepositIndexContent,_HarvestedQuantity); } } } diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.h b/code/ryzom/server/src/entities_game_service/player_manager/character.h index 8a3c127da..e46cd0a88 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/character.h @@ -3201,7 +3201,7 @@ private: /// if harvesting a deposit, the skill used SKILLS::ESkills _DepositSearchSkill; /// Harvest deposit information - HARVEST_INFOS::CHarvestInfos _DepositHarvestInformations; + HARVEST_INFOS::CHarvestInfos _DepositHarvestInformation; //@} /// the tick value of the nex decay of player items diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h b/code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h index 615ddaeb8..d0bfe3358 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h @@ -168,7 +168,7 @@ inline uint16 CCharacter::harvestedMpQuantity() const inline HARVEST_INFOS::CHarvestInfos& CCharacter::getHarvestInfos() { - return _DepositHarvestInformations; + return _DepositHarvestInformation; } //------------------------------------------------------------------------------ diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp index 9594a0701..2ce09282c 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp @@ -2127,8 +2127,8 @@ void CCharacter::clearTempInventory() case TEMP_INV_MODE::Quarter: case TEMP_INV_MODE::Harvest: - _DepositHarvestInformations.Sheet = CSheetId::Unknown; - _DepositHarvestInformations.EndCherchingTime = 0xffffffff; + _DepositHarvestInformation.Sheet = CSheetId::Unknown; + _DepositHarvestInformation.EndCherchingTime = 0xffffffff; endHarvest(); break; diff --git a/code/ryzom/server/src/input_output_service/CMakeLists.txt b/code/ryzom/server/src/input_output_service/CMakeLists.txt index 9064ad0a3..56b5a07eb 100644 --- a/code/ryzom/server/src/input_output_service/CMakeLists.txt +++ b/code/ryzom/server/src/input_output_service/CMakeLists.txt @@ -25,7 +25,7 @@ TARGET_LINK_LIBRARIES(ryzom_ios_service nelgeorges nelligo) -NL_DEFAULT_PROPS(ryzom_ios_service "Ryzom, Services: Input Ouput Service (IOS)") +NL_DEFAULT_PROPS(ryzom_ios_service "Ryzom, Services: Input Output Service (IOS)") NL_ADD_RUNTIME_FLAGS(ryzom_ios_service) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_implementation.cpp b/code/ryzom/tools/leveldesign/georges_dll/georges_implementation.cpp index b97c22dba..2422d4b65 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/georges_implementation.cpp +++ b/code/ryzom/tools/leveldesign/georges_dll/georges_implementation.cpp @@ -517,7 +517,7 @@ void CGeorgesImpl::MakeTyp( const std::string& filename, TType type, TUI ui, con } catch (Exception &e) { - nlwarning ("Error during writting file '%s' : ", filename.c_str (), e.what ()); + nlwarning ("Error during writing file '%s' : ", filename.c_str (), e.what ()); } } else diff --git a/code/ryzom/tools/translation_tools/main.cpp b/code/ryzom/tools/translation_tools/main.cpp index 61a4ac914..d8839f1ff 100644 --- a/code/ryzom/tools/translation_tools/main.cpp +++ b/code/ryzom/tools/translation_tools/main.cpp @@ -664,7 +664,7 @@ int makeStringDiff(int argc, char *argv[]) } else { - LOG("Writting difference file for %s.\n", Languages[l].c_str()); + LOG("Writing difference file for %s.\n", Languages[l].c_str()); // build the diff file for each language. ucstring str = prepareStringFile(diff, false); @@ -1669,7 +1669,7 @@ int makeWorksheetDiff(int argc, char *argv[], const std::string &additionFilenam } else { - LOG("Writting difference file for %s.\n", referenceFilename.c_str()); + LOG("Writing difference file for %s.\n", referenceFilename.c_str()); // build the diff file for each language. ucstring str = prepareExcelSheet(diff);