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

Merge pull request #815 from nullworks/lightcat

Browse Source 
Fix Killfeed Coloring being wrong
This commit is contained in:
LightCat 2019-09-13 19:10:28 +02:00 committed by GitHub
commit 991f056ac7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/hacks/KillfeedColor.cpp
View File

@ -27,7 +27,11 @@ void GetTeamColor(Color *clr, void *this_, int data, int local)
// Our encoding uses quite a few bits, so let's just check for < 1000 and !playerIdx // Our encoding uses quite a few bits, so let's just check for < 1000 and !playerIdx
if (data < 1000 || !playerIdx) if (data < 1000 || !playerIdx)
{
auto wc = colors::white;
clr->SetColor(wc.r * 255, wc.g * 255, wc.b * 255, 255);
return GetTeamColor_fn(clr, this_, data, local); return GetTeamColor_fn(clr, this_, data, local);
}
// No Color change // No Color change
/*if (!g_IEngine->GetPlayerInfo(playerIdx, &pinfo) || playerlist::IsDefault(pinfo.friendsID)) /*if (!g_IEngine->GetPlayerInfo(playerIdx, &pinfo) || playerlist::IsDefault(pinfo.friendsID))
{ {
@ -39,8 +43,9 @@ void GetTeamColor(Color *clr, void *this_, int data, int local)
auto wc = playerlist::Color(pinfo.friendsID); auto wc = playerlist::Color(pinfo.friendsID);
if (!g_IEngine->GetPlayerInfo(playerIdx, &pinfo) || playerlist::IsDefault(pinfo.friendsID)) if (!g_IEngine->GetPlayerInfo(playerIdx, &pinfo) || playerlist::IsDefault(pinfo.friendsID))
{ {
if (team != TEAM_SPEC && team != TEAM_SPEC) if (team != TEAM_SPEC && team != TEAM_UNK)
wc = team == TEAM_BLU ? colors::blu : colors::red; // Colors taken from game
wc = team == TEAM_BLU ? colors::FromRGBA8(153, 204, 255, 255) : colors::FromRGBA8(255, 64, 64, 255);
else else
wc = colors::white; wc = colors::white;
} }
@ -55,8 +60,8 @@ void GetTeamColor(Color *clr, void *this_, int data, int local)
static std::vector<BytePatch> no_stack_smash{}; static std::vector<BytePatch> no_stack_smash{};
static std::vector<BytePatch> color_patches{}; static std::vector<BytePatch> color_patches{};
// Defines to make our lives easier // Defines to make our lives easier
#define DONT_SMASH_SMACK(offset) no_stack_smash.push_back(BytePatch{ addr, std::vector<unsigned char>{ 0xC3, 0x90, 0x90 } }); #define DONT_SMASH_SMACK(offset) no_stack_smash.push_back(BytePatch{ addr, std::vector<unsigned char>{ 0xC3, 0x90, 0x90 } })
#define PATCH_COLORS(patchNum) color_patches.push_back(BytePatch{ addrs[patchNum], patches[patchNum] }); #define PATCH_COLORS(patchNum) color_patches.push_back(BytePatch{ addrs[patchNum], patches[patchNum] })
static InitRoutine init([] { static InitRoutine init([] {
uintptr_t addr = gSignatures.GetClientSignature("55 89 E5 53 8B 55 10 8B 45 08 8B 4D 0C 8B 5D 14"); uintptr_t addr = gSignatures.GetClientSignature("55 89 E5 53 8B 55 10 8B 45 08 8B 4D 0C 8B 5D 14");