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

Fix errors and warnings 

Former-commit-id: 9f4fc78c16
This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-11 18:37:27 +03:00
parent 45c469d8ee
commit 4f2a8704db
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Kyoto/Particles/CElementGen.hpp
View File

@ -8,6 +8,7 @@
#include "Kyoto/Math/CVector3f.hpp" #include "Kyoto/Math/CVector3f.hpp"
#include "Kyoto/Particles/CParticleGen.hpp" #include "Kyoto/Particles/CParticleGen.hpp"
#include "Kyoto/TToken.hpp" #include "Kyoto/TToken.hpp"
#include "Kyoto/CRandom16.hpp"
class CGenDescription; class CGenDescription;
class CModVectorElement; class CModVectorElement;

1
include/rstl/auto_ptr.hpp
View File

@ -21,7 +21,6 @@ public:
auto_ptr(const auto_ptr& other) : x0_has(other.x0_has), x4_item(other.x4_item) { auto_ptr(const auto_ptr& other) : x0_has(other.x0_has), x4_item(other.x4_item) {
other.x0_has = false; other.x0_has = false;
} }
// TODO check
auto_ptr& operator=(const auto_ptr& other) { auto_ptr& operator=(const auto_ptr& other) {
if (&other != this) { if (&other != this) {
if (x0_has) { if (x0_has) {

4
src/Collision/COBBox.cpp
View File

@ -7,7 +7,7 @@ COBBox::COBBox(const CTransform4f& xf, const CVector3f& extents)
COBBox::COBBox(CInputStream& in) : mTransform(in), mExtents(in) {} COBBox::COBBox(CInputStream& in) : mTransform(in), mExtents(in) {}
CAABox COBBox::CalculateAABox(const CTransform4f& xf) const {} CAABox COBBox::CalculateAABox(const CTransform4f& xf) const { return CAABox(CVector3f::Zero(), CVector3f::Zero()); }
COBBox COBBox::FromAABox(const CAABox& box, const CTransform4f& xf) { COBBox COBBox::FromAABox(const CAABox& box, const CTransform4f& xf) {
CVector3f center = box.GetCenterPoint(); CVector3f center = box.GetCenterPoint();
@ -16,7 +16,7 @@ COBBox COBBox::FromAABox(const CAABox& box, const CTransform4f& xf) {
return COBBox(final, extents); return COBBox(final, extents);
} }
bool COBBox::LineIntersectsBox(const CMRay& ray, float& penetration) const {} bool COBBox::LineIntersectsBox(const CMRay& ray, float& penetration) const { return false; }
bool COBBox::AABoxIntersectsBox(const CAABox& box) const { bool COBBox::AABoxIntersectsBox(const CAABox& box) const {
return OBBIntersectsBox(FromAABox(box, CTransform4f::Identity())); return OBBIntersectsBox(FromAABox(box, CTransform4f::Identity()));

8
src/Kyoto/Alloc/CGameAllocator.cpp
View File

@ -60,7 +60,7 @@ CGameAllocator::~CGameAllocator() {
} }
} }
bool CGameAllocator::Initialize(COsContext& ctx) {} bool CGameAllocator::Initialize(COsContext& ctx) { return false; }
void CGameAllocator::Shutdown() { void CGameAllocator::Shutdown() {
ReleaseAll(); ReleaseAll();
@ -174,7 +174,7 @@ void* CGameAllocator::Alloc(size_t size, EHint hint, EScope scope, EType type,
return ++info; return ++info;
} }
CGameAllocator::SGameMemInfo* CGameAllocator::FindFreeBlock(uint) {} CGameAllocator::SGameMemInfo* CGameAllocator::FindFreeBlock(uint) { return nullptr; }
CGameAllocator::SGameMemInfo* CGameAllocator::FindFreeBlockFromTopOfHeap(uint size) { CGameAllocator::SGameMemInfo* CGameAllocator::FindFreeBlockFromTopOfHeap(uint size) {
SGameMemInfo* iter = x10_last; SGameMemInfo* iter = x10_last;
@ -192,7 +192,7 @@ CGameAllocator::SGameMemInfo* CGameAllocator::FindFreeBlockFromTopOfHeap(uint si
return ret; return ret;
} }
uint CGameAllocator::FixupAllocPtrs(SGameMemInfo*, uint, uint, EHint, const CCallStack&) {} uint CGameAllocator::FixupAllocPtrs(SGameMemInfo*, uint, uint, EHint, const CCallStack&) { return 0; }
void CGameAllocator::UpdateAllocDebugStats(uint len, uint roundedLen, uint offset) { void CGameAllocator::UpdateAllocDebugStats(uint len, uint roundedLen, uint offset) {
++x84_; ++x84_;
@ -266,7 +266,7 @@ void CGameAllocator::ReleaseAll() {
void* CGameAllocator::AllocSecondary(size_t size, EHint hint, EScope scope, EType type, void* CGameAllocator::AllocSecondary(size_t size, EHint hint, EScope scope, EType type,
const CCallStack& callstack) { const CCallStack& callstack) {
Alloc(size, hint, scope, type, callstack); return Alloc(size, hint, scope, type, callstack);
}; };
bool CGameAllocator::FreeSecondary(const void* ptr) { return Free(ptr); }; bool CGameAllocator::FreeSecondary(const void* ptr) { return Free(ptr); };

5
src/MetroidPrime/CPhysicsActor.cpp
View File

@ -201,4 +201,7 @@ CVector3f CPhysicsActor::GetMoveToORImpulseWR(const CVector3f& trans, float d) c
return (GetMass() * impulse) * (1.f / d); return (GetMass() * impulse) * (1.f / d);
} }
CAxisAngle CPhysicsActor::GetRotateToORAngularMomentumWR(const CQuaternion& q, float d) const {} CAxisAngle CPhysicsActor::GetRotateToORAngularMomentumWR(const CQuaternion& q, float d) const {
// TODO
return CAxisAngle();
}