From 3e59f7a455471c6dfc11c15a005dfde9fadf7f45 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sun, 8 Mar 2020 18:01:29 -0700 Subject: [PATCH] Prepare for pr-193 --- Runtime/Character/CAnimSourceReader.cpp | 2 +- Runtime/Character/CFBStreamedCompression.hpp | 2 +- Runtime/Character/CModelData.hpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Runtime/Character/CAnimSourceReader.cpp b/Runtime/Character/CAnimSourceReader.cpp index 2ce914a5e..e98b1660f 100644 --- a/Runtime/Character/CAnimSourceReader.cpp +++ b/Runtime/Character/CAnimSourceReader.cpp @@ -10,7 +10,7 @@ namespace urde { CAnimSourceInfo::CAnimSourceInfo(const TSubAnimTypeToken& 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& CAnimSourceInfo::GetBoolPOIStream() const { return x4_token->GetBoolPOIStream(); } diff --git a/Runtime/Character/CFBStreamedCompression.hpp b/Runtime/Character/CFBStreamedCompression.hpp index 2a14c3244..be95aa0b6 100644 --- a/Runtime/Character/CFBStreamedCompression.hpp +++ b/Runtime/Character/CFBStreamedCompression.hpp @@ -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& GetBoolPOIStream() const { return x8_evntToken->GetBoolPOIStream(); } const std::vector& GetInt32POIStream() const { return x8_evntToken->GetInt32POIStream(); } const std::vector& GetParticlePOIStream() const { return x8_evntToken->GetParticlePOIStream(); } diff --git a/Runtime/Character/CModelData.hpp b/Runtime/Character/CModelData.hpp index 6c28908d0..2010f03c3 100644 --- a/Runtime/Character/CModelData.hpp +++ b/Runtime/Character/CModelData.hpp @@ -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; }