Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Color dvar

Browse Source
This commit is contained in:
Diavolo 2021-08-01 13:30:11 +02:00
parent b9087698df
commit a5680fdc61
No known key found for this signature in database
GPG Key ID: FA77F074E98D98A5
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Components/Modules/Colors.cpp
View File

@ -4,8 +4,8 @@ namespace Components
{ {
Dvar::Var Colors::NewColors; Dvar::Var Colors::NewColors;
Dvar::Var Colors::ColorBlind; Dvar::Var Colors::ColorBlind;
Dvar::Var Colors::ColorAlly; Game::dvar_t* Colors::ColorAlly;
Dvar::Var Colors::ColorEnemy; Game::dvar_t* Colors::ColorEnemy;
std::vector<DWORD> Colors::ColorTable; std::vector<DWORD> Colors::ColorTable;
@ -223,7 +223,7 @@ namespace Components
} }
// Patches team overhead normally // Patches team overhead normally
bool Colors::Dvar_GetUnpackedColorByName(const char* name, float* color) bool Colors::Dvar_GetUnpackedColorByName(const char* name, float* expandedColor)
{ {
if (Colors::ColorBlind.get<bool>()) if (Colors::ColorBlind.get<bool>())
{ {
@ -231,21 +231,21 @@ namespace Components
if (!str.compare("g_TeamColor_EnemyTeam")) if (!str.compare("g_TeamColor_EnemyTeam"))
{ {
// A dark red // A dark red
auto* colorlindEnemy = Colors::ColorEnemy.get<float*>(); auto* colorblindEnemy = Colors::ColorEnemy->current.color;
color[0] = colorlindEnemy[0]; *expandedColor = (float)(unsigned __int8)colorblindEnemy[0] / 255.0f;
color[1] = colorlindEnemy[1]; expandedColor[1] = (float)(unsigned __int8)colorblindEnemy[1] / 255.0f;
color[2] = colorlindEnemy[2]; expandedColor[2] = (float)(unsigned __int8)colorblindEnemy[2] / 255.0f;
color[3] = colorlindEnemy[3]; expandedColor[3] = (float)(unsigned __int8)colorblindEnemy[3] / 255.0f;
return false; return false;
} }
else if (!str.compare("g_TeamColor_MyTeam")) else if (!str.compare("g_TeamColor_MyTeam"))
{ {
// A bright yellow // A bright yellow
auto* colorblindAlly = Colors::ColorAlly.get<float*>(); auto* colorblindAlly = Colors::ColorAlly->current.color;
color[0] = colorblindAlly[0]; *expandedColor = (float)(unsigned __int8)colorblindAlly[0] / 255.0f;
color[1] = colorblindAlly[1]; expandedColor[1] = (float)(unsigned __int8)colorblindAlly[1] / 255.0f;
color[2] = colorblindAlly[2]; expandedColor[2] = (float)(unsigned __int8)colorblindAlly[2] / 255.0f;
color[3] = colorblindAlly[3]; expandedColor[3] = (float)(unsigned __int8)colorblindAlly[3] / 255.0f;
return false; return false;
} }
} }
@ -279,8 +279,8 @@ namespace Components
{ {
// Add a colorblind mode for team colors // Add a colorblind mode for team colors
Colors::ColorBlind = Dvar::Register<bool>("r_colorBlindTeams", false, Game::dvar_flag::DVAR_FLAG_SAVED, "Use color-blindness-friendly colors for ingame team names"); Colors::ColorBlind = Dvar::Register<bool>("r_colorBlindTeams", false, Game::dvar_flag::DVAR_FLAG_SAVED, "Use color-blindness-friendly colors for ingame team names");
Colors::ColorEnemy = Game::Dvar_RegisterVec4("g_TeamColor_EnemyTeam_Color", 0.659f, 0.088f, 0.145f, 1, 0, 1, Game::dvar_flag::DVAR_FLAG_SAVED, "Enemy team color"); Colors::ColorEnemy = Game::Dvar_RegisterColor("g_ColorBlind_EnemyTeam", 0.659f, 0.088f, 0.145f, 1, Game::dvar_flag::DVAR_FLAG_SAVED, "Enemy team color for colorblind mode");
Colors::ColorAlly = Game::Dvar_RegisterVec4("g_TeamColor_MyTeam_Color", 1, 0.859f, 0.125f, 1, 0, 1, Game::dvar_flag::DVAR_FLAG_SAVED, "Allied team color"); Colors::ColorAlly = Game::Dvar_RegisterColor("g_ColorBlind_MyTeam", 1, 0.859f, 0.125f, 1, Game::dvar_flag::DVAR_FLAG_SAVED, "Ally team color for colorblind mode");
Utils::Hook(0x406530, Colors::GetUnpackedColorByNameStub, HOOK_JUMP).install()->quick(); Utils::Hook(0x406530, Colors::GetUnpackedColorByNameStub, HOOK_JUMP).install()->quick();
// Disable SV_UpdateUserinfo_f, to block changing the name ingame // Disable SV_UpdateUserinfo_f, to block changing the name ingame

6
src/Components/Modules/Colors.hpp
View File

@ -23,8 +23,8 @@ namespace Components
static Dvar::Var NewColors; static Dvar::Var NewColors;
static Dvar::Var ColorBlind; static Dvar::Var ColorBlind;
static Dvar::Var ColorAlly; static Game::dvar_t* ColorAlly;
static Dvar::Var ColorEnemy; static Game::dvar_t* ColorEnemy;
static DWORD HsvToRgb(HsvColor hsv); static DWORD HsvToRgb(HsvColor hsv);
@ -38,7 +38,7 @@ namespace Components
static void LookupColor(DWORD* color, char index); static void LookupColor(DWORD* color, char index);
static void LookupColorStub(); static void LookupColorStub();
static char* CleanStrStub(char* string); static char* CleanStrStub(char* string);
static bool Dvar_GetUnpackedColorByName(const char* name, float* color); static bool Dvar_GetUnpackedColorByName(const char* name, float* expandedColor);
static void GetUnpackedColorByNameStub(); static void GetUnpackedColorByNameStub();
static std::vector<DWORD> ColorTable; static std::vector<DWORD> ColorTable;
}; };