From 7fdd451cd159aaacaa2200b7007f2d9944e20d37 Mon Sep 17 00:00:00 2001 From: njohnson Date: Sun, 7 Sep 2025 23:16:04 -0400 Subject: [PATCH] Updated xmaterialinfo --- libs/xassets/xmaterialinfo.cpp | 15 ++++++++++++++- libs/xassets/xmaterialinfo.h | 5 ++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/libs/xassets/xmaterialinfo.cpp b/libs/xassets/xmaterialinfo.cpp index 78a8e25..64cad04 100644 --- a/libs/xassets/xmaterialinfo.cpp +++ b/libs/xassets/xmaterialinfo.cpp @@ -2,7 +2,7 @@ XMaterialInfo::XMaterialInfo() : XAsset() - , mName("") + , mName() , mGameFlags(0) , mSortKey(0) , mTextureAtlasRowCount(0) @@ -20,7 +20,20 @@ XMaterialInfo::~XMaterialInfo() void XMaterialInfo::ParseData(QDataStream *aStream) { + mName.ParsePtr(aStream, false); + *aStream + >> mGameFlags + >> mSortKey + >> mTextureAtlasRowCount + >> mTextureAtlasColumnCount; + + mDrawSurf.ParseData(aStream); + + *aStream >> mSurfaceTypeBits; + aStream->skipRawData(4); + + mName.ParseData(aStream); } void XMaterialInfo::Clear() diff --git a/libs/xassets/xmaterialinfo.h b/libs/xassets/xmaterialinfo.h index 654cfb3..d9ef302 100644 --- a/libs/xassets/xmaterialinfo.h +++ b/libs/xassets/xmaterialinfo.h @@ -3,8 +3,7 @@ #include "xasset.h" #include "xgfxdrawsurf.h" - -#include +#include "xstring.h" class XMaterialInfo : public XAsset { @@ -16,7 +15,7 @@ public: void Clear() override; private: - QString mName; + XString mName; quint8 mGameFlags; quint8 mSortKey; quint8 mTextureAtlasRowCount;