From 7601bfad3a37389fffcd89bd4d4ed8565da90870 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 6 Mar 2024 11:30:33 +0300 Subject: [PATCH] minor refactor --- src/frontend/hud.cpp | 9 ++++----- src/frontend/hud.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp index 8382e61c..29b8988e 100644 --- a/src/frontend/hud.cpp +++ b/src/frontend/hud.cpp @@ -240,7 +240,7 @@ Hud::~Hud() { // removing all controlled ui gui->remove(grabbedItemView); for (auto& element : elements) { - remove(element); + onRemove(element); } gui->remove(hotbarView); gui->remove(darkOverlay); @@ -331,7 +331,7 @@ void Hud::update(bool visible) { for (auto& element : elements) { element.update(pause, inventoryOpen, player->debug); if (element.isRemoved()) { - remove(element); + onRemove(element); } } } @@ -440,7 +440,7 @@ void Hud::add(HudElement element) { elements.push_back(element); } -void Hud::remove(HudElement& element) { +void Hud::onRemove(HudElement& element) { auto document = element.getDocument(); if (document) { Inventory* inventory = nullptr; @@ -456,12 +456,11 @@ void Hud::remove(HudElement& element) { gui->remove(element.getNode()); } -// todo: refactor this garbage void Hud::remove(std::shared_ptr node) { for (auto& element : elements) { if (element.getNode() == node) { element.setRemoved(); - remove(element); + onRemove(element); } } cleanup(); diff --git a/src/frontend/hud.h b/src/frontend/hud.h index b3bc6c83..3976890e 100644 --- a/src/frontend/hud.h +++ b/src/frontend/hud.h @@ -148,7 +148,7 @@ public: void openPermanent(UiDocument* doc); void add(HudElement element); - void remove(HudElement& element); + void onRemove(HudElement& element); void remove(std::shared_ptr node); Player* getPlayer() const;