reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2024-12-26 06:35:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

CGrenade::Use: Fixed spam sound on defuse start, if player in air

Browse Source
This commit is contained in:
s1lent 2019-09-21 18:39:44 +07:00
parent 22f5fe3831
commit c35545a5b8
No known key found for this signature in database
GPG Key ID: 0FE401DC73916B5C
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
regamedll/dlls/ggrenade.cpp
View File

@ -1151,21 +1151,20 @@ void CGrenade::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useTy
{ {
#ifdef REGAMEDLL_FIXES #ifdef REGAMEDLL_FIXES
if (m_pBombDefuser == pPlayer) if (m_pBombDefuser == pPlayer)
#endif
{ {
if ((pPlayer->pev->flags & FL_ONGROUND) != FL_ONGROUND) // Defuse should start only on ground
{
ClientPrint(pPlayer->pev, HUD_PRINTCENTER, "#C4_Defuse_Must_Be_On_Ground");
return;
}
m_fNextDefuse = gpGlobals->time + NEXT_DEFUSE_TIME; m_fNextDefuse = gpGlobals->time + NEXT_DEFUSE_TIME;
} }
#else
m_fNextDefuse = gpGlobals->time + NEXT_DEFUSE_TIME;
#endif // #ifdef REGAMEDLL_FIXES
return; return;
} }
#ifdef REGAMEDLL_FIXES
else if ((pPlayer->pev->flags & FL_ONGROUND) != FL_ONGROUND) // Defuse should start only on ground
{
ClientPrint(pPlayer->pev, HUD_PRINTCENTER, "#C4_Defuse_Must_Be_On_Ground");
return;
}
#endif
DefuseBombStart(pPlayer); DefuseBombStart(pPlayer);
} }

4
regamedll/dlls/player.cpp
View File

@ -1502,8 +1502,8 @@ void CBasePlayer::RemoveAllItems(BOOL removeSuit)
m_pTank->Use(this, this, USE_OFF, 0); m_pTank->Use(this, this, USE_OFF, 0);
m_pTank = nullptr; m_pTank = nullptr;
} }
#endif #endif
if (m_bHasDefuser) if (m_bHasDefuser)
{ {
RemoveDefuser(); RemoveDefuser();