reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2024-12-27 07:05:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into FasterBombThink

Browse Source
This commit is contained in:
Dmitry Novikov 2017-11-07 15:16:31 +03:00 committed by GitHub
commit cd8d8215df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
regamedll/dlls/ggrenade.cpp
View File

@ -1,11 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#ifdef REGAMEDLL_FIXES
constexpr float NEXT_DEFUSE_TIME = 0.033f;
#else
constexpr float NEXT_DEFUSE_TIME = 0.5f;
#endif
TYPEDESCRIPTION CGrenade::m_SaveData[] = TYPEDESCRIPTION CGrenade::m_SaveData[] =
{ {
DEFINE_FIELD(CGrenade, m_fAttenu, FIELD_FLOAT), DEFINE_FIELD(CGrenade, m_fAttenu, FIELD_FLOAT),
@ -943,6 +937,12 @@ CGrenade *CGrenade::ShootTimed(entvars_t *pevOwner, Vector vecStart, Vector vecV
return pGrenade; return pGrenade;
} }
#ifdef REGAMEDLL_FIXES
constexpr float NEXT_DEFUSE_TIME = 0.033f;
#else
constexpr float NEXT_DEFUSE_TIME = 0.5f;
#endif
void CGrenade::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value) void CGrenade::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useType, float value)
{ {
if (!m_bIsC4) if (!m_bIsC4)
@ -957,6 +957,14 @@ void CGrenade::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useTy
return; return;
} }
#ifdef REGAMEDLL_FIXES
if((player->pev->flags & FL_ONGROUND) != FL_ONGROUND) // Defuse should start only on ground
{
ClientPrint(player->pev, HUD_PRINTCENTER, "#C4_Defuse_Must_Be_On_Ground");
return;
}
#endif
if (m_bStartDefuse) if (m_bStartDefuse)
{ {
m_fNextDefuse = gpGlobals->time + NEXT_DEFUSE_TIME; m_fNextDefuse = gpGlobals->time + NEXT_DEFUSE_TIME;
@ -971,12 +979,9 @@ void CGrenade::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useTy
TheBots->OnEvent(EVENT_BOMB_DEFUSING, pActivator); TheBots->OnEvent(EVENT_BOMB_DEFUSING, pActivator);
} }
if (CSGameRules()->IsCareer()) if (CSGameRules()->IsCareer() && TheCareerTasks)
{ {
if (TheCareerTasks) TheCareerTasks->HandleEvent(EVENT_BOMB_DEFUSING);
{
TheCareerTasks->HandleEvent(EVENT_BOMB_DEFUSING);
}
} }
if (player->m_bHasDefuser) if (player->m_bHasDefuser)
@ -988,15 +993,8 @@ void CGrenade::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useTy
// TODO show messages on clients on event // TODO show messages on clients on event
ClientPrint(player->pev, HUD_PRINTCENTER, "#Defusing_Bomb_With_Defuse_Kit"); ClientPrint(player->pev, HUD_PRINTCENTER, "#Defusing_Bomb_With_Defuse_Kit");
#ifndef REGAMEDLL_FIXES
EMIT_SOUND(ENT(player->pev), CHAN_ITEM, "weapons/c4_disarm.wav", VOL_NORM, ATTN_NORM);
#endif
player->m_bIsDefusing = true;
m_pBombDefuser = static_cast<CBasePlayer *>(pActivator);
m_bStartDefuse = true;
m_flDefuseCountDown = gpGlobals->time + 5.0f; m_flDefuseCountDown = gpGlobals->time + 5.0f;
m_fNextDefuse = gpGlobals->time + NEXT_DEFUSE_TIME;
// start the progress bar // start the progress bar
player->SetProgressBarTime(5); player->SetProgressBarTime(5);
@ -1010,22 +1008,22 @@ void CGrenade::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useTy
// TODO: show messages on clients on event // TODO: show messages on clients on event
ClientPrint(player->pev, HUD_PRINTCENTER, "#Defusing_Bomb_Without_Defuse_Kit"); ClientPrint(player->pev, HUD_PRINTCENTER, "#Defusing_Bomb_Without_Defuse_Kit");
#ifndef REGAMEDLL_FIXES
EMIT_SOUND(ENT(player->pev), CHAN_ITEM, "weapons/c4_disarm.wav", VOL_NORM, ATTN_NORM);
#endif
player->m_bIsDefusing = true;
m_pBombDefuser = static_cast<CBasePlayer *>(pActivator);
m_bStartDefuse = true;
m_flDefuseCountDown = gpGlobals->time + 10.0f; m_flDefuseCountDown = gpGlobals->time + 10.0f;
m_fNextDefuse = gpGlobals->time + NEXT_DEFUSE_TIME;
// start the progress bar // start the progress bar
player->SetProgressBarTime(10); player->SetProgressBarTime(10);
} }
player->m_bIsDefusing = true;
m_pBombDefuser = static_cast<CBasePlayer *>(pActivator);
m_bStartDefuse = true;
m_fNextDefuse = gpGlobals->time + NEXT_DEFUSE_TIME;
#ifdef REGAMEDLL_FIXES #ifdef REGAMEDLL_FIXES
EMIT_SOUND(edict(), CHAN_ITEM, "weapons/c4_disarm.wav", VOL_NORM, ATTN_NORM); // Emit sound using bomb. EMIT_SOUND(edict(), CHAN_ITEM, "weapons/c4_disarm.wav", VOL_NORM, ATTN_NORM); // Emit sound using bomb.
#else
EMIT_SOUND(ENT(player->pev), CHAN_ITEM, "weapons/c4_disarm.wav", VOL_NORM, ATTN_NORM);
#endif #endif
} }