From dec67309f3d3b61eb132c1182ece92029b3cd973 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 9 Mar 2011 14:30:51 +0100 Subject: [PATCH] Changed: #878 Fix typos in comments/code --- code/nel/include/nel/3d/ps_ribbon_base.h | 2 +- code/nel/include/nel/3d/u_instance.h | 2 +- code/nel/include/nel/sound/complex_sound.h | 4 ++-- code/nel/include/nel/sound/complex_source.h | 4 ++-- code/nel/include/nel/sound/context_sound.h | 2 +- code/nel/src/3d/mesh_base_instance.cpp | 6 +++--- code/nel/src/3d/mesh_mrm_skin.cpp | 2 +- code/nel/src/3d/track_sampled_quat.cpp | 2 +- code/nel/src/misc/hierarchical_timer.cpp | 6 +++--- code/nel/src/sound/complex_sound.cpp | 16 ++++++++-------- code/nel/src/sound/complex_source.cpp | 8 ++++---- code/nel/src/sound/simple_source.cpp | 2 +- code/nel/tools/3d/tile_edit/thread_win32.h | 2 -- .../tools/misc/log_analyser/log_analyserDlg.cpp | 2 +- code/ryzom/client/src/misc.cpp | 5 +---- .../src/game_share/ring_session_manager_itf.h | 15 +++++++++++++++ .../guild_manager/guild_leader_module.cpp | 4 ++++ .../guild_manager/guild_manager.cpp | 1 + 18 files changed, 50 insertions(+), 35 deletions(-) diff --git a/code/nel/include/nel/3d/ps_ribbon_base.h b/code/nel/include/nel/3d/ps_ribbon_base.h index 2145c4ed4..10c86ab61 100644 --- a/code/nel/include/nel/3d/ps_ribbon_base.h +++ b/code/nel/include/nel/3d/ps_ribbon_base.h @@ -183,7 +183,7 @@ private: ); /** Compute the ribbon points using hermitte splines between each sampling point, - * and make a rough approximation to get a constant lenght + * and make a rough approximation to get a constant length */ void computeHermitteCstSizeRibbon( uint index, NLMISC::CVector *dest, diff --git a/code/nel/include/nel/3d/u_instance.h b/code/nel/include/nel/3d/u_instance.h index a29c085f4..c5d9ef4dc 100644 --- a/code/nel/include/nel/3d/u_instance.h +++ b/code/nel/include/nel/3d/u_instance.h @@ -49,7 +49,7 @@ public: /** * Set the blend shape factor for this instance - * blenShapeName is the name of the blendshape we want to set + * blendShapeName is the name of the blendshape we want to set * factor the blendshape percentage from -100.0 to 100.0 * dynamic tells the optimizer if the blendshape have to change in real time */ diff --git a/code/nel/include/nel/sound/complex_sound.h b/code/nel/include/nel/sound/complex_sound.h index f1dcdbeea..6b15b7200 100644 --- a/code/nel/include/nel/sound/complex_sound.h +++ b/code/nel/include/nel/sound/complex_sound.h @@ -55,7 +55,7 @@ public: NLMISC::TStringId getSound(uint index) const { return !_Sounds.empty() ? _Sounds[index%_Sounds.size()]:0;} const std::vector &getSounds() const { return _Sounds;} - uint32 getFadeLenght() const { return _XFadeLenght;} + uint32 getFadeLength() const { return _XFadeLength;} /** Constructor */ CComplexSound(); @@ -94,7 +94,7 @@ private: std::vector _DelaySeq; /// Duration of xfade in millisec. - uint32 _XFadeLenght; + uint32 _XFadeLength; /// Flag for fade in bool _DoFadeIn; /// Flag for fade out (only on normal termination, not explicit stop). diff --git a/code/nel/include/nel/sound/complex_source.h b/code/nel/include/nel/sound/complex_source.h index 08346b683..d27b5af5b 100644 --- a/code/nel/include/nel/sound/complex_source.h +++ b/code/nel/include/nel/sound/complex_source.h @@ -129,8 +129,8 @@ private: */ bool _Muted; -// NLMISC::TTime _Lenght1; -// NLMISC::TTime _Lenght2; +// NLMISC::TTime _Length1; +// NLMISC::TTime _Length2; NLMISC::TTime _StartTime1; NLMISC::TTime _StartTime2; diff --git a/code/nel/include/nel/sound/context_sound.h b/code/nel/include/nel/sound/context_sound.h index 6e39bb621..09932ca66 100644 --- a/code/nel/include/nel/sound/context_sound.h +++ b/code/nel/include/nel/sound/context_sound.h @@ -298,7 +298,7 @@ private: /// The base name, that is the constante part of the name (before the first joker). std::string _BaseName; - /// The random lenght (0 mean no random) + /// The random length (0 mean no random) uint32 _Random; diff --git a/code/nel/src/3d/mesh_base_instance.cpp b/code/nel/src/3d/mesh_base_instance.cpp index 96f2ee1a8..30a22f9fd 100644 --- a/code/nel/src/3d/mesh_base_instance.cpp +++ b/code/nel/src/3d/mesh_base_instance.cpp @@ -180,11 +180,11 @@ void CMeshBaseInstance::traverseHrc() if (anim) { // Animation offset are setuped before clipping, they will be used for detail too. - float animLenght = anim->getEndTime() - anim->getBeginTime(); - if (animLenght > 0) + float animLength = anim->getEndTime() - anim->getBeginTime(); + if (animLength > 0) { float currTime = (TAnimationTime) getOwnerScene()->getCurrentTime(); - float startTime = (uint) (currTime / animLenght) * animLenght; + float startTime = (uint) (currTime / animLength) * animLength; // Set the channel mixer date using the global date of the scene chanMix->setSlotTime(0, anim->getBeginTime() + currTime - startTime); } diff --git a/code/nel/src/3d/mesh_mrm_skin.cpp b/code/nel/src/3d/mesh_mrm_skin.cpp index 42a7c00a9..5f1ca014e 100644 --- a/code/nel/src/3d/mesh_mrm_skin.cpp +++ b/code/nel/src/3d/mesh_mrm_skin.cpp @@ -316,7 +316,7 @@ uint CMeshMRMGeom::NumCacheVertexNormal4= NL_BlockByteL1 / sizeof(CRawVertexNorm /* Old School template: include the same file with define switching, Was used before to reuse same code for and without SSE. - useless now because SSE removed, but keep it for possible future work on it. + Useless now because SSE removed, but keep it for possible future work on it. */ #define ADD_MESH_MRM_SKIN_TEMPLATE #include "mesh_mrm_skin_template.cpp" diff --git a/code/nel/src/3d/track_sampled_quat.cpp b/code/nel/src/3d/track_sampled_quat.cpp index e71fabe7b..67d59c408 100644 --- a/code/nel/src/3d/track_sampled_quat.cpp +++ b/code/nel/src/3d/track_sampled_quat.cpp @@ -51,7 +51,7 @@ void CQuatPack::pack(const CQuat &quat) - The same than above, but encode the axis as X/Y only, and deduce Z from them, is possible but precision problems arise. - You can see that the operation "deduce a 3/4 member from unit lenght rule" is definetly not precise. + You can see that the operation "deduce a 3/4 member from unit length rule" is definetly not precise. Hence this simpler but workable way. */ diff --git a/code/nel/src/misc/hierarchical_timer.cpp b/code/nel/src/misc/hierarchical_timer.cpp index 44a824721..ea5ceb80a 100644 --- a/code/nel/src/misc/hierarchical_timer.cpp +++ b/code/nel/src/misc/hierarchical_timer.cpp @@ -337,15 +337,15 @@ void CHTimer::display(CLog *log, TSortCriterion criterion, bool displayInline /* rootStats.buildFromNode( &_RootNode, _MsPerTick); // 5 ) display statistics - uint maxNodeLenght = 0; + uint maxNodeLength = 0; std::string format; if (displayInline) { for(TTimerStatPtrVect::iterator statIt = statsPtr.begin(); statIt != statsPtr.end(); ++statIt) { - maxNodeLenght = std::max(maxNodeLenght, (uint)strlen((*statIt)->Timer->_Name)); + maxNodeLength = std::max(maxNodeLength, (uint)strlen((*statIt)->Timer->_Name)); } - format = "HTIMER: %-" + NLMISC::toString(maxNodeLenght + 1) + "s %s"; + format = "HTIMER: %-" + NLMISC::toString(maxNodeLength + 1) + "s %s"; } std::string statsInline; diff --git a/code/nel/src/sound/complex_sound.cpp b/code/nel/src/sound/complex_sound.cpp index 04991aa4a..fbecbbcf2 100644 --- a/code/nel/src/sound/complex_sound.cpp +++ b/code/nel/src/sound/complex_sound.cpp @@ -108,13 +108,13 @@ uint32 CComplexSound::getDuration() if (first != _SoundSeq.begin() && !durations.empty()) { // remove a xfade value - _Duration -= minof(uint32(_XFadeLenght / _TicksPerSeconds), durations[*first % durations.size()] / 2, durations[*prev % durations.size()] /2); + _Duration -= minof(uint32(_XFadeLength / _TicksPerSeconds), durations[*first % durations.size()] / 2, durations[*prev % durations.size()] /2); } if (!durations.empty()) _Duration += durations[*first % durations.size()]; prev = first; } -// _Duration -= max(sint(0), sint(_XFadeLenght * (_SoundSeq.size()-2) )); +// _Duration -= max(sint(0), sint(_XFadeLength * (_SoundSeq.size()-2) )); } break; case MODE_SPARSE: @@ -140,7 +140,7 @@ uint32 CComplexSound::getDuration() ++first; for (; first != last; ++first) { - // add the sound lenght + // add the sound length _Duration += durations[soundIndex++ % durations.size()]; // add the delay _Duration += uint32(*first / _TicksPerSeconds); @@ -170,7 +170,7 @@ uint32 CComplexSound::getDuration() CComplexSound::CComplexSound() : _PatternMode(CComplexSound::MODE_UNDEFINED), _TicksPerSeconds(1.0f), - _XFadeLenght(3000), // default to 3000 sec. + _XFadeLength(3000), // default to 3000 sec. _MaxDistValid(false), _Duration(0), _DurationValid(false) @@ -252,7 +252,7 @@ void CComplexSound::serial(NLMISC::IStream &s) s.serial(_TicksPerSeconds); s.serialCont(_SoundSeq); s.serialCont(_DelaySeq); - s.serial(_XFadeLenght); + s.serial(_XFadeLength); s.serial(_DoFadeIn); s.serial(_DoFadeOut); @@ -313,14 +313,14 @@ void CComplexSound::importForm(const std::string& filename, NLGEORGES::UFormElm& if (mode == "Chained" || mode == "Sparse") { - // XFade lenght - formRoot.getValueByName(_XFadeLenght, ".SoundType.XFadeLenght"); + // XFade length + formRoot.getValueByName(_XFadeLength, ".SoundType.XFadeLength"); // Fade in/out flag. formRoot.getValueByName(_DoFadeIn, ".SoundType.DoFadeIn"); formRoot.getValueByName(_DoFadeOut, ".SoundType.DoFadeOut"); // convert xfade to millisec. - _XFadeLenght *= 1000; + _XFadeLength *= 1000; _PatternMode = MODE_CHAINED; // just read the sequence _SoundSeq.clear(); diff --git a/code/nel/src/sound/complex_source.cpp b/code/nel/src/sound/complex_source.cpp index 5d9416b82..cd3d2925d 100644 --- a/code/nel/src/sound/complex_source.cpp +++ b/code/nel/src/sound/complex_source.cpp @@ -113,7 +113,7 @@ void CComplexSource::playStuf() return; if (_PatternSound->doFadeIn()) - _FadeLength = min(uint32(_PatternSound->getFadeLenght()/_TickPerSecond), sound->getDuration() /2); + _FadeLength = min(uint32(_PatternSound->getFadeLength()/_TickPerSecond), sound->getDuration() /2); else _FadeLength = 0; @@ -510,8 +510,8 @@ void CComplexSource::onUpdate() //nldebug("CS : Chaining to sound %s", CStringMapper::unmap(sound2->getName()).c_str()); CAudioMixerUser *mixer = CAudioMixerUser::instance(); - // determine the XFade lenght (if next sound is too short. - _FadeLength = minof(uint32(_PatternSound->getFadeLenght()/_TickPerSecond), (sound2->getDuration()) / 2, (_Source1->getSound()->getDuration())/2); + // determine the XFade length (if next sound is too short. + _FadeLength = minof(uint32(_PatternSound->getFadeLength()/_TickPerSecond), (sound2->getDuration()) / 2, (_Source1->getSound()->getDuration())/2); _Source2 = mixer->createSource(sound2, false, 0, 0, _Cluster); if (_Source2) { @@ -528,7 +528,7 @@ void CComplexSource::onUpdate() if (_PatternSound->doFadeOut()) { // set the event to begin fade out. - mixer->addEvent(this, _StartTime1 + _Source1->getSound()->getDuration() - _PatternSound->getFadeLenght()); + mixer->addEvent(this, _StartTime1 + _Source1->getSound()->getDuration() - _PatternSound->getFadeLength()); } else { diff --git a/code/nel/src/sound/simple_source.cpp b/code/nel/src/sound/simple_source.cpp index a25068400..fb0b7bc85 100644 --- a/code/nel/src/sound/simple_source.cpp +++ b/code/nel/src/sound/simple_source.cpp @@ -132,7 +132,7 @@ void CSimpleSource::play() //|| (mixer->getListenPosVector() - _Position).sqrnorm() > _SimpleSound->getMaxDistance() * _SimpleSound->getMaxDistance()) || (_RelativeMode ? getPos().sqrnorm() : (mixer->getListenPosVector() - getPos()).sqrnorm()) > _SimpleSound->getMaxDistance() * _SimpleSound->getMaxDistance()) { - // The sample buffer is not available, don't play (we don't know the lenght) + // The sample buffer is not available, don't play (we don't know the length) if (_Spawn) { if (_SpawnEndCb != 0) diff --git a/code/nel/tools/3d/tile_edit/thread_win32.h b/code/nel/tools/3d/tile_edit/thread_win32.h index 66ad23e75..6506f6973 100644 --- a/code/nel/tools/3d/tile_edit/thread_win32.h +++ b/code/nel/tools/3d/tile_edit/thread_win32.h @@ -15,8 +15,6 @@ // along with this program. If not, see . /* - $Id: thread_win32.h,v 1.1 2000/10/19 07:53:33 corvazier Exp $ - ------------------------------------------------------------------------ ClanLib, the platform independent game SDK. diff --git a/code/nel/tools/misc/log_analyser/log_analyserDlg.cpp b/code/nel/tools/misc/log_analyser/log_analyserDlg.cpp index f90881f99..8103090c8 100644 --- a/code/nel/tools/misc/log_analyser/log_analyserDlg.cpp +++ b/code/nel/tools/misc/log_analyser/log_analyserDlg.cpp @@ -59,7 +59,7 @@ afx_msg void CLAEdit::OnKeyDown( UINT nChar, UINT nRepCnt, UINT nFlags ) int start, end; GetSel( start, end ); str = str.Mid( start, end-start ); - int lineNum = atoi(str); + int lineNum = atoi( str ); if ( ! ((lineNum != 0) || (str == "0")) ) break; diff --git a/code/ryzom/client/src/misc.cpp b/code/ryzom/client/src/misc.cpp index 7d0db393f..ec8b46af7 100644 --- a/code/ryzom/client/src/misc.cpp +++ b/code/ryzom/client/src/misc.cpp @@ -1148,7 +1148,7 @@ void computeCurrentFovAspectRatio(float &fov, float &ar) // get the screen aspect ratio from CFG ar = ClientCfg.ScreenAspectRatio; - //nlinfo("AR: clientcfg ar %f", ar); + // if Driver is not created, we can't get current screen mode if (!Driver) return; @@ -1167,21 +1167,18 @@ void computeCurrentFovAspectRatio(float &fov, float &ar) { // auto mode, we are using window aspect ratio ar = arWnd; - //nlinfo("AR: windowed auto => use window size %d %d => %f", wndW, wndH, arWnd); } else if (mode.Width && mode.Height) { // compute screen aspect ratio float arScreen= float(mode.Width) / float(mode.Height); ar *= arWnd / arScreen; - //nlinfo("AR: windowed not auto => monitor size %d %d window size %d %d => arsc %f arwnd %f, ar finale %f", mode.Width, mode.Height, wndW, wndH, arScreen, arWnd, ar); } } } // if fullscreen, must modulate aspect ratio by ScreenResolution else { - //nlinfo("AR: fullscreen ratio"); if (ar == 0.f) { UDriver::CMode mode; 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 d874d3fe3..8a52ce3cf 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 @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . ///////////////////////////////////////////////////////////////// // WARNING : this is a generated file, don't change it ! diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/guild_leader_module.cpp b/code/ryzom/server/src/entities_game_service/guild_manager/guild_leader_module.cpp index 3703a8302..3c3e6bed3 100644 --- a/code/ryzom/server/src/entities_game_service/guild_manager/guild_leader_module.cpp +++ b/code/ryzom/server/src/entities_game_service/guild_manager/guild_leader_module.cpp @@ -16,6 +16,8 @@ #include "stdpch.h" #include "player_manager/character.h" +#include "player_manager/player_manager.h" +#include "player_manager/player.h" #include "guild_leader_module.h" #include "guild_member.h" #include "guild.h" @@ -48,6 +50,7 @@ void CGuildLeaderModule::setLeader( uint16 index,uint8 session) nlwarning("%s set invalid member idx %u as leader",proxy.getId().toString().c_str(),index ); return; } + _GuildMemberCore->setMemberGrade(memberPD->getGrade()); memberPD->setMemberGrade(EGSPD::CGuildGrade::Leader); @@ -99,6 +102,7 @@ void CGuildLeaderModule::quitGuild() // ignore current leader if ( member->getGrade() == EGSPD::CGuildGrade::Leader ) continue; + // check if the current member is the successor if ( successor == NULL || member->getGrade() < successor->getGrade() || diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/guild_manager.cpp b/code/ryzom/server/src/entities_game_service/guild_manager/guild_manager.cpp index b62d6a8b4..6ee4ea4cd 100644 --- a/code/ryzom/server/src/entities_game_service/guild_manager/guild_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/guild_manager/guild_manager.cpp @@ -705,6 +705,7 @@ void CGuildManager::createGuild(CGuildCharProxy & proxy,const ucstring & guildNa nlwarning("%s bot %s is not a guild creator",proxy.getId().toString().c_str(),bot->getId().toString().c_str()); return; } + // player must not have a guild CGuildMemberModule * module = NULL; if ( proxy.getModule( module ) )