From 0c09ac6030f6e33026534cd29eccd9cee35b5884 Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Sun, 5 Jun 2022 13:09:13 +0200 Subject: [PATCH] Fix type range comparison --- interface/src/avatar/MyAvatar.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 08ed879fff..c40545d014 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -5738,7 +5738,8 @@ void MyAvatar::FollowHelper::deactivate() { } void MyAvatar::FollowHelper::deactivate(CharacterController::FollowType type) { - assert(static_cast(type) >= 0 && type < CharacterController::FollowType::Count); + int int_type = static_cast(type); + assert(int_type >= 0 && int_type < static_cast(CharacterController::FollowType::Count)); _timeRemaining[(int)type] = 0.0f; } @@ -5746,14 +5747,16 @@ void MyAvatar::FollowHelper::deactivate(CharacterController::FollowType type) { // eg. activate(FollowType::Rotation, true) snaps the FollowHelper's rotation immediately // to the rotation of its _followDesiredBodyTransform. void MyAvatar::FollowHelper::activate(CharacterController::FollowType type, const bool snapFollow) { - assert(static_cast(type) >= 0 && type < CharacterController::FollowType::Count); + int int_type = static_cast(type); + assert(int_type >= 0 && int_type < static_cast(CharacterController::FollowType::Count)); // TODO: Perhaps, the follow time should be proportional to the displacement. _timeRemaining[(int)type] = snapFollow ? CharacterController::FOLLOW_TIME_IMMEDIATE_SNAP : FOLLOW_TIME; } bool MyAvatar::FollowHelper::isActive(CharacterController::FollowType type) const { - assert(static_cast(type) >= 0 && type < CharacterController::FollowType::Count); + int int_type = static_cast(type); + assert(int_type >= 0 && int_type < static_cast(CharacterController::FollowType::Count)); return _timeRemaining[(int)type] > 0.0f; }