reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2025-04-24 15:33:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Group defuser give code in one function (#871)

Browse Source
This commit is contained in:
Francisco Muñoz 2023-10-10 19:02:27 -03:00 committed by GitHub
parent a9ec63df1b
commit 2f50f5ab9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
regamedll/dlls/client.cpp
View File

@ -1440,28 +1440,13 @@ void EXT_FUNC __API_HOOK(BuyItem)(CBasePlayer *pPlayer, int iSlot)
if (pPlayer->m_iAccount >= DEFUSEKIT_PRICE) if (pPlayer->m_iAccount >= DEFUSEKIT_PRICE)
{ {
bEnoughMoney = true; bEnoughMoney = true;
pPlayer->m_bHasDefuser = true; pPlayer->GiveDefuser();
MESSAGE_BEGIN(MSG_ONE, gmsgStatusIcon, nullptr, pPlayer->pev);
WRITE_BYTE(STATUSICON_SHOW);
WRITE_STRING("defuser");
WRITE_BYTE(0);
WRITE_BYTE(160);
WRITE_BYTE(0);
MESSAGE_END();
pPlayer->pev->body = 1;
pPlayer->AddAccount(-DEFUSEKIT_PRICE, RT_PLAYER_BOUGHT_SOMETHING); pPlayer->AddAccount(-DEFUSEKIT_PRICE, RT_PLAYER_BOUGHT_SOMETHING);
#ifdef REGAMEDLL_FIXES #ifdef REGAMEDLL_FIXES
EMIT_SOUND(ENT(pPlayer->pev), CHAN_VOICE, "items/kevlar.wav", VOL_NORM, ATTN_NORM); EMIT_SOUND(ENT(pPlayer->pev), CHAN_VOICE, "items/kevlar.wav", VOL_NORM, ATTN_NORM);
#else #else
EMIT_SOUND(ENT(pPlayer->pev), CHAN_ITEM, "items/kevlar.wav", VOL_NORM, ATTN_NORM); EMIT_SOUND(ENT(pPlayer->pev), CHAN_ITEM, "items/kevlar.wav", VOL_NORM, ATTN_NORM);
#endif
pPlayer->SendItemStatus();
#ifdef BUILD_LATEST
pPlayer->SetScoreboardAttributes();
#endif #endif
} }
break; break;
@ -1479,7 +1464,6 @@ void EXT_FUNC __API_HOOK(BuyItem)(CBasePlayer *pPlayer, int iSlot)
if (pPlayer->m_iAccount >= SHIELDGUN_PRICE) if (pPlayer->m_iAccount >= SHIELDGUN_PRICE)
{ {
bEnoughMoney = true; bEnoughMoney = true;
pPlayer->DropPrimary(); pPlayer->DropPrimary();
pPlayer->GiveShield(); pPlayer->GiveShield();
pPlayer->AddAccount(-SHIELDGUN_PRICE, RT_PLAYER_BOUGHT_SOMETHING); pPlayer->AddAccount(-SHIELDGUN_PRICE, RT_PLAYER_BOUGHT_SOMETHING);

15
regamedll/dlls/items.cpp
View File

@ -481,22 +481,9 @@ BOOL CItemThighPack::MyTouch(CBasePlayer *pPlayer)
return FALSE; return FALSE;
#endif #endif
pPlayer->m_bHasDefuser = true; pPlayer->GiveDefuser();
pPlayer->pev->body = 1;
ClientPrint(pPlayer->pev, HUD_PRINTCENTER, "#Got_defuser"); ClientPrint(pPlayer->pev, HUD_PRINTCENTER, "#Got_defuser");
MESSAGE_BEGIN(MSG_ONE, gmsgStatusIcon, nullptr, pPlayer->pev);
WRITE_BYTE(STATUSICON_SHOW);
WRITE_STRING("defuser");
WRITE_BYTE(0);
WRITE_BYTE(160);
WRITE_BYTE(0);
MESSAGE_END();
pPlayer->SendItemStatus();
pPlayer->SetScoreboardAttributes();
EMIT_SOUND(pPlayer->edict(), CHAN_VOICE, "items/kevlar.wav", VOL_NORM, ATTN_NORM); EMIT_SOUND(pPlayer->edict(), CHAN_VOICE, "items/kevlar.wav", VOL_NORM, ATTN_NORM);
if (TheTutor) if (TheTutor)

20
regamedll/dlls/player.cpp
View File

@ -10137,6 +10137,26 @@ void CBasePlayer::RemoveBomb()
} }
} }
void CBasePlayer::GiveDefuser()
{
m_bHasDefuser = true;
pev->body = 1;
MESSAGE_BEGIN(MSG_ONE, gmsgStatusIcon, nullptr, pev);
WRITE_BYTE(STATUSICON_SHOW);
WRITE_STRING("defuser");
WRITE_BYTE(0);
WRITE_BYTE(160);
WRITE_BYTE(0);
MESSAGE_END();
SendItemStatus();
#if defined(REGAMEDLL_FIXES) || defined(BUILD_LATEST)
SetScoreboardAttributes();
#endif
}
void CBasePlayer::RemoveDefuser() void CBasePlayer::RemoveDefuser()
{ {
m_bHasDefuser = false; m_bHasDefuser = false;

1
regamedll/dlls/player.h
View File

@ -631,6 +631,7 @@ public:
void DropPrimary(); void DropPrimary();
void OnSpawnEquip(bool addDefault = true, bool equipGame = true); void OnSpawnEquip(bool addDefault = true, bool equipGame = true);
void RemoveBomb(); void RemoveBomb();
void GiveDefuser();
void RemoveDefuser(); void RemoveDefuser();
void HideTimer(); void HideTimer();
bool MakeBomber(); bool MakeBomber();