From 030bdfd729ef4878a4d85b48436fa332a5029db5 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 9 Mar 2011 13:28:01 +0100 Subject: [PATCH] Changed: #878 Fix typos in comments/code --- code/ryzom/client/src/animation_misc.cpp | 4 ++-- code/ryzom/client/src/character_cl.cpp | 13 +++++++------ code/ryzom/client/src/light_cycle_manager.h | 2 +- code/ryzom/client/src/timed_fx_manager.h | 2 +- code/ryzom/client/src/weather_manager_client.cpp | 4 ++-- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/code/ryzom/client/src/animation_misc.cpp b/code/ryzom/client/src/animation_misc.cpp index 96c35d982..f66f48f38 100644 --- a/code/ryzom/client/src/animation_misc.cpp +++ b/code/ryzom/client/src/animation_misc.cpp @@ -150,7 +150,7 @@ double CAnimationMisc::getAnimationLength(UAnimationSet *animationSet, const std length = getAnimationLength(animationSet, idAnim); } - // Return the lenght of the animation or 0 is any pb. + // Return the length of the animation or 0 is any pb. return length; }// getAnimationLength // @@ -179,7 +179,7 @@ double CAnimationMisc::getAnimationLength(UAnimationSet *animationSet, uint idAn } } - // Return the lenght of the animation or 0 is any pb. + // Return the length of the animation or 0 is any pb. return length; }// getAnimationLength // diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp index 734d9778e..9a651e331 100644 --- a/code/ryzom/client/src/character_cl.cpp +++ b/code/ryzom/client/src/character_cl.cpp @@ -1031,6 +1031,7 @@ bool CCharacterCL::isUnknownRace() const //----------------------------------------------- // getAttackHeight : // Return the atk height. +// \todo GUIGUI : height relative to attacker instead of global height //----------------------------------------------- CCharacterCL::TAtkHeight CCharacterCL::getAttackHeight(CEntityCL *target, BODY::TBodyPart localisation, BODY::TSide side) const { @@ -6420,23 +6421,23 @@ void CCharacterCL::updatePosCombatFloat(double /* frameTimeRemaining */, CEntity { dist2Dest(vectToDest.norm()); // Compute the time to reach the destination at the max speed. - double lenghtOfTimeToDest = 0.0; // 0 = No Speed Limit + double lengthOfTimeToDest = 0.0; // 0 = No Speed Limit _FirstPos = _DestPos; - _DestTime = _LastFrameTime + lenghtOfTimeToDest + ClientCfg.ChaseReactionTime; + _DestTime = _LastFrameTime + lengthOfTimeToDest + ClientCfg.ChaseReactionTime; _FirstTime = _DestTime; /* // The time remaining will be enough to reach the destination - if(frameTimeRemaining >= lenghtOfTimeToDest) + if(frameTimeRemaining >= lengthOfTimeToDest) { _FirstPos = _DestPos; - _DestTime = _LastFrameTime + lenghtOfTimeToDest + ClientCfg.ChaseReactionTime; + _DestTime = _LastFrameTime + lengthOfTimeToDest + ClientCfg.ChaseReactionTime; _FirstTime = _DestTime; } // The time remaining is not enough to reach the destination at max speed -> compute a first pos possible to reach. else { - _FirstPos = pos() + vectToDest*frameTimeRemaining/lenghtOfTimeToDest; - _DestTime = _LastFrameTime + lenghtOfTimeToDest + ClientCfg.ChaseReactionTime; + _FirstPos = pos() + vectToDest*frameTimeRemaining/lengthOfTimeToDest; + _DestTime = _LastFrameTime + lengthOfTimeToDest + ClientCfg.ChaseReactionTime; _FirstTime = _LastFrameTime + frameTimeRemaining + ClientCfg.ChaseReactionTime; } */ diff --git a/code/ryzom/client/src/light_cycle_manager.h b/code/ryzom/client/src/light_cycle_manager.h index f46c589f6..18942763f 100644 --- a/code/ryzom/client/src/light_cycle_manager.h +++ b/code/ryzom/client/src/light_cycle_manager.h @@ -45,7 +45,7 @@ namespace NL3D /// Description of the hours for days / night struct CLightCycleDesc { - float RealDayLength; // real lenght of the day, in seconds + float RealDayLength; // real length of the day, in seconds float NumHours; // number of ryzom hours in a day float NightTransitionStartHour; // start of night transition float NightTransitionEndHour; // end of night transition diff --git a/code/ryzom/client/src/timed_fx_manager.h b/code/ryzom/client/src/timed_fx_manager.h index cd32806d4..283745085 100644 --- a/code/ryzom/client/src/timed_fx_manager.h +++ b/code/ryzom/client/src/timed_fx_manager.h @@ -247,7 +247,7 @@ private: // NB : this vector nevers grows bool _CandidateFXListTouched; // the list of candidate has been modified, so the manager should see which fxs should be instanciated, and which fxs should be removed - float _SortDistance; // lenght of each distance interval, in meters + float _SortDistance; // length of each distance interval, in meters uint _MaxNumberOfFXInstances; // max number of instances that can be 'alive' at a time //@} diff --git a/code/ryzom/client/src/weather_manager_client.cpp b/code/ryzom/client/src/weather_manager_client.cpp index fc32dae1c..818280231 100644 --- a/code/ryzom/client/src/weather_manager_client.cpp +++ b/code/ryzom/client/src/weather_manager_client.cpp @@ -653,14 +653,14 @@ void CWeatherManagerClient::updateThunder(uint64 day, float hour, const CWeather { // if too much time has ellapsed since the last thunder strike, disable it float timeEllapsedSinceStrike = diff(_ThunderStrikeDate, t1) * wc.WFP->MinThunderPeriod ; - if (timeEllapsedSinceStrike >= wc.WFP->ThunderLenght) + if (timeEllapsedSinceStrike >= wc.WFP->ThunderLength) { _ThunderStrike = false; _ThunderLevel = 0.f; } else { - _ThunderLevel = wc.WFP->ThunderLenght != 0.f ? 1.f - (timeEllapsedSinceStrike / wc.WFP->ThunderLenght) + _ThunderLevel = wc.WFP->ThunderLength != 0.f ? 1.f - (timeEllapsedSinceStrike / wc.WFP->ThunderLength) : 0.f; } }