diff --git a/src/menu/RootWindow.cpp b/src/menu/RootWindow.cpp index ae5a6535..b64babcc 100644 --- a/src/menu/RootWindow.cpp +++ b/src/menu/RootWindow.cpp @@ -59,4 +59,4 @@ void RootWindow::Setup() { win->AddElements(); win->SetOffset((draw::width - 912) / 2, (draw::height - 410) / 2); AddChild(win); -} +} \ No newline at end of file diff --git a/src/visual/EffectChams.cpp b/src/visual/EffectChams.cpp index d3350626..d3e87393 100644 --- a/src/visual/EffectChams.cpp +++ b/src/visual/EffectChams.cpp @@ -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", "Enable rainbow chams on self", "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 chamsG(CV_INT, "chams_self_g", "0", "Self chams green", "", 0, 255); @@ -129,7 +130,12 @@ rgba_t EffectChams::ChamsColor(IClientEntity *entity) case ENTITY_PLAYER: if (!players) 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); if (health) { diff --git a/src/visual/EffectGlow.cpp b/src/visual/EffectGlow.cpp index 498f9515..1f7c3538 100644 --- a/src/visual/EffectGlow.cpp +++ b/src/visual/EffectGlow.cpp @@ -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", "Enable rainbow glow on self", "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 glowG(CV_INT, "glow_self_g", "200", "Self glow green", "", 0, 255); @@ -249,6 +250,11 @@ rgba_t EffectGlow::GlowColor(IClientEntity *entity) } break; 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) return colors::FromRGBA8(glowR, glowG, glowB, 255); if (health)