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

Fix anti auto balance issues and clang format

Browse Source
This commit is contained in:
LightCat 2019-01-27 10:51:42 +01:00
parent b5e61150be
commit a829849619
6 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/helpers.cpp
View File

@ -815,7 +815,8 @@ int UniformRandomInt(int min, int max)
while (len) while (len)
{ {
bound = (1U + RAND_MAX) % len; bound = (1U + RAND_MAX) % len;
while ((r = rand()) < bound); while ((r = rand()) < bound)
;
result *= 1U + RAND_MAX; result *= 1U + RAND_MAX;
result += r % len; result += r % len;
len -= len > RAND_MAX ? RAND_MAX : len; len -= len > RAND_MAX ? RAND_MAX : len;

2
src/hooks/DispatchUserMessage.cpp
View File

@ -113,7 +113,7 @@ DEFINE_HOOKED_METHOD(DispatchUserMessage, bool, void *this_, int type, bf_read &
logging::Info("%s", data.c_str()); logging::Info("%s", data.c_str());
if (data.find("TeamChangeP") != data.npos && CE_GOOD(LOCAL_E)) if (data.find("TeamChangeP") != data.npos && CE_GOOD(LOCAL_E))
{ {
std::string server_name = server->GetName(); std::string server_name(server->GetAddress());
if (server_name != previous_name) if (server_name != previous_name)
{ {
previous_name = server_name; previous_name = server_name;

3
src/reclasses/CTFPartyClient.cpp
View File

@ -69,7 +69,8 @@ int re::CTFPartyClient::LoadSavedCasualCriteria()
{ {
typedef int (*LoadSavedCasualCriteria_t)(re::CTFPartyClient *); typedef int (*LoadSavedCasualCriteria_t)(re::CTFPartyClient *);
static uintptr_t addr = gSignatures.GetClientSignature("55 89 E5 8B 45 ? 5D 8B 80 ? ? ? ? C3 66 90 55 89 E5 " static uintptr_t addr = gSignatures.GetClientSignature("55 89 E5 8B 45 ? 5D 8B 80 ? ? ? ? C3 66 90 55 89 E5 "
"8B 45 ? 5D 0F B6 80 ? ? ? ? C3 90 55 89 E5 56") - 0x40; "8B 45 ? 5D 0F B6 80 ? ? ? ? C3 90 55 89 E5 56") -
0x40;
static LoadSavedCasualCriteria_t LoadSavedCasualCriteria_fn = LoadSavedCasualCriteria_t(addr); static LoadSavedCasualCriteria_t LoadSavedCasualCriteria_fn = LoadSavedCasualCriteria_t(addr);
return LoadSavedCasualCriteria_fn(this); return LoadSavedCasualCriteria_fn(this);

7
src/votelogger.cpp
View File

@ -77,8 +77,7 @@ void dispatchUserMessage(bf_read &buffer, int type)
if (!g_IEngine->GetPlayerInfo(eid, &info) || !g_IEngine->GetPlayerInfo(caller, &info2)) if (!g_IEngine->GetPlayerInfo(eid, &info) || !g_IEngine->GetPlayerInfo(caller, &info2))
break; break;
logging::Info("Vote called to kick %s [U:1:%u] for %s by %s [U:1:%u]", logging::Info("Vote called to kick %s [U:1:%u] for %s by %s [U:1:%u]", info.name, info.friendsID, reason, info2.name, info2.friendsID);
info.name, info.friendsID, reason, info2.name, info2.friendsID);
if (eid == LOCAL_E->m_IDX) if (eid == LOCAL_E->m_IDX)
was_local_player = true; was_local_player = true;
@ -103,9 +102,7 @@ void dispatchUserMessage(bf_read &buffer, int type)
if (*party_say) if (*party_say)
{ {
char formated_string[256]; char formated_string[256];
std::snprintf(formated_string, sizeof(formated_string), std::snprintf(formated_string, sizeof(formated_string), "[CAT] votekick called: %s => %s (%s)", info2.name, info.name, reason);
"[CAT] votekick called: %s => %s (%s)",
info2.name, info.name, reason);
re::CTFPartyClient::GTFPartyClient()->SendPartyChat(formated_string); re::CTFPartyClient::GTFPartyClient()->SendPartyChat(formated_string);
} }
break; break;