spike sync

Author: PredatorCZ

3rd_party/spike

@@ -147,15 +147,15 @@ size_t Buf_SingleVector3::Size() const { return 12; }
 void Buf_SingleVector3::AppendToString(std::stringstream &buffer) const {
   ReflectorWrap<const Buf_SingleVector3> tRefl(this);
 
-  buffer << tRefl.GetReflectedValue(0);
+  buffer << tRefl["data"].ReflectedValue();
 }
 
 std::string_view
 Buf_SingleVector3::RetreiveFromString(std::string_view buffer) {
   buffer = es::SkipStartWhitespace(buffer, true);
 
   ReflectorWrap<Buf_SingleVector3> tRefl(this);
-  tRefl.SetReflectedValue(0, buffer);
+  tRefl["data"] = buffer;
   return SeekTo(buffer);
 }
 
@@ -204,8 +204,8 @@ size_t Buf_LinearVector3::Size() const { return 16; }
 void Buf_LinearVector3::AppendToString(std::stringstream &buffer) const {
   ReflectorWrap<const Buf_LinearVector3> tRefl(this);
 
-  buffer << "{ " << tRefl.GetReflectedValue(0) << ", "
-         << tRefl.GetReflectedValue(1) << " }";
+  buffer << "{ " << tRefl["data"].ReflectedValue() << ", "
+         << tRefl["additiveFrames"].ReflectedValue() << " }";
 }
 
 std::string_view
@@ -214,13 +214,13 @@ Buf_LinearVector3::RetreiveFromString(std::string_view buffer) {
   buffer = es::SkipStartWhitespace(buffer, true);
 
   ReflectorWrap<Buf_LinearVector3> tRefl(this);
-  tRefl.SetReflectedValue(0, buffer);
+  tRefl["data"] = buffer;
 
   buffer = SeekTo(buffer, ']');
   buffer = SeekTo(buffer, ',');
   buffer = es::SkipStartWhitespace(buffer, true);
 
-  tRefl.SetReflectedValue(1, buffer);
+  tRefl["additiveFrames"] = buffer;
 
   return SeekTo(buffer);
 }
@@ -262,8 +262,9 @@ size_t Buf_HermiteVector3::Size() const { return size; }
 void Buf_HermiteVector3::AppendToString(std::stringstream &buffer) const {
   ReflectorWrap<const Buf_HermiteVector3> tRefl(this);
 
-  buffer << "{ " << tRefl.GetReflectedValue(2) << ", "
-         << tRefl.GetReflectedValue(1) << ", " << tRefl.GetReflectedValue(0);
+  buffer << "{ " << tRefl["data"].ReflectedValue() << ", "
+         << tRefl["additiveFrames"].ReflectedValue() << ", "
+         << tRefl["flags"].ReflectedValue();
 
   size_t curTang = 0;
 
@@ -282,17 +283,17 @@ Buf_HermiteVector3::RetreiveFromString(std::string_view buffer) {
   buffer = es::SkipStartWhitespace(buffer, true);
 
   ReflectorWrap<Buf_HermiteVector3> tRefl(this);
-  tRefl.SetReflectedValue(2, buffer);
+  tRefl["data"] = buffer;
 
   buffer = SeekTo(buffer, ',');
   buffer = es::SkipStartWhitespace(buffer, true);
 
-  tRefl.SetReflectedValue(1, buffer);
+  tRefl["additiveFrames"] = buffer;
 
   buffer = SeekTo(buffer, ',');
   buffer = es::SkipStartWhitespace(buffer, true);
 
-  tRefl.SetReflectedValue(0, buffer);
+  tRefl["flags"] = buffer;
 
   buffer = SeekTo(buffer, ',');
   buffer = es::SkipStartWhitespace(buffer, true);

src/mtf_lmt/codecs.cpp

@@ -43,33 +43,32 @@ using namespace revil;
 
 struct XFSClassMember;
 
-MAKE_ENUM(ENUMSCOPE(class XFSType
-                    : uint8, XFSType), //
-          EMEMBER(invalid_),           //
-          EMEMBER(class_),             //
-          EMEMBER(classref_),          //
-          EMEMBER(bool_),              //
-          EMEMBER(u8_),                //
-          EMEMBER(u16_),               //
-          EMEMBER(u32_),               //
-          EMEMBER(u64_),               //
-          EMEMBER(s8_),                //
-          EMEMBER(s16_),               //
-          EMEMBER(s32_),               //
-          EMEMBER(s64_),               //
-          EMEMBER(f32_),               //
-          EMEMBERVAL(string_, 14),     //
-          EMEMBER(color_),             //
-          EMEMBER(point_),             //
-          EMEMBER(size_),              //
-          EMEMBER(rect_),              // 8+ rectangle?
-          EMEMBER(_matrix_),           //
-          EMEMBER(vector4_),           //
-          EMEMBER(_vector4_),          // colour
-          EMEMBERVAL(string2_, 32),    //
-          EMEMBERVAL(vector2_, 34),    //
-          EMEMBER(vector3_),           //
-          EMEMBERVAL(_resource_, 0x80) // 8+, custom?
+MAKE_ENUM(ENUMSCOPE(class XFSType : uint8, XFSType), //
+          EMEMBER(invalid_),                         //
+          EMEMBER(class_),                           //
+          EMEMBER(classref_),                        //
+          EMEMBER(bool_),                            //
+          EMEMBER(u8_),                              //
+          EMEMBER(u16_),                             //
+          EMEMBER(u32_),                             //
+          EMEMBER(u64_),                             //
+          EMEMBER(s8_),                              //
+          EMEMBER(s16_),                             //
+          EMEMBER(s32_),                             //
+          EMEMBER(s64_),                             //
+          EMEMBER(f32_),                             //
+          EMEMBERVAL(string_, 14),                   //
+          EMEMBER(color_),                           //
+          EMEMBER(point_),                           //
+          EMEMBER(size_),                            //
+          EMEMBER(rect_),                            // 8+ rectangle?
+          EMEMBER(_matrix_),                         //
+          EMEMBER(vector4_),                         //
+          EMEMBER(_vector4_),                        // colour
+          EMEMBERVAL(string2_, 32),                  //
+          EMEMBERVAL(vector2_, 34),                  //
+          EMEMBER(vector3_),                         //
+          EMEMBERVAL(_resource_, 0x80)               // 8+, custom?
 );
 
 struct XFSSizeAndFlag {
@@ -272,8 +271,8 @@ void XFSClassDesc::ToXML(pugi::xml_node node) const {
   for (auto &m : members) {
     ReflectorWrap<const XFSClassMember> refl(m);
     auto mNode = cNode.append_child("member");
-    ReflectorXMLUtil::SaveV2a(refl, mNode,
-                              {ReflectorXMLUtil::Flags_StringAsAttribute});
+    ReflectorXMLUtil::Save(refl, mNode,
+                           {ReflectorXMLUtil::Flags_StringAsAttribute});
   }
 }