improved esp name settings

rdbo · Jan 19, 2021 · 0888872 · 0888872
1 parent 1928858
commit 0888872
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/src/base.cpp b/src/base.cpp
@@ -137,7 +137,8 @@ float   Base::Data::Settings::EspArmorColor[4] = { 0.0f, 0.0f, 0.8f, 1.0f };
 float   Base::Data::Settings::EspArmorDmgColor[4] = { 0.05, 0.0f, 0.0f, 1.0f };
 
 bool    Base::Data::Settings::EnableEspName = false;
-float   Base::Data::Settings::EspNameColor[4] = { 1.0f, 1.0f, 1.0f, 1.0f };
+float   Base::Data::Settings::EspNameColorTeam[4] = { 0.5f, 0.5f, 1.0f, 1.0f };
+float   Base::Data::Settings::EspNameColorEnemy[4] = { 1.0f, 0.5f, 0.5f, 1.0f };
 
 bool    Base::Data::Settings::EnableBunnyhop = false;
 bool    Base::Data::Settings::BunnyhopToggle = false;

diff --git a/src/base.h b/src/base.h
@@ -162,7 +162,8 @@ namespace Base
 			extern float   EspArmorDmgColor[4];
 
 			extern bool    EnableEspName;
-			extern float   EspNameColor[4];
+			extern float   EspNameColorTeam[4];
+			extern float   EspNameColorEnemy[4];
 
 			extern bool    EnableBunnyhop;
 			extern bool    BunnyhopToggle;

diff --git a/src/config.cpp b/src/config.cpp
@@ -106,7 +106,8 @@ bool Base::LoadConfig(std::string ConfigName)
 		READ_CONFIG_SETTINGS_BUF(EspArmorDmgColor);
 
 		READ_CONFIG_SETTINGS(EnableEspName);
-		READ_CONFIG_SETTINGS_BUF(EspNameColor);
+		READ_CONFIG_SETTINGS_BUF(EspNameColorTeam);
+		READ_CONFIG_SETTINGS_BUF(EspNameColorEnemy);
 
 		READ_CONFIG_SETTINGS(EnableBunnyhop);
 		READ_CONFIG_SETTINGS(BunnyhopToggle);
@@ -238,7 +239,8 @@ bool Base::SaveConfig(std::string ConfigName)
 		WRITE_CONFIG_SETTINGS(EspArmorDmgColor);
 
 		WRITE_CONFIG_SETTINGS(EnableEspName);
-		WRITE_CONFIG_SETTINGS(EspNameColor);
+		WRITE_CONFIG_SETTINGS(EspNameColorTeam);
+		WRITE_CONFIG_SETTINGS(EspNameColorEnemy);
 
 		WRITE_CONFIG_SETTINGS(EnableBunnyhop);
 		WRITE_CONFIG_SETTINGS(BunnyhopToggle);

diff --git a/src/hacks/ESP_Info.cpp b/src/hacks/ESP_Info.cpp
@@ -69,7 +69,11 @@ void Base::Hacks::ESP_Info(playerinfo_t* p_info)
 		size_t  TextLength = strlen(p_info->ent->name);
 		float   TextWidth = (float)TextLength * FontWidth;
 		float   TextHeight = FontHeight;
-		ImColor TextColor = ImColor(Data::Settings::EspNameColor[0], Data::Settings::EspNameColor[1], Data::Settings::EspNameColor[2], Data::Settings::EspNameColor[3]);
+		ImColor TextColor = ImColor(1.0f, 1.0f, 1.0f, 1.0f);
+		if(p_info->ent->team == Data::game.player1->team && (m_teammode || m_coop))
+			TextColor = ImColor(Data::Settings::EspNameColorTeam[0], Data::Settings::EspNameColorTeam[1], Data::Settings::EspNameColorTeam[2], Data::Settings::EspNameColorTeam[3]);
+		else
+			TextColor = ImColor(Data::Settings::EspNameColorEnemy[0], Data::Settings::EspNameColorEnemy[1], Data::Settings::EspNameColorEnemy[2], Data::Settings::EspNameColorEnemy[3]);
 		ImVec2  TextPos = ImVec2(p_info->pos2D.x - (TextWidth / 2), p_info->pos2D.y - Height - SpaceUp - TextHeight);
 
 		Draw->AddText(TextPos, TextColor, (const char*)p_info->ent->name);

diff --git a/src/hooks/SwapBuffers.cpp b/src/hooks/SwapBuffers.cpp
@@ -321,7 +321,10 @@ BOOL __stdcall Base::Hooks::SwapBuffers(_In_ HDC hdc)
 			{
 				if (ImGui::TreeNode("ESP Name Settings"))
 				{
-					ImGui::ColorEdit4("ESP Name Color", Data::Settings::EspNameColor);
+					if(Data::Settings::EnableEspTeam)
+						ImGui::ColorEdit4("ESP Name Color Team", Data::Settings::EspNameColorTeam);
+					if (Data::Settings::EnableEspEnemy)
+						ImGui::ColorEdit4("ESP Name Color Enemy", Data::Settings::EspNameColorEnemy);
 					ImGui::TreePop();
 				}
 			}