From 5c33761ebc5f751b46192ec0f5760017390a2d45 Mon Sep 17 00:00:00 2001 From: LightCat Date: Sat, 1 Sep 2018 17:59:40 +0200 Subject: [PATCH] votelogger thingy thing --- src/hacks/CatBot.cpp | 5 +---- src/votelogger.cpp | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/hacks/CatBot.cpp b/src/hacks/CatBot.cpp index 339f48db..8907ee88 100644 --- a/src/hacks/CatBot.cpp +++ b/src/hacks/CatBot.cpp @@ -82,14 +82,11 @@ void do_random_votekick() player_info_s info; if (!g_IEngine->GetPlayerInfo(i, &info)) continue; - if (g_pPlayerResource->GetTeam(i) != g_pLocalPlayer->team) continue; - if (is_a_catbot(info.friendsID)) continue; - if (playerlist::AccessData(info.friendsID).state == - playerlist::k_EState::CAT) + 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); } diff --git a/src/votelogger.cpp b/src/votelogger.cpp index 20f62a07..69eaf9a9 100644 --- a/src/votelogger.cpp +++ b/src/votelogger.cpp @@ -47,10 +47,10 @@ void dispatchUserMessage(bf_read &buffer, int type) if (eid == LOCAL_E->m_IDX) was_local_player = true; if (*vote_kickn) - if (playerlist::AccessData(info.friendsID).state == playerlist::k_EState::CAT) + if (playerlist::AccessData(info.friendsID).state != playerlist::k_EState::RAGE && playerlist::AccessData(info.friendsID).state != playerlist::k_EState::DEFAULT) g_IEngine->ClientCmd_Unrestricted("vote option2"); if (*vote_kicky) - if (playerlist::AccessData(info.friendsID).state != playerlist::k_EState::CAT) + if (playerlist::AccessData(info.friendsID).state == playerlist::k_EState::RAGE || playerlist::AccessData(info.friendsID).state == playerlist::k_EState::DEFAULT) g_IEngine->ClientCmd_Unrestricted("vote option1"); logging::Info("Vote called to kick %s [U:1:%u] for %s", name, steamID, reason);