Merge remote-tracking branch 'origin/newui'

This commit is contained in:
TotallyNotElite 2018-09-01 22:06:51 +02:00
commit 417efdd0d7
2 changed files with 8 additions and 1 deletions

2
external/libglez vendored

@ -1 +1 @@
Subproject commit 1e03d3843fec67f313b285ec987ced90a17aba39
Subproject commit d99d5fcb7f5488c2c9090ddac7f9c6158a653f9f

View File

@ -77,6 +77,10 @@ void on_killed_by(int userid)
void do_random_votekick()
{
std::vector<int> targets;
player_info_s local_info;
if (CE_BAD(LOCAL_E) || !g_IEngine->GetPlayerInfo(LOCAL_E->m_IDX, &local_info))
return;
for (int i = 1; i <= g_GlobalVars->maxClients; ++i)
{
player_info_s info;
@ -86,8 +90,11 @@ void do_random_votekick()
continue;
if (is_a_catbot(info.friendsID))
continue;
if (info.friendsID == local_info.friendsID)
continue;
if (playerlist::AccessData(info.friendsID).state != playerlist::k_EState::RAGE && playerlist::AccessData(info.friendsID).state != playerlist::k_EState::DEFAULT)
continue;
targets.push_back(info.userID);
}