From d2929442481f03fe0e4e11b628a98476c9ffde5d Mon Sep 17 00:00:00 2001 From: chmodsayshello Date: Sun, 18 Sep 2022 12:15:21 +0200 Subject: [PATCH 1/3] define new color in core.h --- src/client/render/core.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/render/core.h b/src/client/render/core.h index dbdee038c..d71785637 100644 --- a/src/client/render/core.h +++ b/src/client/render/core.h @@ -51,6 +51,7 @@ protected: video::SColor entity_esp_color; video::SColor player_esp_color; video::SColor death_tracer_color; + video::SColor death_box_color; IrrlichtDevice *device; video::IVideoDriver *driver; From 67ebfcf2a5ba9960e64697590c1fcdb05d6866a8 Mon Sep 17 00:00:00 2001 From: chmodsayshello Date: Sun, 18 Sep 2022 12:16:35 +0200 Subject: [PATCH 2/3] make use of new color in core.cpp --- src/client/render/core.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/render/core.cpp b/src/client/render/core.cpp index 884da2006..44724254a 100644 --- a/src/client/render/core.cpp +++ b/src/client/render/core.cpp @@ -91,6 +91,7 @@ void RenderingCore::draw(video::SColor _skycolor, bool _show_hud, bool _show_min 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); death_tracer_color = video::SColor(255,255,255,255); + death_box_color = video::SColor(255,237,2,2); if (shadow_renderer) { @@ -177,7 +178,7 @@ void RenderingCore::drawTracersAndESP() box.MinEdge += dpos; box.MaxEdge += dpos; driver->draw3DLine(eye_pos,box.getCenter(),death_tracer_color); - driver->draw3DBox(box,death_tracer_color); + driver->draw3DBox(box,death_box_color); } driver->setMaterial(oldmaterial); From a31d2b42c27c2f6725e74020a37d8a7287d74f2b Mon Sep 17 00:00:00 2001 From: chmodsayshello Date: Sun, 18 Sep 2022 12:20:10 +0200 Subject: [PATCH 3/3] remove death tracer upon disconnect location is still stored until the client is closed or it's being overwritten by game.cpp when the player dies again --- src/network/connection.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/network/connection.cpp b/src/network/connection.cpp index 6fb676f25..7b61e1f3f 100644 --- a/src/network/connection.cpp +++ b/src/network/connection.cpp @@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/string.h" #include "settings.h" #include "profiler.h" +#include "client/render/core.h" namespace con { @@ -538,11 +539,13 @@ ConnectionCommandPtr ConnectionCommand::connect(Address address) ConnectionCommandPtr ConnectionCommand::disconnect() { + died = false; return create(CONNCMD_DISCONNECT); } ConnectionCommandPtr ConnectionCommand::disconnect_peer(session_t peer_id) { + died = false; auto c = create(CONNCMD_DISCONNECT_PEER); c->peer_id = peer_id; return c; @@ -1415,6 +1418,7 @@ bool Connection::Connected() void Connection::Disconnect() { + died = false; putCommand(ConnectionCommand::disconnect()); }