From 4997202edc8b6d31616c238112dbb14ad2f4dd36 Mon Sep 17 00:00:00 2001
From: Vectozavr <60608292+vectozavr@users.noreply.github.com>
Date: Sun, 3 Oct 2021 11:52:30 +0700
Subject: [PATCH] struct Button -> class Button

---
 Client.h      | 2 +-
 Player.h      | 1 -
 engine/Mesh.h | 6 ++----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Client.h b/Client.h
index ef20ef9..e6f51fd 100755
--- a/Client.h
+++ b/Client.h
@@ -23,7 +23,7 @@ private:
     std::function<void(const std::string&, const Point4D&)> _addBonusCallBack;
     std::function<void(const std::string&)> _removeBonusCallBack;
 public:
-    Client(std::shared_ptr<Player>  player) : _player(player){};
+    explicit Client(std::shared_ptr<Player>  player) : _player(player){};
 
     void updatePacket() override;
 
diff --git a/Player.h b/Player.h
index 7274184..1ae3bfb 100755
--- a/Player.h
+++ b/Player.h
@@ -46,7 +46,6 @@ private:
     std::function<void(sf::Uint16 targetId, double)> _damagePlayerCallBack;
     std::function<void(const Point4D&, const Point4D&)> _addTraceCallBack;
     std::function<void(const std::string&)> _takeBonusCallBack;
-    std::function<void(const std::string&)> _fireCallBack;
 
     std::function<void(std::shared_ptr<Weapon>)> _addWeaponCallBack;
     std::function<void(std::shared_ptr<Weapon>)> _removeWeaponCallBack;
diff --git a/engine/Mesh.h b/engine/Mesh.h
index 4d29e8c..7363a07 100755
--- a/engine/Mesh.h
+++ b/engine/Mesh.h
@@ -45,14 +45,12 @@ public:
     [[nodiscard]] sf::Color color() const { return _color; }
     void setColor(sf::Color c);
 
-    Mesh static Obj(const std::string& filename);
-    Mesh static LineTo(const Point4D& from, const Point4D& to, double line_width = 0.1, sf::Color color = {150, 150, 150, 255});
-
     void setVisible(bool visibility) { _visible = visibility; }
     [[nodiscard]] bool isVisible() const { return _visible; }
 
+    Mesh static Obj(const std::string& filename);
     std::vector<std::shared_ptr<Mesh>> static LoadObjects(const std::string& filename, const std::string &materials = "", const Point4D& scale = Point4D{1, 1, 1});
+    Mesh static LineTo(const Point4D& from, const Point4D& to, double line_width = 0.1, sf::Color color = {150, 150, 150, 255});
 };
 
-
 #endif //INC_3DZAVR_MESH_H