Add support for Mapbase anim state to HL2MP

Blixibon · Blixibon · commit e9908d28cad6 · 2025-08-27T11:32:49.000-05:00
diff --git a/src/game/client/hl2/c_basehlplayer.cpp b/src/game/client/hl2/c_basehlplayer.cpp
@@ -713,6 +713,30 @@ void C_BaseHLPlayer::BuildTransformations( CStudioHdr *hdr, Vector *pos, Quatern
 
 
 #ifdef SP_ANIM_STATE
+// Set the activity based on an event or current state
+void C_BaseHLPlayer::SetAnimation( PLAYER_ANIM playerAnim )
+{
+#ifdef MAPBASE_MP
+	if (!m_pPlayerAnimState)
+	{
+		BaseClass::SetAnimation( playerAnim );
+		return;
+	}
+
+	m_pPlayerAnimState->SetPlayerAnimation( playerAnim );
+#endif
+}
+
+void C_BaseHLPlayer::AddAnimStateLayer( int iSequence, float flBlendIn, float flBlendOut, float flPlaybackRate, bool bHoldAtEnd, bool bOnlyWhenStill )
+{
+#ifdef MAPBASE_MP
+	if (!m_pPlayerAnimState)
+		return;
+
+	m_pPlayerAnimState->AddMiscSequence( iSequence, flBlendIn, flBlendOut, flPlaybackRate, bHoldAtEnd, bOnlyWhenStill );
+#endif
+}
+
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
@@ -737,7 +761,7 @@ const Vector &C_BaseHLPlayer::GetRenderOrigin()
 const QAngle& C_BaseHLPlayer::GetRenderAngles( void )
 {
 #ifdef MAPBASE_MP
-	if ( m_pPlayerAnimState )
+	if ( m_pPlayerAnimState && !IsRagdoll() )
 	{
 		return m_pPlayerAnimState->GetRenderAngles();
 	}
diff --git a/src/game/client/hl2/c_basehlplayer.h b/src/game/client/hl2/c_basehlplayer.h
@@ -71,6 +71,9 @@ class C_BaseHLPlayer : public C_BasePlayer
 #endif
 
 #ifdef SP_ANIM_STATE
+	void	SetAnimation( PLAYER_ANIM playerAnim );
+	void	AddAnimStateLayer( int iSequence, float flBlendIn, float flBlendOut, float flPlaybackRate, bool bHoldAtEnd, bool bOnlyWhenStill );
+
 	virtual const Vector&	GetRenderOrigin();
 	virtual const QAngle&	GetRenderAngles( void );
 	virtual CStudioHdr		*OnNewModel();
diff --git a/src/game/client/hl2mp/c_hl2mp_player.cpp b/src/game/client/hl2mp/c_hl2mp_player.cpp
@@ -100,7 +100,11 @@ void SpawnBlood (Vector vecSpot, const Vector &vecDir, int bloodColor, float flD
 #endif
 CSuitPowerDevice SuitDeviceBreather( bits_SUIT_DEVICE_BREATHER, 6.7f );		// 100 units in 15 seconds (plus three padded seconds)
 
-C_HL2MP_Player::C_HL2MP_Player() : m_PlayerAnimState( this ), m_iv_angEyeAngles( "C_HL2MP_Player::m_iv_angEyeAngles" )
+C_HL2MP_Player::C_HL2MP_Player() :
+#ifndef SP_ANIM_STATE
+	m_PlayerAnimState( this ),
+#endif
+	m_iv_angEyeAngles( "C_HL2MP_Player::m_iv_angEyeAngles" )
 {
 	m_iIDEntIndex = 0;
 	m_iSpawnInterpCounterCache = 0;
@@ -582,7 +586,9 @@ void C_HL2MP_Player::AddEntity( void )
 
 	SetLocalAngles( vTempAngles );
 		
+#ifndef SP_ANIM_STATE
 	m_PlayerAnimState.Update();
+#endif
 
 	// Zero out model pitch, blending takes care of all of it.
 	SetLocalAnglesDim( X_INDEX, 0 );
@@ -671,6 +677,7 @@ ShadowType_t C_HL2MP_Player::ShadowCastType( void )
 }
 
 
+#ifndef SP_ANIM_STATE
 const QAngle& C_HL2MP_Player::GetRenderAngles()
 {
 	if ( IsRagdoll() )
@@ -682,6 +689,7 @@ const QAngle& C_HL2MP_Player::GetRenderAngles()
 		return m_PlayerAnimState.GetRenderAngles();
 	}
 }
+#endif
 
 bool C_HL2MP_Player::ShouldDraw( void )
 {
diff --git a/src/game/client/hl2mp/c_hl2mp_player.h b/src/game/client/hl2mp/c_hl2mp_player.h
@@ -67,7 +67,9 @@ class C_HL2MP_Player : public C_BaseHLPlayer
 	// Should this object cast shadows?
 	virtual ShadowType_t		ShadowCastType( void );
 	virtual C_BaseAnimating *BecomeRagdollOnClient();
+#ifndef SP_ANIM_STATE
 	virtual const QAngle& GetRenderAngles();
+#endif
 	virtual bool ShouldDraw( void );
 	virtual void OnDataChanged( DataUpdateType_t type );
 	virtual float GetFOV( void );
@@ -118,13 +120,19 @@ class C_HL2MP_Player : public C_BaseHLPlayer
 	void StopWalking( void );
 	bool IsWalking( void ) { return m_fIsWalking; }
 
+#ifdef SP_ANIM_STATE
+	Activity Weapon_TranslateActivity( Activity baseAct, bool *pRequired = NULL );
+#endif
+
 	virtual void PostThink( void );
 
 private:
 	
 	C_HL2MP_Player( const C_HL2MP_Player & );
 
+#ifndef SP_ANIM_STATE
 	CPlayerAnimState m_PlayerAnimState;
+#endif
 
 	QAngle	m_angEyeAngles;
 
diff --git a/src/game/client/movehelper_client.cpp b/src/game/client/movehelper_client.cpp
@@ -310,6 +310,11 @@ bool CMoveHelperClient::PlayerFallingDamage(void)
 void CMoveHelperClient::PlayerSetAnimation( PLAYER_ANIM eAnim )
 {
 	 // Do nothing on the client. Animations are set on the server.
+#ifdef MAPBASE_MP
+	// The Mapbase anim state uses clientside anims as well
+	if ( m_pHost )
+		m_pHost->SetAnimation( eAnim );
+#endif
 }
 
 bool CMoveHelperClient::IsWorldEntity( const CBaseHandle &handle )
diff --git a/src/game/server/hl2/hl2_player.cpp b/src/game/server/hl2/hl2_player.cpp
@@ -1480,6 +1480,7 @@ void CHL2_Player::SpawnedAtPoint( CBaseEntity *pSpawnPoint )
 
 //-----------------------------------------------------------------------------
 
+#ifndef MAPBASE_MP // See hl2mp_player_shared.cpp
 ConVar player_use_anim_enabled( "player_use_anim_enabled", "1" );
 ConVar player_use_anim_heavy_mass( "player_use_anim_heavy_mass", "20.0" );
 
@@ -1529,6 +1530,7 @@ Activity CHL2_Player::Weapon_TranslateActivity( Activity baseAct, bool *pRequire
 
 	return weaponTranslation;
 }
+#endif
 
 #ifdef SP_ANIM_STATE
 // Set the activity based on an event or current state
diff --git a/src/game/server/hl2/hl2_player.h b/src/game/server/hl2/hl2_player.h
@@ -132,7 +132,9 @@ class CHL2_Player : public CBasePlayer
 	// For the logic_playerproxy output
 	void				SpawnedAtPoint( CBaseEntity *pSpawnPoint );
 
+#ifndef MAPBASE_MP
 	Activity			Weapon_TranslateActivity( Activity baseAct, bool *pRequired = NULL );
+#endif
 
 #ifdef SP_ANIM_STATE
 	void				SetAnimation( PLAYER_ANIM playerAnim );
diff --git a/src/game/server/hl2mp/hl2mp_player.cpp b/src/game/server/hl2mp/hl2mp_player.cpp
@@ -143,7 +143,10 @@ const char *g_ppszRandomCombineModels[] =
 
 #pragma warning( disable : 4355 )
 
-CHL2MP_Player::CHL2MP_Player() : m_PlayerAnimState( this )
+CHL2MP_Player::CHL2MP_Player()
+#ifndef SP_ANIM_STATE
+	: m_PlayerAnimState( this )
+#endif
 {
 	m_angEyeAngles.Init();
 
@@ -643,7 +646,9 @@ void CHL2MP_Player::PostThink( void )
 		SetCollisionBounds( VEC_CROUCH_TRACE_MIN, VEC_CROUCH_TRACE_MAX );
 	}
 
+#ifndef SP_ANIM_STATE
 	m_PlayerAnimState.Update();
+#endif
 
 	// Store the eye angles pitch so the client can compute its animation state correctly.
 	m_angEyeAngles = EyeAngles();
@@ -762,6 +767,11 @@ extern ConVar hl2_normspeed;
 // Set the activity based on an event or current state
 void CHL2MP_Player::SetAnimation( PLAYER_ANIM playerAnim )
 {
+#ifdef SP_ANIM_STATE
+	BaseClass::SetAnimation( playerAnim );
+	return;
+#endif
+
 	int animDesired;
 
 	float speed;
@@ -1332,9 +1342,14 @@ void CHL2MP_Player::Event_Killed( const CTakeDamageInfo &info )
 
 	SetNumAnimOverlays( 0 );
 
-	// Note: since we're dead, it won't draw us on the client, but we don't set EF_NODRAW
-	// because we still want to transmit to the clients in our PVS.
-	CreateRagdollEntity();
+#ifdef MAPBASE_MP
+	if ( !m_bForceServerRagdoll )
+#endif
+	{
+		// Note: since we're dead, it won't draw us on the client, but we don't set EF_NODRAW
+		// because we still want to transmit to the clients in our PVS.
+		CreateRagdollEntity();
+	}
 
 	DetonateTripmines();
 
diff --git a/src/game/server/hl2mp/hl2mp_player.h b/src/game/server/hl2mp/hl2mp_player.h
@@ -99,6 +99,10 @@ class CHL2MP_Player : public CHL2_Player
 	void SetPlayerModel( void );
 	void SetPlayerTeamModel( void );
 	Activity TranslateTeamActivity( Activity ActToTranslate );
+
+#ifdef SP_ANIM_STATE
+	Activity Weapon_TranslateActivity( Activity baseAct, bool *pRequired = NULL );
+#endif
 	
 	float GetNextModelChangeTime( void ) { return m_flNextModelChangeTime; }
 	float GetNextTeamChangeTime( void ) { return m_flNextTeamChangeTime; }
@@ -159,7 +163,9 @@ class CHL2MP_Player : public CHL2_Player
 private:
 
 	CNetworkQAngle( m_angEyeAngles );
+#ifndef SP_ANIM_STATE
 	CPlayerAnimState   m_PlayerAnimState;
+#endif
 
 	int m_iLastWeaponFireUsercmd;
 	int m_iModelType;
diff --git a/src/game/shared/hl2mp/hl2mp_player_shared.cpp b/src/game/shared/hl2mp/hl2mp_player_shared.cpp
@@ -14,6 +14,10 @@
 #else
 #include "hl2mp_player.h"
 #endif
+#ifdef MAPBASE
+#include "weapon_physcannon.h"
+#include "hl2mp_gamerules.h"
+#endif
 
 #include "engine/IEngineSound.h"
 #include "SoundEmitterSystem/isoundemittersystembase.h"
@@ -126,7 +130,57 @@ void CHL2MP_Player::PlayStepSound( Vector &vecOrigin, surfacedata_t *psurface, f
 // ANIMATION CODE
 //==========================
 
+#ifdef SP_ANIM_STATE
+ConVar player_use_anim_enabled( "player_use_anim_enabled", "1", FCVAR_REPLICATED );
+
+const float PLAYER_USE_ANIM_HEAVY_MASS = 20.0f;
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
+Activity CHL2MP_Player::Weapon_TranslateActivity( Activity baseAct, bool *pRequired )
+{
+	Activity weaponTranslation = BaseClass::Weapon_TranslateActivity( baseAct, pRequired );
+	
+#if EXPANDED_HL2DM_ACTIVITIES
+	// +USE activities
+	if ( GetUseEntity() && player_use_anim_enabled.GetBool())
+	{
+		CBaseEntity* pHeldEnt = GetPlayerHeldEntity( this );
+		float flMass = pHeldEnt ?
+			(pHeldEnt->VPhysicsGetObject() ? PlayerPickupGetHeldObjectMass( GetUseEntity(), pHeldEnt->VPhysicsGetObject() ) : PLAYER_USE_ANIM_HEAVY_MASS) :
+			(GetUseEntity()->VPhysicsGetObject() ? GetUseEntity()->VPhysicsGetObject()->GetMass() : PLAYER_USE_ANIM_HEAVY_MASS);
+		if ( flMass >= PLAYER_USE_ANIM_HEAVY_MASS)
+		{
+			// Heavy versions
+			switch (baseAct)
+			{
+				case ACT_HL2MP_IDLE:			weaponTranslation = ACT_HL2MP_IDLE_USE_HEAVY; break;
+				case ACT_HL2MP_RUN:				weaponTranslation = ACT_HL2MP_RUN_USE_HEAVY; break;
+				case ACT_HL2MP_WALK:			weaponTranslation = ACT_HL2MP_WALK_USE_HEAVY; break;
+				case ACT_HL2MP_IDLE_CROUCH:		weaponTranslation = ACT_HL2MP_IDLE_CROUCH_USE_HEAVY; break;
+				case ACT_HL2MP_WALK_CROUCH:		weaponTranslation = ACT_HL2MP_WALK_CROUCH_USE_HEAVY; break;
+				case ACT_HL2MP_JUMP:			weaponTranslation = ACT_HL2MP_JUMP_USE_HEAVY; break;
+			}
+		}
+		else
+		{
+			switch (baseAct)
+			{
+				case ACT_HL2MP_IDLE:			weaponTranslation = ACT_HL2MP_IDLE_USE; break;
+				case ACT_HL2MP_RUN:				weaponTranslation = ACT_HL2MP_RUN_USE; break;
+				case ACT_HL2MP_WALK:			weaponTranslation = ACT_HL2MP_WALK_USE; break;
+				case ACT_HL2MP_IDLE_CROUCH:		weaponTranslation = ACT_HL2MP_IDLE_CROUCH_USE; break;
+				case ACT_HL2MP_WALK_CROUCH:		weaponTranslation = ACT_HL2MP_WALK_CROUCH_USE; break;
+				case ACT_HL2MP_JUMP:			weaponTranslation = ACT_HL2MP_JUMP_USE; break;
+			}
+		}
+	}
+#endif
 
+	return weaponTranslation;
+}
+#else
 // Below this many degrees, slow down turning rate linearly
 #define FADE_TURN_DEGREES	45.0f
 // After this, need to start turning feet
@@ -574,4 +628,5 @@ void CPlayerAnimState::GetOuterAbsVelocity( Vector& vel )
 #else
 	vel = GetOuter()->GetAbsVelocity();
 #endif
-}
+}
+#endif
diff --git a/src/game/shared/hl2mp/hl2mp_player_shared.h b/src/game/shared/hl2mp/hl2mp_player_shared.h
@@ -12,6 +12,9 @@
 #define HL2MP_PUSHAWAY_THINK_INTERVAL		(1.0f / 20.0f)
 #include "studio.h"
 
+#ifdef MAPBASE
+#include "mapbase/mapbase_playeranimstate.h"
+#endif
 
 enum
 {
@@ -34,6 +37,7 @@ enum HL2MPPlayerState
 #define CHL2MP_Player C_HL2MP_Player
 #endif
 
+#ifndef SP_ANIM_STATE
 class CPlayerAnimState
 {
 public:
@@ -93,5 +97,6 @@ class CPlayerAnimState
 
 	float				m_flTurnCorrectionTime;
 };
+#endif
 
 #endif //HL2MP_PLAYER_SHARED_h

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,11 @@ void SpawnBlood (Vector vecSpot, const Vector &vecDir, int bloodColor, float flD`
`100`	`100`	`#endif`
`101`	`101`	`CSuitPowerDevice SuitDeviceBreather( bits_SUIT_DEVICE_BREATHER, 6.7f ); // 100 units in 15 seconds (plus three padded seconds)`
`102`	`102`
`103`		`-C_HL2MP_Player::C_HL2MP_Player() : m_PlayerAnimState( this ), m_iv_angEyeAngles( "C_HL2MP_Player::m_iv_angEyeAngles" )`
	`103`	`+C_HL2MP_Player::C_HL2MP_Player() :`
	`104`	`+#ifndef SP_ANIM_STATE`
	`105`	`+ m_PlayerAnimState( this ),`
	`106`	`+#endif`
	`107`	`+ m_iv_angEyeAngles( "C_HL2MP_Player::m_iv_angEyeAngles" )`
`104`	`108`	`{`
`105`	`109`	`m_iIDEntIndex = 0;`
`106`	`110`	`m_iSpawnInterpCounterCache = 0;`
`@@ -582,7 +586,9 @@ void C_HL2MP_Player::AddEntity( void )`
`582`	`586`
`583`	`587`	`SetLocalAngles( vTempAngles );`
`584`	`588`
	`589`	`+#ifndef SP_ANIM_STATE`
`585`	`590`	`m_PlayerAnimState.Update();`
	`591`	`+#endif`
`586`	`592`
`587`	`593`	`// Zero out model pitch, blending takes care of all of it.`
`588`	`594`	`SetLocalAnglesDim( X_INDEX, 0 );`
`@@ -671,6 +677,7 @@ ShadowType_t C_HL2MP_Player::ShadowCastType( void )`
`671`	`677`	`}`
`672`	`678`
`673`	`679`
	`680`	`+#ifndef SP_ANIM_STATE`
`674`	`681`	`const QAngle& C_HL2MP_Player::GetRenderAngles()`
`675`	`682`	`{`
`676`	`683`	`if ( IsRagdoll() )`
`@@ -682,6 +689,7 @@ const QAngle& C_HL2MP_Player::GetRenderAngles()`
`682`	`689`	`return m_PlayerAnimState.GetRenderAngles();`
`683`	`690`	`}`
`684`	`691`	`}`
	`692`	`+#endif`
`685`	`693`
`686`	`694`	`bool C_HL2MP_Player::ShouldDraw( void )`
`687`	`695`	`{`
Original file line number	Diff line number	Diff line change
`@@ -310,6 +310,11 @@ bool CMoveHelperClient::PlayerFallingDamage(void)`
`310`	`310`	`void CMoveHelperClient::PlayerSetAnimation( PLAYER_ANIM eAnim )`
`311`	`311`	`{`
`312`	`312`	`// Do nothing on the client. Animations are set on the server.`
	`313`	`+#ifdef MAPBASE_MP`
	`314`	`+ // The Mapbase anim state uses clientside anims as well`
	`315`	`+ if ( m_pHost )`
	`316`	`+ m_pHost->SetAnimation( eAnim );`
	`317`	`+#endif`
`313`	`318`	`}`
`314`	`319`
`315`	`320`	`bool CMoveHelperClient::IsWorldEntity( const CBaseHandle &handle )`