Added configureable Colors for PlayerESP and EntityESP

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 33b9fa13025e3fbb1546248a92ab62ed0204e59f..9c5e859b8058096fb71fdd2dfa0486407c1da7e2 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -2364,3 +2364,7 @@ enable_player_esp (PlayerESP) bool false
 enable_node_esp (NodeESP) bool false
 
 enable_node_tracers (NodeTracers) bool false
+
+entity_esp_color (EntityESP Color) v3f 255, 255, 255
+
+player_esp_color (PlayerESP Color) v3f 0, 255, 0

diff --git a/src/client/render/core.cpp b/src/client/render/core.cpp
index 6d1c68cd1f81ed07566c7bde57b37da95b2f10c9..794ec0186c08ebeb69b7a3b18292e9ce7892ab58 100644 (file)
--- a/src/client/render/core.cpp
+++ b/src/client/render/core.cpp
@@ -75,6 +75,10 @@ void RenderingCore::draw(video::SColor _skycolor, bool _show_hud, bool _show_min
        draw_player_tracers = g_settings->getBool("enable_player_tracers");
        draw_node_esp = g_settings->getBool("enable_node_esp");
        draw_node_tracers = g_settings->getBool("enable_node_tracers");
+       v3f entity_color = g_settings->getV3F("entity_esp_color");      
+       v3f player_color = g_settings->getV3F("player_esp_color");
+       entity_esp_color = video::SColor(255, entity_color.X, entity_color.Y, entity_color.Z);
+       player_esp_color = video::SColor(255, player_color.X, player_color.Y, player_color.Z);
        
        beforeDraw();
        drawAll();
@@ -109,6 +113,7 @@ void RenderingCore::drawTracersAndESP()
                        bool is_player = obj->isPlayer();
                        bool draw_esp = is_player ? draw_player_esp : draw_entity_esp;
                        bool draw_tracers = is_player ? draw_player_tracers : draw_entity_tracers;
+                       video::SColor color = is_player ? player_esp_color : entity_esp_color;
                        if (! (draw_esp || draw_tracers))
                                continue;
                        aabb3f box;
@@ -118,9 +123,9 @@ void RenderingCore::drawTracersAndESP()
                        box.MinEdge += pos;
                        box.MaxEdge += pos;
                        if (draw_esp)
-                               driver->draw3DBox(box, video::SColor(255, 255, 255, 255));
+                               driver->draw3DBox(box, color);
                        if (draw_tracers)
-                               driver->draw3DLine(eye_pos, box.getCenter(), video::SColor(255, 255, 255, 255));
+                               driver->draw3DLine(eye_pos, box.getCenter(), color);
                }
        }
        if (draw_node_esp || draw_node_tracers) {

diff --git a/src/client/render/core.h b/src/client/render/core.h
index 6137acd6226a52e900b583d8d909e1741f81a153..386c5a8407201ec351e4cdc4be4c1331b3969197 100644 (file)
--- a/src/client/render/core.h
+++ b/src/client/render/core.h
@@ -42,6 +42,8 @@ class RenderingCore
        bool draw_player_tracers;
        bool draw_node_esp;
        bool draw_node_tracers;
+       video::SColor entity_esp_color;
+       video::SColor player_esp_color;
 
        IrrlichtDevice *device;
        video::IVideoDriver *driver;

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 34851cfa1db3e8a757dc4cdc2e9fc9cf008420f8..3c4e5f82b46249f06f4e00eb090c169b00c8bb90 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -146,6 +146,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_player_tracers", "false");
        settings->setDefault("enable_node_esp", "false");
        settings->setDefault("enable_node_tracers", "false");
+       settings->setDefault("entity_esp_color", "(255, 255, 255)");
+       settings->setDefault("player_esp_color", "(0, 255, 0)");        
 
        // Keymap
        settings->setDefault("remote_port", "30000");