MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-03-04 09:45:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix VS2013 compile and add minor changes for Mapbase anim state from MP work

Browse Source
This commit is contained in:
ALLEN-PC\acj30 2025-02-22 11:49:54 -06:00
parent d496494880
commit 7cdbbda5aa
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sp/src/game/shared/mapbase/mapbase_playeranimstate.cpp
View File

@ -88,6 +88,10 @@ Activity CMapbasePlayerAnimState::CalcMainActivity()
if (m_pPlayer->GetLaggedMovementValue() != 1.0f) if (m_pPlayer->GetLaggedMovementValue() != 1.0f)
speed *= m_pPlayer->GetLaggedMovementValue(); speed *= m_pPlayer->GetLaggedMovementValue();
// May not always be precise
if (speed < 0.01f)
speed = 0.0f;
if ( HandleJumping() ) if ( HandleJumping() )
{ {
return ACT_HL2MP_JUMP; return ACT_HL2MP_JUMP;
@ -102,7 +106,7 @@ Activity CMapbasePlayerAnimState::CalcMainActivity()
} }
else else
{ {
bool bDucking = GetOuter()->GetFlags() & FL_DUCKING; bool bDucking = (GetOuter()->GetFlags() & FL_DUCKING) ? true : false;
// (currently singleplayer-exclusive since clients can't read whether other players are holding down IN_DUCK) // (currently singleplayer-exclusive since clients can't read whether other players are holding down IN_DUCK)
if (m_pPlayer->m_Local.m_flDucktime > 0 && gpGlobals->maxClients == 1) if (m_pPlayer->m_Local.m_flDucktime > 0 && gpGlobals->maxClients == 1)
@ -168,6 +172,10 @@ void CMapbasePlayerAnimState::SetPlayerAnimation( PLAYER_ANIM playerAnim )
m_iFireSequence = SelectWeightedSequence( TranslateActivity( ACT_HL2MP_GESTURE_RANGE_ATTACK ) ); m_iFireSequence = SelectWeightedSequence( TranslateActivity( ACT_HL2MP_GESTURE_RANGE_ATTACK ) );
m_bFiring = m_iFireSequence != -1; m_bFiring = m_iFireSequence != -1;
m_flFireCycle = 0; m_flFireCycle = 0;
// Be sure to stop reloading
m_bReloading = false;
m_flReloadCycle = 0;
} }
else if ( playerAnim == PLAYER_ATTACK2 ) else if ( playerAnim == PLAYER_ATTACK2 )
{ {
@ -178,6 +186,10 @@ void CMapbasePlayerAnimState::SetPlayerAnimation( PLAYER_ANIM playerAnim )
#endif #endif
m_bFiring = m_iFireSequence != -1; m_bFiring = m_iFireSequence != -1;
m_flFireCycle = 0; m_flFireCycle = 0;
// Be sure to stop reloading
m_bReloading = false;
m_flReloadCycle = 0;
} }
else if ( playerAnim == PLAYER_JUMP ) else if ( playerAnim == PLAYER_JUMP )
{ {
@ -185,7 +197,7 @@ void CMapbasePlayerAnimState::SetPlayerAnimation( PLAYER_ANIM playerAnim )
if (!m_bJumping) if (!m_bJumping)
{ {
m_bJumping = true; m_bJumping = true;
m_bDuckJumping = GetOuter()->GetFlags() & FL_DUCKING; //m_pPlayer->m_nButtons & IN_DUCK; m_bDuckJumping = (GetOuter()->GetFlags() & FL_DUCKING) ? true : false; //m_pPlayer->m_nButtons & IN_DUCK;
m_bFirstJumpFrame = true; m_bFirstJumpFrame = true;
m_flJumpStartTime = gpGlobals->curtime; m_flJumpStartTime = gpGlobals->curtime;
} }
@ -225,7 +237,7 @@ void CMapbasePlayerAnimState::SetPlayerAnimation( PLAYER_ANIM playerAnim )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
Activity CMapbasePlayerAnimState::TranslateActivity( Activity actDesired ) Activity CMapbasePlayerAnimState::TranslateActivity( Activity actDesired )
{ {
#ifdef CLIENT_DLL #if defined(CLIENT_DLL) && !defined(MAPBASE_MP)
return actDesired; return actDesired;
#else #else
return m_pPlayer->Weapon_TranslateActivity( actDesired ); return m_pPlayer->Weapon_TranslateActivity( actDesired );
@ -342,6 +354,10 @@ void CMapbasePlayerAnimState::ClearAnimationState()
void CMapbasePlayerAnimState::ClearAnimationLayers() void CMapbasePlayerAnimState::ClearAnimationLayers()
{ {
VPROF( "CBasePlayerAnimState::ClearAnimationLayers" ); VPROF( "CBasePlayerAnimState::ClearAnimationLayers" );
// In c_baseanimatingoverlay.cpp, this sometimes desyncs from the interpolated overlays and causes a crash in ResizeAnimationLayerCallback when the player dies. (pVec->Count() != pVecIV->Count())
// Is there a better way of getting around this issue?
#ifndef CLIENT_DLL
if ( !m_pOuter ) if ( !m_pOuter )
return; return;
@ -358,6 +374,7 @@ void CMapbasePlayerAnimState::ClearAnimationLayers()
m_pOuter->GetAnimOverlay( i )->m_fFlags = 0; m_pOuter->GetAnimOverlay( i )->m_fFlags = 0;
#endif #endif
} }
#endif
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------