Skip to content

Commit 527df23

Browse files
committed
fixed owner ID not resetting
implement GRU
1 parent 75ee4a3 commit 527df23

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

game/shared/tf/tf_player_shared.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10470,6 +10470,11 @@ float CTFPlayer::TeamFortress_CalculateMaxSpeed( bool bIgnoreSpecialAbility /*=
1047010470
CALL_ATTRIB_HOOK_FLOAT( maxfbspeed, mult_player_movespeed_shieldrequired );
1047110471
}
1047210472

10473+
if ( m_Shared.GetActiveTFWeapon()->GetLastDeployTime() <= gpGlobals->curtime )
10474+
{
10475+
CALL_ATTRIB_HOOK_FLOAT(maxfbspeed, mult_player_movespeed_active);
10476+
}
10477+
1047310478
if ( playerclass == TF_CLASS_MEDIC )
1047410479
{
1047510480
if ( pWeapon )

game/shared/tf/tf_weaponbase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ bool CTFWeaponBase::Deploy( void )
10581058
CALL_ATTRIB_HOOK_FLOAT_ON_OTHER( pPlayer, flDeployTimeMultiplier, mult_deploy_time );
10591059
CALL_ATTRIB_HOOK_FLOAT( flDeployTimeMultiplier, mult_single_wep_deploy_time );
10601060

1061-
CTFWeaponBase* pLastWeapon = dynamic_cast<CTFWeaponBase*>(pPlayer->GetLastWeapon());
1061+
CTFWeaponBase* pLastWeapon = static_cast<CTFWeaponBase*>(pPlayer->GetLastWeapon());
10621062

10631063
int iIsSword = 0;
10641064
CALL_ATTRIB_HOOK_INT_ON_OTHER(pLastWeapon, iIsSword, is_a_sword);

public/tier0/threadtools.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1570,6 +1570,7 @@ inline void CThreadMutex::Unlock()
15701570
{
15711571
Assert(AssertOwnedByCurrentThread());
15721572
m_Mutex.unlock();
1573+
m_ownerID = 0;
15731574
}
15741575

15751576
//---------------------------------------------------------

0 commit comments

Comments
 (0)