diff --git a/include/reclasses/CTFPartyClient.hpp b/include/reclasses/CTFPartyClient.hpp index 731bcd25..bf07730c 100644 --- a/include/reclasses/CTFPartyClient.hpp +++ b/include/reclasses/CTFPartyClient.hpp @@ -20,6 +20,7 @@ public: static ITFGroupMatchCriteria *MutLocalGroupCriteria(CTFPartyClient *client); static bool BCanQueueForStandby(CTFPartyClient *this_); char RequestQueueForMatch(int type); + void RequestQueueForStandby(); bool BInQueueForMatchGroup(int type); char RequestLeaveForMatch(int type); int BInvitePlayerToParty(CSteamID steamid); diff --git a/src/hacks/NavBot.cpp b/src/hacks/NavBot.cpp index 6d685826..632e0133 100644 --- a/src/hacks/NavBot.cpp +++ b/src/hacks/NavBot.cpp @@ -218,8 +218,8 @@ void initonce() cd2.update(); cd3.update(); engi_spot_cd.update(); - sniper_spots.update(); - preferred_sniper_spots.update(); + sniper_spots.clear(); + preferred_sniper_spots.clear(); return; } diff --git a/src/reclasses/CTFPartyClient.cpp b/src/reclasses/CTFPartyClient.cpp index ba230beb..2b756e7b 100644 --- a/src/reclasses/CTFPartyClient.cpp +++ b/src/reclasses/CTFPartyClient.cpp @@ -67,7 +67,14 @@ int re::CTFPartyClient::LoadSavedCasualCriteria() return LoadSavedCasualCriteria_fn(this); } - +void re::CTFPartyClient::RequestQueueForStandby() +{ + typedef void (*RequestStandby_t)(re::CTFPartyClient *); + static uintptr_t addr = gSignatures.GetClientSignature("55 89 E5 57 56 53 83 EC ? 8B 7D ? 8B 4F ? 85 C9 74"); + static RequestStandby_t RequestStandby_fn = RequestStandby_t(addr); + RequestStandby_fn(this); + return; +} char re::CTFPartyClient::RequestQueueForMatch(int type) { typedef char (*RequestQueueForMatch_t)(re::CTFPartyClient *, int); diff --git a/src/tfmm.cpp b/src/tfmm.cpp index 81617b0c..5734ef0e 100644 --- a/src/tfmm.cpp +++ b/src/tfmm.cpp @@ -13,7 +13,12 @@ settings::Int queue{ "autoqueue.mode", "7" }; CatCommand cmd_queue_start("mm_queue_casual", "Start casual queue", []() { tfmm::startQueue(); }); - +CatCommand queue_party("mm_queue_party", "Queue for Party", + []() +{ + re::CTFPartyClient *client = re::CTFPartyClient::GTFPartyClient(); + client->RequestQueueForStandby(); +}); CatCommand cmd_abandon("mm_abandon", "Abandon match", []() { tfmm::abandon(); }); @@ -56,6 +61,7 @@ void startQueue() if (*queue == 7) client->LoadSavedCasualCriteria(); client->RequestQueueForMatch((int) queue); + client->RequestQueueForStandby(); hacks::shared::autojoin::resetQueueTimer(); queuecount++; }