From 3004bca85c245c2ec77c4c1bd9343c96191c7ccf Mon Sep 17 00:00:00 2001 From: Clyne Sullivan <clyne@bitgloo.com> Date: Sun, 1 Sep 2019 14:45:42 -0400 Subject: made all formatting match --- src/components/Name.hpp | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'src/components/Name.hpp') diff --git a/src/components/Name.hpp b/src/components/Name.hpp index c472cbb..94b7531 100644 --- a/src/components/Name.hpp +++ b/src/components/Name.hpp @@ -15,29 +15,30 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NAME_HPP_ -#define NAME_HPP_ +#ifndef COMPONENT_NAME_HPP_ +#define COMPONENT_NAME_HPP_ -#include "components/Component.hpp" +#include "Component.hpp" #include <string> struct Name : Component<Name>, entityx::Component<Name> { - public: - std::string name; - Name(std::string _name) : name(_name) {} - Name(void): name() {}; - - Name FromLua(sol::object ref) - { - if (ref.get_type() == sol::type::string) { - this->name = ref.as<std::string>(); - } else { - throw std::string("Name component not formatted properly"); - } - return *this; - } +public: + std::string name; + Name(std::string _name = std::string()) : + name(_name) {} + + Name FromLua(sol::object ref) + { + if (ref.get_type() == sol::type::string) + this->name = ref.as<std::string>(); + else + throw std::string("Name component not formatted properly"); + + return *this; + } }; -#endif//NAME_HPP_ +#endif // COMPONENT_NAME_HPP_ + -- cgit v1.2.3