Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Typo fixes (thanks to Vagrant!)

Browse source
This commit is contained in:
kervala 2013-02-09 10:05:32 +01:00
parent b2801c93b8
commit 95144d5903
21 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/3d/vertex_program_parse.h
View file

@ -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);

2
code/nel/src/3d/particle_system_shape.cpp
View file

@ -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();

4
code/nel/src/3d/tessellation.cpp
View file

@ -1774,7 +1774,7 @@ void CTessFace::refineAll()
/*
if(ps<RefineThreshold), the face must be merged (ie have no leaves).
if(ps E [RefineThreshold, RefineTreshold*2]), the face must be splitted (ave leaves), and is geomorphed.
if(ps E [RefineThreshold, RefineThreshold*2]), the face must be splitted (ave leaves), and is geomorphed.
if(ps>RefineThreshold*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(errorMetric<RefineThreshold), the face must be merged (ie have no leaves).
if(errorMetric E [RefineThreshold, RefineTreshold*2]), the face must be splitted (ave leaves), and is geomorphed.
if(errorMetric E [RefineThreshold, RefineThreshold*2]), the face must be splitted (ave leaves), and is geomorphed.
if(errorMetric>RefineThreshold*2), the face is fully splitted/geomoprhed.
*/

8
code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/particle_system/located_bindable_page.cpp
View file

@ -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);
}

2
code/nel/tools/3d/plugin_max/nel_export/nel_export.rc
View file

@ -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

6
code/nelns/admin_executor_service/admin_executor_service.cpp
View file

@ -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());

6
code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
View file

@ -90,9 +90,9 @@
inherit_gc_alpha="#inherit_gc_alpha" />
</group>
</template>
<!-- ************************************ -->
<!-- * TEMPLATE FOR SCENE INFORMATIONS * -->
<!-- ************************************ -->
<!-- *********************************** -->
<!-- * TEMPLATE FOR SCENE INFORMATION * -->
<!-- *********************************** -->
<!-- * In scene user info with guild logo * -->
<define id="in_scene_user_info_bar_h"
value="4" />

4
code/ryzom/client/src/character_cl.cpp
View file

@ -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();

8
code/ryzom/client/src/client_sheets/item_sheet.cpp
View file

@ -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);

2
code/ryzom/client/src/client_sheets/item_sheet.h
View file

@ -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;

16
code/ryzom/server/src/entities_game_service/client_messages.cpp
View file

@ -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 );
}
}

2
code/ryzom/server/src/entities_game_service/entities_game_service.cpp
View file

@ -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;

4
code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.cpp
View file

@ -1344,7 +1344,7 @@ sint32 CFameManager::getMaxFameByFactionIndex(std::pair<PVP_CLAN::TPVPClan, PVP_
else
{
// get correct index in tribe list
initTribeTresholdIndex();
initTribeThresholdIndex();
uint32 ttIndex= ~0;
if(factionIndex<_FactionIndexToTribeThresholdIndex.size())
ttIndex= _FactionIndexToTribeThresholdIndex[factionIndex];
@ -1395,7 +1395,7 @@ sint32 CFameManager::getMaxFameByFactionIndex(std::pair<PVP_CLAN::TPVPClan, PVP_
}
}
void CFameManager::doInitTribeTresholdIndex()
void CFameManager::doInitTribeThresholdIndex()
{
CStaticFames &sf= CStaticFames::getInstance();
_FactionIndexToTribeThresholdIndex.clear();

6
code/ryzom/server/src/entities_game_service/guild_manager/fame_manager.h
View file

@ -257,12 +257,12 @@ private:
/// For Tribes Threshold. FactionIndex to TribeIndex
std::vector<uint32> _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.

12
code/ryzom/server/src/entities_game_service/player_manager/character.cpp
View file

@ -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);
}
}
}

2
code/ryzom/server/src/entities_game_service/player_manager/character.h
View file

@ -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

2
code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h
View file

@ -168,7 +168,7 @@ inline uint16 CCharacter::harvestedMpQuantity() const
inline HARVEST_INFOS::CHarvestInfos& CCharacter::getHarvestInfos()
{
return _DepositHarvestInformations;
return _DepositHarvestInformation;
}
//------------------------------------------------------------------------------

4
code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
View file

@ -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;

2
code/ryzom/server/src/input_output_service/CMakeLists.txt
View file

@ -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})

2
code/ryzom/tools/leveldesign/georges_dll/georges_implementation.cpp
View file

@ -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

4
code/ryzom/tools/translation_tools/main.cpp
View file

@ -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);