From 537a0ca358b80ad0f53877801ddb1824ae4a9151 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Fri, 2 Feb 2024 23:19:06 +0300
Subject: [PATCH] clang warnings fix

---
 src/content/Content.cpp       |  4 ++--
 src/frontend/gui/gui_util.cpp | 12 ++++++------
 src/frontend/gui/panels.cpp   | 12 +++---------
 src/frontend/gui/panels.h     |  5 ++---
 src/frontend/hud.cpp          |  4 ++--
 src/frontend/menu.cpp         | 10 +++++-----
 src/frontend/screens.cpp      |  2 +-
 7 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/src/content/Content.cpp b/src/content/Content.cpp
index aa98de9a..cdf03842 100644
--- a/src/content/Content.cpp
+++ b/src/content/Content.cpp
@@ -71,7 +71,7 @@ Content* ContentBuilder::build() {
         
         // Generating runtime info
         def->rt.id = blockDefsIndices.size();
-        def->rt.emissive = *((uint32_t*)def->emission);
+        def->rt.emissive = *reinterpret_cast<uint32_t*>(def->emission);
         def->rt.solid = def->model == BlockModel::block;
 
         if (def->rotatable) {
@@ -95,7 +95,7 @@ Content* ContentBuilder::build() {
         
         // Generating runtime info
         def->rt.id = itemDefsIndices.size();
-        def->rt.emissive = *((uint32_t*)def->emission);
+        def->rt.emissive = *reinterpret_cast<uint32_t*>(def->emission);
         itemDefsIndices.push_back(def);
     }
 
diff --git a/src/frontend/gui/gui_util.cpp b/src/frontend/gui/gui_util.cpp
index cced5bd8..73b01d39 100644
--- a/src/frontend/gui/gui_util.cpp
+++ b/src/frontend/gui/gui_util.cpp
@@ -26,13 +26,13 @@ std::shared_ptr<Button> guiutil::gotoButton(
 ) {
     text = langs::get(text, L"menu");
     return std::make_shared<Button>(text, vec4(10.f), [=](GUI* gui) {
-        menu->set(page);
+        menu->setPage(page);
     });
 }
 
 void guiutil::alert(GUI* gui, const std::wstring& text, runnable on_hidden) {
     auto menu = gui->getMenu();
-    Panel* panel = new Panel(vec2(500, 200), vec4(8.0f), 8.0f);
+    auto panel = std::make_shared<Panel>(vec2(500, 200), vec4(8.0f), 8.0f);
     panel->setColor(vec4(0.0f, 0.0f, 0.0f, 0.5f));
     
     // TODO: implement built-in text wrapping
@@ -63,8 +63,8 @@ void guiutil::alert(GUI* gui, const std::wstring& text, runnable on_hidden) {
         }
     ));
     panel->refresh();
-    menu->add("<alert>", panel);
-    menu->set("<alert>");
+    menu->addPage("<alert>", panel);
+    menu->setPage("<alert>");
 }
 
 void guiutil::confirm(
@@ -96,6 +96,6 @@ void guiutil::confirm(
     panel->add(subpanel);
 
     panel->refresh();
-    menu->add("<confirm>", panel);
-    menu->set("<confirm>");
+    menu->addPage("<confirm>", panel);
+    menu->setPage("<confirm>");
 }
diff --git a/src/frontend/gui/panels.cpp b/src/frontend/gui/panels.cpp
index 8ac5c593..92c32168 100644
--- a/src/frontend/gui/panels.cpp
+++ b/src/frontend/gui/panels.cpp
@@ -213,8 +213,6 @@ void Panel::refresh() {
             node->setCoord(vec2(x, y+margin.y));
             x += nodesize.x + margin.z + interval;
             
-            float height = size.y - padding.y - padding.w - margin.y - margin.w;
-            //node->setSize(vec2(nodesize.x, height));
             node->refresh();
             maxh = fmax(maxh, y+margin.y+node->getSize().y+margin.w+padding.w);
         }
@@ -243,15 +241,11 @@ bool PagesControl::has(std::string name) {
     return pages.find(name) != pages.end();
 }
 
-void PagesControl::add(std::string name, std::shared_ptr<UINode> panel) {
+void PagesControl::addPage(std::string name, std::shared_ptr<UINode> panel) {
     pages[name] = Page{panel};
 }
 
-void PagesControl::add(std::string name, UINode* panel) {
-    add(name, std::shared_ptr<UINode>(panel));
-}
-
-void PagesControl::set(std::string name, bool history) {
+void PagesControl::setPage(std::string name, bool history) {
     auto found = pages.find(name);
     if (found == pages.end()) {
         throw std::runtime_error("no page found");
@@ -273,7 +267,7 @@ void PagesControl::back() {
         return;
     std::string name = pageStack.top();
     pageStack.pop();
-    set(name, false);
+    setPage(name, false);
 }
 
 Page& PagesControl::current() {
diff --git a/src/frontend/gui/panels.h b/src/frontend/gui/panels.h
index 0d694ca7..9ffce89a 100644
--- a/src/frontend/gui/panels.h
+++ b/src/frontend/gui/panels.h
@@ -93,9 +93,8 @@ namespace gui {
         PagesControl();
 
         bool has(std::string name);
-        void set(std::string name, bool history=true);
-        void add(std::string name, std::shared_ptr<UINode> panel);
-        void add(std::string name, UINode* panel);
+        void setPage(std::string name, bool history=true);
+        void addPage(std::string name, std::shared_ptr<UINode> panel);
         void back();
         void clearHistory();
         void reset();
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index d6c9ee89..d4219d19 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -68,7 +68,7 @@ std::shared_ptr<UINode> HudRenderer::createDebugPanel(Engine* engine) {
     });
     panel->setCoord(vec2(10, 10));
     panel->add(create_label([this](){ return L"fps: "+this->fpsString;}));
-    panel->add(create_label([this](){
+    panel->add(create_label([](){
         return L"meshes: " + std::to_wstring(Mesh::meshesCount);
     }));
     panel->add(create_label([=](){
@@ -336,7 +336,7 @@ void HudRenderer::update(bool visible) {
             closeInventory();
         } else {
             pause = true;
-            menu->set("pause");
+            menu->setPage("pause");
         }
     }
     if (visible && Events::jactive(BIND_HUD_INVENTORY)) {
diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp
index bb60a2b4..c76b10ad 100644
--- a/src/frontend/menu.cpp
+++ b/src/frontend/menu.cpp
@@ -66,7 +66,7 @@ static std::shared_ptr<Panel> create_page(
         vec2(width, 200), vec4(8.0f), interval
     );
     panel->setColor(vec4(0.0f, 0.0f, 0.0f, opacity));
-    menu->add(name, panel);
+    menu->addPage(name, panel);
     return panel;
 }
 
@@ -120,7 +120,7 @@ static void show_content_missing(
             menu->back();
         }
     ));
-    menu->set("missing-content");
+    menu->setPage("missing-content");
 }
 
 void show_convert_request(
@@ -372,8 +372,8 @@ void create_content_panel(Engine* engine) {
             engine->setScreen(std::make_shared<MenuScreen>(engine));
             open_world(wname, engine);
         });
-        menu->add("content-packs", panel);
-        menu->set("content-packs");
+        menu->addPage("content-packs", panel);
+        menu->setPage("content-packs");
     }));
     mainPanel->add(guiutil::backButton(menu));
 }
@@ -611,7 +611,7 @@ void create_pause_panel(Engine* engine) {
     }));
     panel->add(create_button(L"Content", vec4(10.0f), vec4(1), [=](GUI*) {
         create_content_panel(engine);
-        menu->set("content");
+        menu->setPage("content");
     }));
     panel->add(guiutil::gotoButton(L"Settings", "settings", menu));
 
diff --git a/src/frontend/screens.cpp b/src/frontend/screens.cpp
index ede6277e..475d3d86 100644
--- a/src/frontend/screens.cpp
+++ b/src/frontend/screens.cpp
@@ -47,7 +47,7 @@ MenuScreen::MenuScreen(Engine* engine_) : Screen(engine_) {
     auto menu = engine->getGUI()->getMenu();
     menus::refresh_menus(engine);
     menu->reset();
-    menu->set("main");
+    menu->setPage("main");
 
     uicamera.reset(new Camera(glm::vec3(), Window::height));
     uicamera->perspective = false;