Updated xdynentitydef

libs/xassets/xdynentitydef.cpp

@@ -4,15 +4,11 @@ XDynEntityDef::XDynEntityDef()
     : XAsset()
     , mType()
     , mPose()
-    , mModelPtr(0)
     , mModel()
     , mBrushModel(0)
     , mPhysicsBrushModel(0)
-    , mBestroyFxPtr(0)
     , mDestroyFx()
-    , mDestroyPiecesPtr(0)
     , mDestroyPieces()
-    , mPhysPresetPtr(0)
     , mPhysPreset()
     , mHealth(0)
     , mMass()
@@ -28,7 +24,32 @@ XDynEntityDef::~XDynEntityDef()
 
 void XDynEntityDef::ParseData(QDataStream *aStream)
 {
+    if (GetPtr())
+    {
+        *aStream >> mType;
 
+        mPose.ParseData(aStream);
+        mModel.ParsePtr(aStream, false);
+
+        *aStream
+            >> mBrushModel
+            >> mPhysicsBrushModel;
+
+        mDestroyFx.ParsePtr(aStream, false);
+        mDestroyPieces.ParsePtr(aStream, false);
+        mPhysPreset.ParsePtr(aStream, false);
+
+        *aStream >> mHealth;
+
+        mMass.ParseData(aStream);
+
+        *aStream >> mContents;
+
+        mModel.ParseData(aStream);
+        mDestroyFx.ParseData(aStream);
+        mDestroyPieces.ParseData(aStream);
+        mPhysPreset.ParseData(aStream);
+    }
 }
 
 void XDynEntityDef::Clear()

libs/xassets/xdynentitydef.h

@@ -27,15 +27,11 @@ public:
 private:
     XDynEntityType mType;
     XGfxPlacement mPose;
-    qint32 mModelPtr;
     XModel mModel;
     quint32 mBrushModel;
     quint32 mPhysicsBrushModel;
-    qint32 mBestroyFxPtr;
     XFxEffectDef mDestroyFx;
-    qint32 mDestroyPiecesPtr;
     XModelPieces mDestroyPieces;
-    qint32 mPhysPresetPtr;
     XPhysPreset mPhysPreset;
     int mHealth;
     XPhysMass mMass;