From cc3ae8e11c2486e846816d7aeb4c2e051afb02ea Mon Sep 17 00:00:00 2001 From: Henrique Gemignani Passos Lima Date: Tue, 7 Feb 2023 03:01:35 +0200 Subject: [PATCH] Fix building all_source and all_source_host Former-commit-id: 0ac742bdd8f78f1f6e7693a9a12b4ffd07a73d85 --- include/MetroidPrime/Cameras/CGameCamera.hpp | 2 +- src/Kyoto/Audio/g721.cpp | 3 ++- src/MetroidPrime/BodyState/CBSAttack.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/MetroidPrime/Cameras/CGameCamera.hpp b/include/MetroidPrime/Cameras/CGameCamera.hpp index b7c9168a..094a665b 100644 --- a/include/MetroidPrime/Cameras/CGameCamera.hpp +++ b/include/MetroidPrime/Cameras/CGameCamera.hpp @@ -20,7 +20,7 @@ public: ~CGameCamera() override; void Accept(IVisitor& visitor) override; void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; - void SetActive(uchar active) override; + void SetActive(const bool active) override; // CGameCamera virtual void ProcessInput(const CFinalInput&, CStateManager& mgr) = 0; diff --git a/src/Kyoto/Audio/g721.cpp b/src/Kyoto/Audio/g721.cpp index c776ebbf..b7b77200 100644 --- a/src/Kyoto/Audio/g721.cpp +++ b/src/Kyoto/Audio/g721.cpp @@ -29,7 +29,9 @@ * */ +#ifndef _MSC_VER #include +#endif extern "C" int abs(int); #include @@ -456,4 +458,3 @@ g721_decoder(int i, return (sr << 2); /* sr was 14-bit dynamic range */ } - diff --git a/src/MetroidPrime/BodyState/CBSAttack.cpp b/src/MetroidPrime/BodyState/CBSAttack.cpp index e2dae276..1e7e33f5 100644 --- a/src/MetroidPrime/BodyState/CBSAttack.cpp +++ b/src/MetroidPrime/BodyState/CBSAttack.cpp @@ -13,7 +13,7 @@ CBSAttack::CBSAttack() : x4_nextState(pas::kAS_Invalid) -// , x8_slide(CBCSlideCmd()) +, x8_slide(pas::kSlide_Invalid, CVector3f::Zero()) , x20_targetPos(CVector3f::Zero()) , x2c_alignTargetPosStartTime(-1.f) , x30_alignTargetPosTime(-1.f)