From c2ac52c82a513ecee95fe8a41e46a4acc4bb5b45 Mon Sep 17 00:00:00 2001 From: Alexei Kotov Date: Tue, 14 Jun 2022 02:43:48 +0300 Subject: [PATCH] Remove dead code --- apps/openmw/mwmechanics/character.cpp | 11 +---------- apps/openmw/mwmechanics/character.hpp | 2 -- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp index 651ef6c5e5..ad6f324d77 100644 --- a/apps/openmw/mwmechanics/character.cpp +++ b/apps/openmw/mwmechanics/character.cpp @@ -131,8 +131,6 @@ std::string movementStateToAnimGroup(MWMechanics::CharacterState state) case CharState_SneakLeft: return "sneakleft"; case CharState_SneakRight: return "sneakright"; - case CharState_Jump: return "jump"; - case CharState_TurnLeft: return "turnleft"; case CharState_TurnRight: return "turnright"; case CharState_SwimTurnLeft: return "swimturnleft"; @@ -1944,8 +1942,6 @@ void CharacterController::update(float duration) CharacterState idlestate = CharState_None; JumpingState jumpstate = JumpState_None; - bool forcestateupdate = false; - mHasMovedInXY = std::abs(vec.x())+std::abs(vec.y()) > 0.0f; isrunning = isrunning && mHasMovedInXY; @@ -2021,8 +2017,6 @@ void CharacterController::update(float duration) if(!onground && !flying && !inwater && solid) { // In the air (either getting up —ascending part of jump— or falling). - - forcestateupdate = (mJumpState != JumpState_InAir); jumpstate = JumpState_InAir; static const float fJumpMoveBase = gmst.find("fJumpMoveBase")->mValue.getFloat(); @@ -2050,7 +2044,6 @@ void CharacterController::update(float duration) } else if(mJumpState == JumpState_InAir && !inwater && !flying && solid) { - forcestateupdate = true; jumpstate = JumpState_Landing; vec.z() = 0.0f; @@ -2223,9 +2216,7 @@ void CharacterController::update(float duration) if (!mSkipAnim) { - forcestateupdate = updateState(idlestate) || forcestateupdate; - - refreshCurrentAnims(idlestate, movestate, jumpstate, forcestateupdate); + refreshCurrentAnims(idlestate, movestate, jumpstate, updateState(idlestate)); updateIdleStormState(inwater); } diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp index c1c7fd9cf5..003f64953d 100644 --- a/apps/openmw/mwmechanics/character.hpp +++ b/apps/openmw/mwmechanics/character.hpp @@ -91,8 +91,6 @@ enum CharacterState { CharState_SwimTurnLeft, CharState_SwimTurnRight, - CharState_Jump, - CharState_Death1, CharState_Death2, CharState_Death3,