njohnson/XPlor
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Updated xdynentitydef

Browse Source
This commit is contained in:
njohnson 2025-09-07 23:15:53 -04:00
parent ce7ed928c4
commit 3416060d4b
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libs/xassets/xdynentitydef.cpp
View File

@ -4,15 +4,11 @@ XDynEntityDef::XDynEntityDef()
: XAsset() : XAsset()
, mType() , mType()
, mPose() , mPose()
, mModelPtr(0)
, mModel() , mModel()
, mBrushModel(0) , mBrushModel(0)
, mPhysicsBrushModel(0) , mPhysicsBrushModel(0)
, mBestroyFxPtr(0)
, mDestroyFx() , mDestroyFx()
, mDestroyPiecesPtr(0)
, mDestroyPieces() , mDestroyPieces()
, mPhysPresetPtr(0)
, mPhysPreset() , mPhysPreset()
, mHealth(0) , mHealth(0)
, mMass() , mMass()
@ -28,7 +24,32 @@ XDynEntityDef::~XDynEntityDef()
void XDynEntityDef::ParseData(QDataStream *aStream) 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() void XDynEntityDef::Clear()

4
libs/xassets/xdynentitydef.h
View File

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