|
|
The start shouldering animation immobilizes the player. No shouldering animation is shown during noclip, so I assumed the immobilization is never cleared.
The attached patch makes it so the player is not immobilized while shouldering and using noclip.
fix-noclip-on-shoulder-v1-r10063.diff (757 bytes)
diff --git game/physics/Physics_Player.cpp game/physics/Physics_Player.cpp
index 586d2ff..826a7c4 100644
--- game/physics/Physics_Player.cpp
+++ game/physics/Physics_Player.cpp
@@ -6072,7 +6072,10 @@ void idPhysics_Player::StartShouldering(idEntity const * const pBody)
| EIM_MANTLE | EIM_FROB_COMPLEX | EIM_MOVEMENT | EIM_CROUCH_HOLD
| EIM_CROUCH | EIM_JUMP | EIM_FROB | EIM_FROB_HILIGHT | EIM_LEAN;
- pPlayer->SetImmobilization("ShoulderingAnimation", iImmobilization);
+ if (!pPlayer->noclip)
+ {
+ pPlayer->SetImmobilization("ShoulderingAnimation", iImmobilization);
+ }
// Check height of body: If heigher than crouched, do not go to crouched state
const float fBodyHeight = pBody->GetPhysics()->GetOrigin() * (-gravityNormal);
|
|
|
|
I worked on this a bit more. The reason the immobilization is not cleared is that ShoulderingMove() is never called while using noclip.
I've attached version 2 of the patch, which is cleaner in my opinion, because it doesn't change the Physics_Player.cpp file and overall state changes less during runtime.
fix-noclip-on-shoulder-v2-r10063.diff (426 bytes)
diff --git game/Player.cpp game/Player.cpp
index 28decdb..fd463d0 100644
--- game/Player.cpp
+++ game/Player.cpp
@@ -4483,7 +4483,8 @@ void idPlayer::OnStartShoulderingBody(idEntity* body)
m_bShoulderingBody = true;
// STiFU #3607: Trigger shouldering viewport animation
- physicsObj.StartShouldering(body);
+ if (!noclip)
+ physicsObj.StartShouldering(body);
}
void idPlayer::OnStopShoulderingBody(idEntity* body)
|
|
|
|
Thank you! |
|
|
|
Indeed @Daft Mugi, thanks for sorting this. |
|
|
|
Rev 10064
( This is fantastic ! ) |
|
