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

glow and chams team colors

Browse Source
This commit is contained in:
LIghty 2018-03-21 21:54:42 +01:00
parent aa6f71be7a
commit 13e985e660
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/menu/RootWindow.cpp
View File

@ -59,4 +59,4 @@ void RootWindow::Setup() {
win->AddElements(); win->AddElements();
win->SetOffset((draw::width - 912) / 2, (draw::height - 410) / 2); win->SetOffset((draw::width - 912) / 2, (draw::height - 410) / 2);
AddChild(win); AddChild(win);
} }

8
src/visual/EffectChams.cpp
View File

@ -49,6 +49,7 @@ static CatVar chamsself(CV_SWITCH, "chams_self", "0", "Enable chams on self",
static CatVar rainbow(CV_SWITCH, "chams_self_rainbow", "1", static CatVar rainbow(CV_SWITCH, "chams_self_rainbow", "1",
"Enable rainbow chams on self", "Enable rainbow chams on self",
"Only visible in thirdperson!"); "Only visible in thirdperson!");
static CatVar chamsteam(CV_SWITCH, "chams_self_team", "0", "Team chams color");
static CatVar chamsR(CV_INT, "chams_self_r", "0", "Self chams red", "", 0, 255); static CatVar chamsR(CV_INT, "chams_self_r", "0", "Self chams red", "", 0, 255);
static CatVar chamsG(CV_INT, "chams_self_g", "0", "Self chams green", "", 0, static CatVar chamsG(CV_INT, "chams_self_g", "0", "Self chams green", "", 0,
255); 255);
@ -129,7 +130,12 @@ rgba_t EffectChams::ChamsColor(IClientEntity *entity)
case ENTITY_PLAYER: case ENTITY_PLAYER:
if (!players) if (!players)
return colors::empty; return colors::empty;
if (ent->m_IDX == LOCAL_E->m_IDX && chamsself && !rainbow) if (ent->m_IDX == LOCAL_E->m_IDX && chamsteam)
if (LOCAL_E->m_iTeam == TEAM_BLU)
return colors::blu;
else
return colors::red;
if (ent->m_IDX == LOCAL_E->m_IDX && !rainbow)
return colors::FromRGBA8(chamsR, chamsG, chamsB, 255); return colors::FromRGBA8(chamsR, chamsG, chamsB, 255);
if (health) if (health)
{ {

6
src/visual/EffectGlow.cpp
View File

@ -53,6 +53,7 @@ static CatVar glowself(CV_SWITCH, "glow_self", "0", "Enable glow on self");
static CatVar rainbow(CV_SWITCH, "glow_self_rainbow", "1", static CatVar rainbow(CV_SWITCH, "glow_self_rainbow", "1",
"Enable rainbow glow on self", "Enable rainbow glow on self",
"Only visible in thirdperson!"); "Only visible in thirdperson!");
static CatVar glowteam(CV_SWITCH, "glow_self_team", "0", "Team chams color");
static CatVar glowR(CV_INT, "glow_self_r", "200", "Self glow red", "", 0, 255); static CatVar glowR(CV_INT, "glow_self_r", "200", "Self glow red", "", 0, 255);
static CatVar glowG(CV_INT, "glow_self_g", "200", "Self glow green", "", 0, static CatVar glowG(CV_INT, "glow_self_g", "200", "Self glow green", "", 0,
255); 255);
@ -249,6 +250,11 @@ rgba_t EffectGlow::GlowColor(IClientEntity *entity)
} }
break; break;
case ENTITY_PLAYER: case ENTITY_PLAYER:
if (ent->m_IDX == LOCAL_E->m_IDX && glowteam)
if (LOCAL_E->m_iTeam == TEAM_BLU)
return colors::blu;
else
return colors::red;
if (ent->m_IDX == LOCAL_E->m_IDX && glowself && !rainbow) if (ent->m_IDX == LOCAL_E->m_IDX && glowself && !rainbow)
return colors::FromRGBA8(glowR, glowG, glowB, 255); return colors::FromRGBA8(glowR, glowG, glowB, 255);
if (health) if (health)