EntityESP, EntityTracers, PlayerESP, PlayerTracers

diff --git a/builtin/client/cheats/init.lua b/builtin/client/cheats/init.lua
index 4f4d33d86cee9e96612eef059176932898b2e289..f1cfedfef7f64ab6dfed4712a124f3c5fa7b10e2 100644 (file)
--- a/builtin/client/cheats/init.lua
+++ b/builtin/client/cheats/init.lua
@@ -8,7 +8,6 @@ core.cheats = {
                ["CrystalPvP"] = "crystal_pvp",
                ["AutoTotem"] = "autototem",
                ["ThroughWalls"] = "dont_point_nodes",
-               ["OnlyTracePlayers"] = "only_trace_players",
                ["AutoHit"] = "autohit",
        },
        ["Movement"] = {
@@ -33,11 +32,13 @@ core.cheats = {
                ["NoHurtCam"] = "no_hurt_cam",
                ["BrightNight"] = "no_night",
                ["Coords"] = "coords",
-               ["Tracers"] = "enable_tracers",
-               ["ESP"] = "enable_esp",
-               ["NodeTracers"] = "enable_node_tracers",
-               ["NodeESP"] = "enable_node_esp",
                ["CheatHUD"] = "cheat_hud",
+               ["EntityESP"] = "enable_entity_esp",
+               ["EntityTracers"] = "enable_entity_tracers",
+               ["PlayerESP"] = "enable_player_esp",
+               ["PlayerTracers"] = "enable_player_tracers",
+               ["NodeESP"] = "enable_node_esp",
+               ["NodeTracers"] = "enable_node_tracers",
        },
        ["World"] = {
                ["FastDig"] = "fastdig",

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 49a15f4ffd65fa9fdf12179d7dd016ec70e94de7..33b9fa13025e3fbb1546248a92ab62ed0204e59f 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -2279,10 +2279,6 @@ spamclick (FastHit) bool false
 
 no_force_rotate (NoForceRotate) bool false
 
-enable_tracers (Tracers) bool false
-
-enable_esp (ESP) bool false
-
 no_slow (NoSlow) bool false
 
 ignore_status_messages (IgnoreStatus) bool true
@@ -2335,14 +2331,8 @@ friendlist (Killaura / Forcefield Friendlist) string
 
 cheat_hud (CheatHUD) bool true
 
-enable_node_esp (NodeESP) bool false
-
-enable_node_tracers (NodeTracers) bool false
-
 node_esp_nodes (NodeESP Nodes) string
 
-only_trace_players (OnlyTracePlayers) bool false
-
 autosprint (AutoSprint) bool false
 
 override_speed (SpeedOverride) bool false
@@ -2362,3 +2352,15 @@ jetpack (JetPack) bool false
 autohit (AutoHit) bool false
 
 antislip (AntiSlip) bool false
+
+enable_entity_tracers (EntityTracers) bool false
+
+enable_entity_esp (EntityESP) bool false
+
+enable_player_tracers (PlayerTracers) bool false
+
+enable_player_esp (PlayerESP) bool false
+
+enable_node_esp (NodeESP) bool false
+
+enable_node_tracers (NodeTracers) bool false

diff --git a/src/client/game.cpp b/src/client/game.cpp
index cc2a1bc43dd65ed8ebbec04c15b7470831be2a55..c3162b65d1e95d7c58c781245594f1993b6bc615 100644 (file)
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -3183,7 +3183,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime,
        }
 #endif
        RenderingEngine::draw_scene(skycolor, m_game_ui->m_flags.show_hud,
-                       m_game_ui->m_flags.show_minimap, draw_wield_tool, draw_crosshair, g_settings->getBool("enable_esp"), g_settings->getBool("enable_tracers"), g_settings->getBool("enable_node_esp"), g_settings->getBool("enable_node_tracers"));
+                       m_game_ui->m_flags.show_minimap, draw_wield_tool, draw_crosshair);
 
        /*
                Profiler graph

diff --git a/src/client/render/core.cpp b/src/client/render/core.cpp
index 44e3ed7447a0cc5908c73562a86b07146cb31ffc..6d1c68cd1f81ed07566c7bde57b37da95b2f10c9 100644 (file)
--- a/src/client/render/core.cpp
+++ b/src/client/render/core.cpp
@@ -57,7 +57,7 @@ void RenderingCore::updateScreenSize()
 }
 
 void RenderingCore::draw(video::SColor _skycolor, bool _show_hud, bool _show_minimap,
-               bool _draw_wield_tool, bool _draw_crosshair, bool _draw_esp, bool _draw_tracers, bool _draw_node_esp, bool _draw_node_tracers)
+               bool _draw_wield_tool, bool _draw_crosshair)
 {
        v2u32 ss = driver->getScreenSize();
        if (screensize != ss) {
@@ -69,19 +69,19 @@ void RenderingCore::draw(video::SColor _skycolor, bool _show_hud, bool _show_min
        show_minimap = _show_minimap;
        draw_wield_tool = _draw_wield_tool;
        draw_crosshair = _draw_crosshair;
-       draw_esp = _draw_esp;
-       draw_tracers = _draw_tracers;
-       draw_node_esp = _draw_node_esp;
-       draw_node_tracers = _draw_node_tracers;
-               
+       draw_entity_esp = g_settings->getBool("enable_entity_esp");
+       draw_entity_tracers = g_settings->getBool("enable_entity_tracers");
+       draw_player_esp = g_settings->getBool("enable_player_esp");
+       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");
+       
        beforeDraw();
        drawAll();
 }
 
 void RenderingCore::drawTracersAndESP()
-{
-       bool only_trace_players = g_settings->getBool("only_trace_players");
-       
+{      
        ClientEnvironment &env = client->getEnv();
        Camera *camera = client->getCamera();
        
@@ -97,9 +97,8 @@ void RenderingCore::drawTracersAndESP()
        material.setFlag(video::EMF_ZWRITE_ENABLE, false);
        driver->setMaterial(material);
        
-       if (draw_esp || draw_tracers) {
+       if (draw_entity_esp || draw_entity_tracers || draw_player_esp || draw_player_tracers) {
                auto allObjects = env.getAllActiveObjects();
-
                for (auto &it : allObjects) {
                        ClientActiveObject *cao = it.second;
                        if (cao->isLocalPlayer() || cao->getParent())
@@ -107,7 +106,10 @@ void RenderingCore::drawTracersAndESP()
                        GenericCAO *obj = dynamic_cast<GenericCAO *>(cao);
                        if (! obj)
                                continue;
-                       if (only_trace_players && ! obj->isPlayer())
+                       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;
+                       if (! (draw_esp || draw_tracers))
                                continue;
                        aabb3f box;
                        if (! obj->getSelectionBox(&box))
@@ -123,10 +125,8 @@ void RenderingCore::drawTracersAndESP()
        }
        if (draw_node_esp || draw_node_tracers) {
                Map &map = env.getMap();
-
                std::vector<v3s16> positions;
                map.listAllLoadedBlocks(positions);
-
                for (v3s16 blockp : positions) {
                        MapBlock *block = map.getBlockNoCreate(blockp);
                        if (! block->mesh)
@@ -159,7 +159,7 @@ void RenderingCore::draw3D()
        if (!show_hud)
                return;
        hud->drawSelectionMesh();
-       if (draw_esp || draw_tracers || draw_node_esp || draw_node_tracers)
+       if (draw_entity_esp || draw_entity_tracers || draw_player_esp || draw_player_tracers || draw_node_esp || draw_node_tracers)
                drawTracersAndESP();
        if (draw_wield_tool)
                camera->drawWieldedTool();

diff --git a/src/client/render/core.h b/src/client/render/core.h
index 2040155a6ab2494a4ed6b15e55662edd4141188c..6137acd6226a52e900b583d8d909e1741f81a153 100644 (file)
--- a/src/client/render/core.h
+++ b/src/client/render/core.h
@@ -36,8 +36,10 @@ class RenderingCore
        bool show_minimap;
        bool draw_wield_tool;
        bool draw_crosshair;
-       bool draw_esp;
-       bool draw_tracers;
+       bool draw_entity_esp;
+       bool draw_entity_tracers;
+       bool draw_player_esp;
+       bool draw_player_tracers;
        bool draw_node_esp;
        bool draw_node_tracers;
 
@@ -74,8 +76,7 @@ class RenderingCore
 
        void initialize();
        void draw(video::SColor _skycolor, bool _show_hud, bool _show_minimap,
-                       bool _draw_wield_tool, bool _draw_crosshair, bool _draw_esp,
-                       bool _draw_tracers, bool _draw_node_esp, bool _draw_node_tracers);
+                       bool _draw_wield_tool, bool _draw_crosshair);
 
        inline v2u32 getVirtualSize() const { return virtual_size; }
 };

diff --git a/src/client/renderingengine.cpp b/src/client/renderingengine.cpp
index e6d25d4ee8884d8525a78443879e59ba95700df6..f5aca8f58f82a82b514f80995b879d3a83fc4555 100644 (file)
--- a/src/client/renderingengine.cpp
+++ b/src/client/renderingengine.cpp
@@ -604,9 +604,9 @@ void RenderingEngine::_finalize()
 }
 
 void RenderingEngine::_draw_scene(video::SColor skycolor, bool show_hud,
-               bool show_minimap, bool draw_wield_tool, bool draw_crosshair, bool draw_esp, bool draw_tracers, bool draw_node_esp, bool draw_node_tracers)
+               bool show_minimap, bool draw_wield_tool, bool draw_crosshair)
 {
-       core->draw(skycolor, show_hud, show_minimap, draw_wield_tool, draw_crosshair, draw_esp, draw_tracers, draw_node_esp, draw_node_tracers);
+       core->draw(skycolor, show_hud, show_minimap, draw_wield_tool, draw_crosshair);
 }
 
 const char *RenderingEngine::getVideoDriverName(irr::video::E_DRIVER_TYPE type)

diff --git a/src/client/renderingengine.h b/src/client/renderingengine.h
index 99aa3c6784d405b47879d4dc9983c469b06c036b..34cc606300e098fc90c80b1430466c718c4d2aeb 100644 (file)
--- a/src/client/renderingengine.h
+++ b/src/client/renderingengine.h
@@ -117,10 +117,10 @@ class RenderingEngine
        }
 
        inline static void draw_scene(video::SColor skycolor, bool show_hud,
-                       bool show_minimap, bool draw_wield_tool, bool draw_crosshair, bool draw_esp, bool draw_tracers, bool draw_node_esp, bool draw_node_tracers)
+                       bool show_minimap, bool draw_wield_tool, bool draw_crosshair)
        {
                s_singleton->_draw_scene(skycolor, show_hud, show_minimap,
-                               draw_wield_tool, draw_crosshair, draw_esp, draw_tracers, draw_node_esp, draw_node_tracers);
+                               draw_wield_tool, draw_crosshair);
        }
 
        inline static void initialize(Client *client, Hud *hud)
@@ -148,7 +148,7 @@ class RenderingEngine
                        bool clouds = true);
 
        void _draw_scene(video::SColor skycolor, bool show_hud, bool show_minimap,
-                       bool draw_wield_tool, bool draw_crosshair, bool draw_esp, bool draw_tracers, bool draw_node_esp, bool draw_node_tracers);
+                       bool draw_wield_tool, bool draw_crosshair);
 
        void _initialize(Client *client, Hud *hud);
 

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 8050b533c82aed961c5f16f8aa4548f5990cad46..34851cfa1db3e8a757dc4cdc2e9fc9cf008420f8 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -102,8 +102,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("log_particles", "false");
        settings->setDefault("spamclick", "false");
        settings->setDefault("no_force_rotate", "false");
-       settings->setDefault("enable_tracers", "false");
-       settings->setDefault("enable_esp", "false");
        settings->setDefault("no_slow", "false");
        settings->setDefault("float_above_parent", "false");
        settings->setDefault("ignore_status_messages", "true");
@@ -131,10 +129,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("forcefield", "false");
        settings->setDefault("friendlist", "");
        settings->setDefault("cheat_hud", "true");
-       settings->setDefault("enable_node_esp", "false");
-       settings->setDefault("enable_node_tracers", "false");
        settings->setDefault("node_esp_nodes", "");
-       settings->setDefault("only_trace_players", "false");
        settings->setDefault("autosprint", "false");
        settings->setDefault("override_speed", "false");
        settings->setDefault("override_jump", "false");
@@ -145,6 +140,12 @@ void set_default_settings(Settings *settings)
        settings->setDefault("jetpack", "false");
        settings->setDefault("autohit", "false");
        settings->setDefault("antislip", "false");
+       settings->setDefault("enable_entity_esp", "false");
+       settings->setDefault("enable_entity_tracers", "false");
+       settings->setDefault("enable_player_esp", "false");
+       settings->setDefault("enable_player_tracers", "false");
+       settings->setDefault("enable_node_esp", "false");
+       settings->setDefault("enable_node_tracers", "false");
 
        // Keymap
        settings->setDefault("remote_port", "30000");