Merge remote-tracking branch 'origin/newui'
This commit is contained in:
commit
417efdd0d7
2
external/libglez
vendored
2
external/libglez
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 1e03d3843fec67f313b285ec987ced90a17aba39
|
Subproject commit d99d5fcb7f5488c2c9090ddac7f9c6158a653f9f
|
@ -77,6 +77,10 @@ void on_killed_by(int userid)
|
|||||||
void do_random_votekick()
|
void do_random_votekick()
|
||||||
{
|
{
|
||||||
std::vector<int> targets;
|
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)
|
for (int i = 1; i <= g_GlobalVars->maxClients; ++i)
|
||||||
{
|
{
|
||||||
player_info_s info;
|
player_info_s info;
|
||||||
@ -86,8 +90,11 @@ void do_random_votekick()
|
|||||||
continue;
|
continue;
|
||||||
if (is_a_catbot(info.friendsID))
|
if (is_a_catbot(info.friendsID))
|
||||||
continue;
|
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)
|
if (playerlist::AccessData(info.friendsID).state != playerlist::k_EState::RAGE && playerlist::AccessData(info.friendsID).state != playerlist::k_EState::DEFAULT)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
targets.push_back(info.userID);
|
targets.push_back(info.userID);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user