nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix fake center and upgrade chirc

Browse Source
This commit is contained in:
LightCat 2018-10-16 13:30:12 +02:00
parent 273e937923
commit 27b9e814f6
3 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/chirc vendored

@ -1 +1 @@
Subproject commit 4a8a729d2193d417afbe4fc60b0a52bca6bb55ab Subproject commit d56d93e90e3c2d0760eeff8bb66f5d480d17199e

2
src/hacks/AntiAim.cpp
View File

@ -586,7 +586,7 @@ void ProcessUserCmd(CUserCmd *cmd)
clamp = false; clamp = false;
break; break;
case 8: case 8:
p = -3256.0f; p = 360.0f;
clamp = false; clamp = false;
break; break;
case 9: case 9:

34
src/irc.cpp
View File

@ -18,6 +18,7 @@ static settings::String commandandcontrol_password("irc.cc.password", "");
static settings::Bool irc_party{ "irc.cc.party", "false" }; static settings::Bool irc_party{ "irc.cc.party", "false" };
static settings::Bool answer_steam{ "irc.cc.respondparty", "false" }; static settings::Bool answer_steam{ "irc.cc.respondparty", "false" };
static settings::Int party_cooldown{ "irc.cc.party-cooldown", "60" }; static settings::Int party_cooldown{ "irc.cc.party-cooldown", "60" };
static settings::Int party_size{ "irc.cc.party-size", "6" };
static Timer last_sent_steamid{}; static Timer last_sent_steamid{};
static Timer last_steamid_received{}; static Timer last_steamid_received{};
static std::vector<unsigned> steamidvec{}; static std::vector<unsigned> steamidvec{};
@ -281,27 +282,39 @@ int GetMaxParty()
CatCommand debug_maxparty("debug_partysize", "Debug party size", [](){ CatCommand debug_maxparty("debug_partysize", "Debug party size", [](){
logging::Info("%d", GetMaxParty()); logging::Info("%d", GetMaxParty());
}); });
Timer resize_party{};
static HookedFunction paint(HookedFunctions_types::HF_Paint, "IRC", 16, []() { static HookedFunction paint(HookedFunctions_types::HF_Paint, "IRC", 16, []() {
if (!restarting) if (!restarting)
{
if (last_sent_steamid.check(8000) && calledonce.test_and_set(2000))
{ {
static uintptr_t addr = gSignatures.GetClientSignature("55 89 E5 57 56 53 83 EC ? 8B 7D ? 8B 77 ? 85 F6 0F 84"); static uintptr_t addr = gSignatures.GetClientSignature("55 89 E5 57 56 53 83 EC ? 8B 7D ? 8B 77 ? 85 F6 0F 84");
typedef int (*GetNumOnlineMembers_t)(re::CTFPartyClient *); typedef int (*GetNumOnlineMembers_t)(re::CTFPartyClient *);
auto GetNumOnlineMembers_fn = GetNumOnlineMembers_t(addr); auto GetNumOnlineMembers_fn = GetNumOnlineMembers_t(addr);
auto party_client = re::CTFPartyClient::GTFPartyClient(); auto party_client = re::CTFPartyClient::GTFPartyClient();
int online_members = GetNumOnlineMembers_fn(party_client); int online_members = GetNumOnlineMembers_fn(party_client);
if (resize_party.test_and_set(10000) && party_client && online_members > *party_size)
{
int lowest_id = INT_MAX;
for (auto peer : irc.getPeers())
{
int id = peer.first;
int party_size = peer.second.party_size;
if (party_size != online_members)
continue;
if ( id < lowest_id)
lowest_id = id;
}
if ( irc.getData().id < lowest_id)
hack::command_stack().push("tf_party_leave");
}
if (last_sent_steamid.check(8000) && calledonce.test_and_set(2000))
{
if (party_client && online_members != 6 && online_members < GetMaxParty()) if (party_client && online_members != 6 && online_members < GetMaxParty())
hack::command_stack().push("tf_party_leave"); hack::command_stack().push("tf_party_leave");
} }
if (last_steamid_received.test_and_set(10000)) if (last_steamid_received.test_and_set(10000))
{ {
static uintptr_t addr = gSignatures.GetClientSignature(
"55 89 E5 57 56 53 83 EC ? 8B 7D ? 8B 77 ? 85 F6 0F 84");
typedef int (*GetNumOnlineMembers_t)(re::CTFPartyClient *);
auto GetNumOnlineMembers_fn = GetNumOnlineMembers_t(addr);
auto party_client = re::CTFPartyClient::GTFPartyClient();
int online_members = GetNumOnlineMembers_fn(party_client);
if (party_client && online_members != 6 && online_members < GetMaxParty()) if (party_client && online_members != 6 && online_members < GetMaxParty())
if (!steamidvec.empty()) if (!steamidvec.empty())
{ {
@ -327,10 +340,7 @@ static HookedFunction paint(HookedFunctions_types::HF_Paint, "IRC", 16, []() {
irc.Update(); irc.Update();
if (ircstate.test_and_set(20000)) if (ircstate.test_and_set(20000))
{ {
std::string nick("Anon"); irc.UpdateState(*irc_party && *answer_steam, online_members);
if (!*anon)
nick = g_ISteamFriends->GetPersonaName();
irc.UpdateState(*irc_party && *answer_steam);
} }
} }
}); });