FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix knowledge bugs with satchels again.

This commit is contained in:
Night Owl 2017-07-17 09:48:08 +05:00
parent a383a57a09
commit cbdf9b5d04
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/client.cpp
View File

@ -127,12 +127,6 @@ void ClientDisconnect( edict_t *pEntity )
pEntity->v.solid = SOLID_NOT;// nonsolid pEntity->v.solid = SOLID_NOT;// nonsolid
UTIL_SetOrigin( &pEntity->v, pEntity->v.origin ); UTIL_SetOrigin( &pEntity->v, pEntity->v.origin );
CBasePlayer *pl = (CBasePlayer *)CBaseEntity::Instance( pEntity );
if( pl->HasNamedPlayerItem( "weapon_satchel" ) )
{
DeactivateSatchels( pl );
}
g_pGameRules->ClientDisconnected( pEntity ); g_pGameRules->ClientDisconnected( pEntity );
} }

6
dlls/multiplay_gamerules.cpp
View File

@ -675,12 +675,6 @@ void CHalfLifeMultiplay::PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller,
// let the killer paint another decal as soon as he'd like. // let the killer paint another decal as soon as he'd like.
PK->m_flNextDecalTime = gpGlobals->time; PK->m_flNextDecalTime = gpGlobals->time;
} }
#ifndef HLDEMO_BUILD
if( pVictim->HasNamedPlayerItem( "weapon_satchel" ) )
{
DeactivateSatchels( pVictim );
}
#endif
} }
//========================================================= //=========================================================

1
dlls/player.cpp
View File

@ -826,6 +826,7 @@ void CBasePlayer::RemoveAllItems( BOOL removeSuit )
for( i = 0; i < MAX_AMMO_SLOTS; i++ ) for( i = 0; i < MAX_AMMO_SLOTS; i++ )
m_rgAmmo[i] = 0; m_rgAmmo[i] = 0;
DeactivateSatchels( this );
UpdateClientData(); UpdateClientData();
// send Selected Weapon Message to our client // send Selected Weapon Message to our client