diff --git a/src/SerializedObject.cpp b/src/SerializedObject.cpp index d7f360b962..ef700db52e 100644 --- a/src/SerializedObject.cpp +++ b/src/SerializedObject.cpp @@ -169,10 +169,8 @@ bool STObject::isFieldAllowed(SField::ref field) return false; } -bool STObject::set(SOElement::ptrList elem, SerializerIterator& sit, int depth) +bool STObject::set(SerializerIterator& sit, int depth) { // return true = terminated with end-of-object - setType(elem); - mData.empty(); while (!sit.empty()) { diff --git a/src/SerializedObject.h b/src/SerializedObject.h index 58914bfb78..fdc9030e92 100644 --- a/src/SerializedObject.h +++ b/src/SerializedObject.h @@ -39,19 +39,19 @@ public: { set(type); } STObject(SOElement::ptrList type, SerializerIterator& sit, SField::ref name) : SerializedType(name) - { set(type, sit); } + { set(sit); setType(type); } virtual ~STObject() { ; } static std::auto_ptr deserialize(SerializerIterator& sit, SField::ref name) { return std::auto_ptr(construct(sit, name)); } - void setType(SOElement const * t); + void setType(SOElement::ptrList); bool isValidForType(); bool isFieldAllowed(SField::ref); void set(SOElement::ptrList); - bool set(SOElement::ptrList, SerializerIterator& u, int depth = 0); + bool set(SerializerIterator& u, int depth = 0); virtual SerializedTypeID getSType() const { return STI_OBJECT; } virtual bool isEquivalent(const SerializedType& t) const;