AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-15 07:26:10 +00:00
Code Issues Projects Releases Wiki Activity

Various Ridley fixes

Browse Source
This commit is contained in:
Phillip Stephens
2020-05-13 06:20:40 -07:00
parent e9ea73ec98
commit a432a79cd4
8 changed files with 202 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Runtime/MP1/World/CRidley.hpp
View File

@@ -105,11 +105,11 @@ class CRidley : public CPatterned {
float xab4_ = 20.f;
float xab8_ = 12.f;
float xabc_ = 40.f;
float xac0_ = 10;
float xac0_ = 10.f;
zeus::CAABox xac4_ = zeus::skInvertedBox;
float xadc_;
float xae0_;
u32 xae4_;
float xae4_;
float xae8_;
zeus::CVector3f xaec_;
zeus::CVector3f xaf8_;
@@ -195,7 +195,8 @@ class CRidley : public CPatterned {
void sub80253710(CStateManager& mgr);
bool sub80253960() {
return (GetTranslation() + (1.75f * GetTransform().basis[1]) - xa84_.origin).magnitude() < 1.75f * (xab4_ + xabc_);
const float mag = ((GetTranslation() + ((0.5f * xae4_) * GetTransform().frontVector())) - xa84_.origin).magnitude();
return mag < 0.5f * (xab4_ + xabc_);
}
public: