2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-08-08 14:59:06 +00:00

Merge pull request #202 from lioncash/bool

CStaticRes: Make operator bool explicit
This commit is contained in:
Phillip Stephens 2020-03-08 19:52:08 -07:00 committed by GitHub
commit 1a131907ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -27,12 +27,12 @@ class CStaticRes {
zeus::CVector3f x4_scale; zeus::CVector3f x4_scale;
public: public:
constexpr CStaticRes()=default; constexpr CStaticRes() = default;
CStaticRes(CAssetId id, const zeus::CVector3f& scale) : x0_cmdlId(id), x4_scale(scale) {} CStaticRes(CAssetId id, const zeus::CVector3f& scale) : x0_cmdlId(id), x4_scale(scale) {}
CAssetId GetId() const { return x0_cmdlId; } CAssetId GetId() const { return x0_cmdlId; }
const zeus::CVector3f& GetScale() const { return x4_scale; } const zeus::CVector3f& GetScale() const { return x4_scale; }
operator bool() const { return x0_cmdlId != 0; } explicit operator bool() const { return x0_cmdlId.IsValid(); }
}; };
class CAnimRes { class CAnimRes {