AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Prepare for pr-193

This commit is contained in:
Phillip Stephens 2020-03-08 18:01:29 -07:00
parent f06c26e7d6
commit 3e59f7a455
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Character/CAnimSourceReader.cpp
View File

@ -10,7 +10,7 @@ namespace urde {
CAnimSourceInfo::CAnimSourceInfo(const TSubAnimTypeToken<CAnimSource>& token) : x4_token(token) {}
bool CAnimSourceInfo::HasPOIData() const { return x4_token->x58_evntData; }
bool CAnimSourceInfo::HasPOIData() const { return bool(x4_token->x58_evntData); }
const std::vector<CBoolPOINode>& CAnimSourceInfo::GetBoolPOIStream() const { return x4_token->GetBoolPOIStream(); }

2
Runtime/Character/CFBStreamedCompression.hpp
View File

@ -75,7 +75,7 @@ public:
CCharAnimTime GetAnimationDuration() const { return MainHeader().duration; }
float GetAverageVelocity() const { return x10_averageVelocity; }
const zeus::CVector3f& GetRootOffset() const { return x14_rootOffset; }
bool HasPOIData() const { return x8_evntToken; }
bool HasPOIData() const { return bool(x8_evntToken); }
const std::vector<CBoolPOINode>& GetBoolPOIStream() const { return x8_evntToken->GetBoolPOIStream(); }
const std::vector<CInt32POINode>& GetInt32POIStream() const { return x8_evntToken->GetInt32POIStream(); }
const std::vector<CParticlePOINode>& GetParticlePOIStream() const { return x8_evntToken->GetParticlePOIStream(); }

8
Runtime/Character/CModelData.hpp
View File

@ -148,7 +148,7 @@ public:
const zeus::CVector3f& GetScale() const { return x0_scale; }
void SetScale(const zeus::CVector3f& scale) { x0_scale = scale; }
bool HasAnimData() const { return x10_animData != nullptr; }
bool HasNormalModel() const { return x1c_normalModel; }
bool HasNormalModel() const { return bool(x1c_normalModel); }
bool HasModel(EWhichModel which) const {
if (x10_animData) {
switch (which) {
@ -165,11 +165,11 @@ public:
switch (which) {
case EWhichModel::Normal:
return x1c_normalModel;
return bool(x1c_normalModel);
case EWhichModel::XRay:
return x2c_xrayModel;
return bool(x2c_xrayModel);
case EWhichModel::Thermal:
return x3c_infraModel;
return bool(x3c_infraModel);
default:
return false;
}