GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2024-12-25 14:25:38 +03:00
Code Issues Projects Releases Wiki Activity

Possible fix for amb149 - register_event with "e" triggers false positives for dead players not fully in game.

Browse Source
This commit is contained in:
Steve Dudenhoeffer 2007-06-22 16:51:16 +00:00
parent 3f268e5f2e
commit e23f3747ba
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
amxmodx/CEvent.cpp
View File

@ -237,11 +237,31 @@ void EventsMngr::parserInit(int msg_type, float* timer, CPlayer* pPlayer, int in
if (pPlayer) if (pPlayer)
{ {
if (!(*iter).m_FlagPlayer || (pPlayer->IsAlive() ? !(*iter).m_FlagAlive : !(*iter).m_FlagDead)) // seriously who writes an if statement like this
// if (!(*iter).m_FlagPlayer || (pPlayer->IsAlive() ? !(*iter).m_FlagAlive : !(*iter).m_FlagDead))
if (!(*iter).m_FlagPlayer)
{ {
(*iter).m_Done = true; (*iter).m_Done = true;
continue; continue;
} }
else if ((*iter).m_FlagAlive) // can only be sent to an alive user
{
if (!pPlayer->IsAlive() ||
!pPlayer->ingame) // fix for amb149 - is_user_alive checks ingame status, so this should too
{
(*iter).m_Done = true;
continue;
}
}
else if ((*iter).m_FlagDead) // can only be sent to "dead" users
{
if (pPlayer->IsAlive() &&
pPlayer->ingame) // added to compliment amb149 fix: check both incase there is stale health data
{
(*iter).m_Done = true;
continue;
}
}
} }
else if (!(*iter).m_FlagWorld) else if (!(*iter).m_FlagWorld)
{ {