fix serialization support

2 files changed, 8 insertions, 26 deletions

diff --git a/src/components/Script.hpp b/src/components/Script.hpp
index d7bc147..93997a9 100644
--- a/src/components/Script.hpp
+++ b/src/components/Script.hpp
@@ -74,7 +74,7 @@ public:
             else if (value.get_type() == sol::type::number)
                 table_components.push_back(std::make_tuple(
                     key.as<std::string>(),
-                    std::string("return " + value.as<std::string>())
+                    std::string("return ") + std::to_string(value.as<double>())
                 ));
             else if (value.get_type() == sol::type::boolean) {
                 table_components.push_back(std::make_tuple(
diff --git a/src/gamestate.hpp b/src/gamestate.hpp
index 86a4198..3ef641f 100644
--- a/src/gamestate.hpp
+++ b/src/gamestate.hpp
@@ -27,30 +27,6 @@
 
 #include <fstream>
 
-struct EntitySerializer
-{
-    template<class Archive>
-    static void serialize(entityx::EntityManager& entities, entityx::Entity entity, bool save, Archive& ar)
-    {
-        // TODO try and reimplement without modifying entityx?
-        // Or, make a new branch...
-
-        //const auto mask = entity.component_mask();
-
-        //for (size_t i = 0; i < entities.component_helpers_.size(); i++) {
-        //    auto helper = entities.component_helpers_[i];
-        //    if (helper && mask.test(i)) {
-        //        auto* c = helper->get_component(entity);
-        //        ar.setNextName(c->serializeName().c_str());
-        //        ar.startNode();
-        //        c->internal_serialize(save, static_cast<void*>(&ar));
-        //        ar.finishNode();
-        //    }
-        //}
-    }
-};
-
-
 /**
  * @class GameState
  * Manages save files that contain entity data.
@@ -122,7 +98,13 @@ private:
         for (auto entity : entities.entities_for_debugging()) {
             archive.setNextName((name + std::to_string(i++)).c_str());
             archive.startNode();
-            EntitySerializer::serialize(entities, entity, save, archive);
+            entities.serialize(entity,
+                [&archive, &save](auto c) {
+                    archive.setNextName(c->serializeName().c_str());
+                    archive.startNode();
+                    c->internal_serialize(save, static_cast<void*>(&archive));
+                    archive.finishNode();
+                });
             archive.finishNode();
         }
     }