reHLDS/reapi
2
0
Fork 0
mirror of https://github.com/rehlds/reapi.git synced 2025-01-28 14:37:57 +03:00
Code Issues Projects Releases Wiki Activity

fix(rg_transfer_c4): prevent C4 destruction on arg receiver = 0 (#291)

Browse Source
This commit is contained in:
Javekson 2023-11-26 07:54:11 +04:00 committed by GitHub
parent cf757aa832
commit b281588ddf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reapi/extra/amxmodx/scripting/include/reapi_gamedll.inc
View File

@ -697,7 +697,7 @@ native rg_get_user_footsteps(const index);
* @param index Client index * @param index Client index
* @param receiver Receiver index, if 0 it will transfer to a random player * @param receiver Receiver index, if 0 it will transfer to a random player
* *
* @return 1 on success, 0 otherwise * @return Index of player entity if successfull, 0 otherwise
*/ */
native rg_transfer_c4(const index, const receiver = 0); native rg_transfer_c4(const index, const receiver = 0);

2
reapi/include/cssdk/dlls/gamerules.h
View File

@ -531,7 +531,7 @@ public:
// check if the scenario has been won/lost // check if the scenario has been won/lost
virtual void CheckWinConditions() = 0; virtual void CheckWinConditions() = 0;
virtual void RemoveGuns() = 0; virtual void RemoveGuns() = 0;
virtual void GiveC4() = 0; virtual CBasePlayer *GiveC4() = 0;
virtual void ChangeLevel() = 0; virtual void ChangeLevel() = 0;
virtual void GoToIntermission() = 0; virtual void GoToIntermission() = 0;

46
reapi/src/natives/natives_misc.cpp
View File

@ -1575,10 +1575,11 @@ cell AMX_NATIVE_CALL rg_get_user_footsteps(AMX *amx, cell *params)
* @param index Client index * @param index Client index
* @param receiver Receiver index, if 0 it will transfer to a random player * @param receiver Receiver index, if 0 it will transfer to a random player
* *
* @return 1 on success, 0 otherwise * @return Index of player entity if successfull, 0 otherwise
* *
* native rg_transfer_c4(const index, const receiver = 0); * native rg_transfer_c4(const index, const receiver = 0);
*/ */
cell AMX_NATIVE_CALL rg_transfer_c4(AMX *amx, cell *params) cell AMX_NATIVE_CALL rg_transfer_c4(AMX *amx, cell *params)
{ {
enum args_e { arg_count, arg_index, arg_receiver }; enum args_e { arg_count, arg_index, arg_receiver };
@ -1589,29 +1590,50 @@ cell AMX_NATIVE_CALL rg_transfer_c4(AMX *amx, cell *params)
CBasePlayer *pPlayer = UTIL_PlayerByIndex(params[arg_index]); CBasePlayer *pPlayer = UTIL_PlayerByIndex(params[arg_index]);
CHECK_CONNECTED(pPlayer, arg_index); CHECK_CONNECTED(pPlayer, arg_index);
if (!pPlayer->m_bHasC4 || !pPlayer->CSPlayer()->RemovePlayerItem("weapon_c4")) if (!pPlayer->m_bHasC4) {
return FALSE; return FALSE;
}
pPlayer->pev->body = 0; CBasePlayer *pReceiver = nullptr;
pPlayer->m_bHasC4 = false;
pPlayer->CSPlayer()->SetBombIcon();
pPlayer->CSPlayer()->SetProgressBarTime(0);
if (params[arg_receiver] != 0 && params[arg_receiver] <= gpGlobals->maxClients) { if (params[arg_receiver] > 0 && params[arg_receiver] <= gpGlobals->maxClients) {
CBasePlayer *pReceiver = UTIL_PlayerByIndex(params[arg_receiver]); pReceiver = UTIL_PlayerByIndex(params[arg_receiver]);
CHECK_CONNECTED(pReceiver, arg_receiver); CHECK_CONNECTED(pReceiver, arg_receiver);
if (!pReceiver->CSPlayer()->MakeBomber()) if (!pPlayer->CSPlayer()->RemovePlayerItemEx("weapon_c4", true)) {
return FALSE; return FALSE;
}
if (!pReceiver->CSPlayer()->MakeBomber()) {
return FALSE;
}
}
else {
int NumDeadCT, NumDeadTerrorist, NumAliveTerrorist, NumAliveCT;
CSGameRules()->InitializePlayerCounts(NumAliveTerrorist, NumAliveCT, NumDeadTerrorist, NumDeadCT);
if (pPlayer->m_iTeam == CT && NumAliveTerrorist < 1) {
return FALSE;
}
if (pPlayer->m_iTeam == TERRORIST && NumAliveTerrorist < 2) {
return FALSE;
}
if (!pPlayer->CSPlayer()->RemovePlayerItemEx("weapon_c4", true)) {
return FALSE;
}
} else {
auto flags = pPlayer->pev->flags; auto flags = pPlayer->pev->flags;
pPlayer->pev->flags |= FL_DORMANT; pPlayer->pev->flags |= FL_DORMANT;
CSGameRules()->GiveC4(); pReceiver = CSGameRules()->GiveC4();
pPlayer->pev->flags = flags; pPlayer->pev->flags = flags;
} }
return TRUE; if (pReceiver)
return indexOfPDataAmx(pReceiver);
return FALSE;
} }
/* /*