From 605d7e789774202b94ff24aa0512c6eff42b2b2f Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Thu, 5 Dec 2024 22:36:12 +0300
Subject: [PATCH] small fixes

---
 src/graphics/ui/elements/Menu.hpp |  2 +-
 src/graphics/ui/gui_xml.cpp       | 16 ++++++++++++----
 src/graphics/ui/gui_xml.hpp       |  2 +-
 src/items/Inventory.cpp           |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/graphics/ui/elements/Menu.hpp b/src/graphics/ui/elements/Menu.hpp
index cbfd84d0..5a201c01 100644
--- a/src/graphics/ui/elements/Menu.hpp
+++ b/src/graphics/ui/elements/Menu.hpp
@@ -7,7 +7,7 @@
 namespace gui {
     struct Page {
         std::string name;
-        std::shared_ptr<UINode> panel = nullptr;
+        std::shared_ptr<UINode> panel;
     };
 
     using page_loader_func = std::function<std::shared_ptr<UINode>(const std::string& name)>;
diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp
index 93fc6b29..c24d89dd 100644
--- a/src/graphics/ui/gui_xml.cpp
+++ b/src/graphics/ui/gui_xml.cpp
@@ -189,7 +189,9 @@ void UiXmlReader::readUINode(UiXmlReader& reader, const xml::xmlelement& element
     _readContainer(reader, element, container);
 }
 
-void UiXmlReader::readUINode(UiXmlReader& reader, const xml::xmlelement& element, UINode& node) {
+void UiXmlReader::readUINode(
+    const UiXmlReader& reader, const xml::xmlelement& element, UINode& node
+) {
     _readUINode(reader, element, node);
 }
 
@@ -246,7 +248,9 @@ static std::wstring readAndProcessInnerText(const xml::xmlelement& element, cons
     return text;
 }
 
-static std::shared_ptr<UINode> readLabel(UiXmlReader& reader, const xml::xmlelement& element) {
+static std::shared_ptr<UINode> readLabel(
+    const UiXmlReader& reader, const xml::xmlelement& element
+) {
     std::wstring text = readAndProcessInnerText(element, reader.getContext());
     auto label = std::make_shared<Label>(text);
     _readUINode(reader, element, *label);
@@ -423,14 +427,18 @@ static std::shared_ptr<UINode> readTextBox(UiXmlReader& reader, const xml::xmlel
     return textbox;
 }
 
-static std::shared_ptr<UINode> readImage(UiXmlReader& reader, const xml::xmlelement& element) {
+static std::shared_ptr<UINode> readImage(
+    const UiXmlReader& reader, const xml::xmlelement& element
+) {
     std::string src = element.attr("src", "").getText();
     auto image = std::make_shared<Image>(src);
     _readUINode(reader, element, *image);
     return image;
 }
 
-static std::shared_ptr<UINode> readTrackBar(UiXmlReader& reader, const xml::xmlelement& element) {
+static std::shared_ptr<UINode> readTrackBar(
+    const UiXmlReader& reader, const xml::xmlelement& element
+) {
     const auto& env = reader.getEnvironment();
     const auto& file = reader.getFilename();
     float minv = element.attr("min", "0.0").asFloat();
diff --git a/src/graphics/ui/gui_xml.hpp b/src/graphics/ui/gui_xml.hpp
index 84259360..75875b82 100644
--- a/src/graphics/ui/gui_xml.hpp
+++ b/src/graphics/ui/gui_xml.hpp
@@ -30,7 +30,7 @@ namespace gui {
         std::shared_ptr<UINode> readUINode(const xml::xmlelement& element);
         
         void readUINode(
-            UiXmlReader& reader, 
+            const UiXmlReader& reader, 
             const xml::xmlelement& element,
             UINode& node
         );
diff --git a/src/items/Inventory.cpp b/src/items/Inventory.cpp
index 00d74e53..00c5589e 100644
--- a/src/items/Inventory.cpp
+++ b/src/items/Inventory.cpp
@@ -5,7 +5,7 @@
 Inventory::Inventory(int64_t id, size_t size) : id(id), slots(size) {
 }
 
-Inventory::Inventory(const Inventory& orig) {
+Inventory::Inventory(const Inventory& orig) : id(0) {
     this->slots = orig.slots;
 }