PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix building all_source and all_source_host

This commit is contained in:
Henrique Gemignani Passos Lima 2023-02-07 03:01:35 +02:00
parent e83f40d9ec
commit 0ac742bdd8
No known key found for this signature in database
GPG Key ID: E224F951761145F8
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/MetroidPrime/Cameras/CGameCamera.hpp
View File

@ -20,7 +20,7 @@ public:
~CGameCamera() override; ~CGameCamera() override;
void Accept(IVisitor& visitor) override; void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
void SetActive(uchar active) override; void SetActive(const bool active) override;
// CGameCamera // CGameCamera
virtual void ProcessInput(const CFinalInput&, CStateManager& mgr) = 0; virtual void ProcessInput(const CFinalInput&, CStateManager& mgr) = 0;

3
src/Kyoto/Audio/g721.cpp
View File

@ -29,7 +29,9 @@
* *
*/ */
#ifndef _MSC_VER
#include <stdlib.h> #include <stdlib.h>
#endif
extern "C" int abs(int); extern "C" int abs(int);
#include <Kyoto/Audio/g721.h> #include <Kyoto/Audio/g721.h>
@ -456,4 +458,3 @@ g721_decoder(int i,
return (sr << 2); /* sr was 14-bit dynamic range */ return (sr << 2); /* sr was 14-bit dynamic range */
} }

2
src/MetroidPrime/BodyState/CBSAttack.cpp
View File

@ -13,7 +13,7 @@
CBSAttack::CBSAttack() CBSAttack::CBSAttack()
: x4_nextState(pas::kAS_Invalid) : x4_nextState(pas::kAS_Invalid)
// , x8_slide(CBCSlideCmd()) , x8_slide(pas::kSlide_Invalid, CVector3f::Zero())
, x20_targetPos(CVector3f::Zero()) , x20_targetPos(CVector3f::Zero())
, x2c_alignTargetPosStartTime(-1.f) , x2c_alignTargetPosStartTime(-1.f)
, x30_alignTargetPosTime(-1.f) , x30_alignTargetPosTime(-1.f)