Merge branch 'main' into main

src/frontend/gui/controls.cpp

@@ -361,10 +361,18 @@ std::wstring TextBox::getText() const {
     return input;
 }
 
-void TextBox::setText(std::wstring value) {
+void TextBox::setText(const std::wstring value) {
     this->input = value;
 }
 
+std::wstring TextBox::getPlaceholder() const {
+    return placeholder;
+}
+
+void TextBox::setPlaceholder(const std::wstring& placeholder) {
+    this->placeholder = placeholder;
+}
+
 // ============================== InputBindBox ================================
 InputBindBox::InputBindBox(Binding& binding, glm::vec4 padding) 
     : Panel(glm::vec2(100,32), padding, 0),

src/frontend/gui/controls.h

@@ -122,6 +122,8 @@ namespace gui {
         virtual std::wstring getText() const;
         /* Set TextBox content text */
         virtual void setText(std::wstring value);
+        virtual std::wstring getPlaceholder() const;
+        virtual void setPlaceholder(const std::wstring&);
         virtual bool validate();
         virtual void setValid(bool valid);
         virtual bool isValid() const;

src/frontend/hud.cpp

@@ -645,6 +645,6 @@ void Hud::setPause(bool pause) {
     menu->setVisible(pause);
 }
 
-Player* Hud::getPlayer() const {
+std::shared_ptr<Player> Hud::getPlayer() const {
     return frontend->getLevel()->player;
 }

src/frontend/hud.h

@@ -118,7 +118,7 @@ public:
 	void remove(HudElement& element);
     void remove(std::shared_ptr<gui::UINode> node);
 
-    Player* getPlayer() const;
+    std::shared_ptr<Player> getPlayer() const;
 };
 
 #endif /* SRC_HUD_H_ */