From d0e0ebe4e4632d74e51663b286bd364bfa5991dc Mon Sep 17 00:00:00 2001 From: intns <84647527+intns@users.noreply.github.com> Date: Sat, 8 Jan 2022 15:10:14 +0000 Subject: [PATCH] Fix up FakePiki and ShadowParam --- include/Game/FakePiki.h | 16 ++++++++-------- include/Game/shadowMgr.h | 11 +++++------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/include/Game/FakePiki.h b/include/Game/FakePiki.h index ef755b8dd..11731f603 100644 --- a/include/Game/FakePiki.h +++ b/include/Game/FakePiki.h @@ -4,6 +4,7 @@ #include "Game/AABBWaterBox.h" #include "Game/Creature.h" #include "SysShape/MotionListener.h" +#include "Game/shadowMgr.h" #include "Vector3.h" struct J3DJoint; @@ -183,14 +184,13 @@ struct FakePiki : public Creature, public SysShape::MotionListener { Vector3f _1F0; // _1F0 float m_faceDir; // _1FC Vector3f m_position2; // _200 - Vector3f m_position; // _20C - Sys::Sphere m_boundingSphere; // _218 - int _228; // _228 - u8 _22C[8]; // _22C - float m_animSpeed; // _234 - Vector3f _238; // _238 - float m_faceDirOffset; // _244 - Sys::Triangle* _248; // _248 + u32 _20C; + Game::ShadowParam m_shadowParam; // _20C + u8 _22C[8]; // _22C + float m_animSpeed; // _234 + Vector3f _238; // _238 + float m_faceDirOffset; // _244 + Sys::Triangle* _248; // _248 }; } // namespace Game diff --git a/include/Game/shadowMgr.h b/include/Game/shadowMgr.h index 771ae6cc4..3b4bc2527 100644 --- a/include/Game/shadowMgr.h +++ b/include/Game/shadowMgr.h @@ -7,6 +7,7 @@ #include "Parameters.h" #include "Rect.h" #include "Vector3.h" +#include "Sys/Sphere.h" struct Camera; struct Color4; @@ -18,13 +19,11 @@ struct Viewport; namespace Game { struct Creature; +// Size: 0x20 struct ShadowParam { - Vector3f m_position; // _00 - float _0C; // _0C - float _10; // _10 - float _14; // _14 - float m_height; // _18 - float m_radius; // _1C + Vector3f m_position; // _00 + Sys::Sphere m_boundingSphere; // _0C + float _1C; // _1C }; // Size: 0x60