From ae33eb99bfc7ac99354b1e31a06d51cda4dc3036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nuno=20Gon=C3=A7alves=20=28Ulukyn=29?= Date: Fri, 4 Feb 2022 01:14:31 +0000 Subject: [PATCH] Resolve "Message bubble is very high on FH alarm plants" --- ryzom/client/src/character_cl.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ryzom/client/src/character_cl.cpp b/ryzom/client/src/character_cl.cpp index c157c0f85..26ab974e7 100644 --- a/ryzom/client/src/character_cl.cpp +++ b/ryzom/client/src/character_cl.cpp @@ -6274,6 +6274,11 @@ void CCharacterCL::updateVisiblePostPos(const NLMISC::TTime ¤tTimeInMs, CE pos = (box().getMin() + box().getMax())/2; pos.z = box().getMax().z; } + + CRaceStatsSheet *sheet = const_cast(UserEntity->playerSheet()); + float namePosZ = sheet->GenderInfos[UserEntity->getGender()].NamePosZNormal; + if (pos.z > box().getMin().z + namePosZ) + pos.z = box().getMin().z + namePosZ; nlassert(isValidDouble(pos.x) && isValidDouble(pos.y) && isValidDouble(pos.z)); _CurrentBubble->Position = pos; } @@ -6679,7 +6684,7 @@ ADD_METHOD(void CCharacterCL::updatePos(const TTime ¤tTimeInMs, CEntityCL updatePosCombatFloat(frameTimeRemaining, target); } // Compute the average speed to the destination. - // double spd = + // double spd = computeSpeed(); @@ -8233,14 +8238,14 @@ float CCharacterCL::getSheetScale() const // virtual // getColRadius : // Return the entity collision radius. (return 0.5 if there is any problem). //--------------------------------------------------- -float CCharacterCL::getSheetColRadius() const +float CCharacterCL::getSheetColRadius() const { - if(!_Sheet) + if(!_Sheet) return 0.5f; else return _Sheet->ColRadius; } - + //--------------------------------------------------- // getScale : @@ -8359,7 +8364,7 @@ std::string CCharacterCL::shapeFromItem(const CItemSheet &itemSheet) const sheet = itemSheet.getShape(); return sheet; - + }// shapeFromItem // @@ -9147,7 +9152,7 @@ void CCharacterCL::setAuraFX(uint index, const CAnimationFX *sheet) bi.DelayBeforeStart = 11.5f; _AttachedFXListToStart.push_front(bi); } - else + else { CAttachedFX::TSmartPtr fx = new CAttachedFX; fx->create(*this, bi, CAttachedFX::CTargeterInfo());