EntityESP, EntityTracers, PlayerESP, PlayerTracers

6 files changed, 32 insertions, 30 deletions

diff --git a/src/client/game.cpp b/src/client/game.cpp
index cc2a1bc43..c3162b65d 100644
--- 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 44e3ed744..6d1c68cd1 100644
--- 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 2040155a6..6137acd62 100644
--- a/src/client/render/core.h
+++ b/src/client/render/core.h
@@ -36,8 +36,10 @@ protected:
 	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 @@ public:
 
 	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 e6d25d4ee..f5aca8f58 100644
--- 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 99aa3c678..34cc60630 100644
--- a/src/client/renderingengine.h
+++ b/src/client/renderingengine.h
@@ -117,10 +117,10 @@ public:
 	}
 
 	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 @@ private:
 			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 8050b533c..34851cfa1 100644
--- 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");