From de7aff1571b3f1b7e0e988e2b2ff6d181ede485f Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 31 Mar 2024 09:53:44 +0200 Subject: `LinkStateGrab` -> `LinkStateInteract` --- include/Player/LinkStateGrab.hpp | 57 ------------------------------------ include/Player/LinkStateInteract.hpp | 57 ++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 include/Player/LinkStateGrab.hpp create mode 100644 include/Player/LinkStateInteract.hpp (limited to 'include') diff --git a/include/Player/LinkStateGrab.hpp b/include/Player/LinkStateGrab.hpp deleted file mode 100644 index 2dadb7bd..00000000 --- a/include/Player/LinkStateGrab.hpp +++ /dev/null @@ -1,57 +0,0 @@ -#pragma once - -#include "global.h" -#include "types.h" - -#include "lib/math.h" - -#include "Player/LinkStateBase.hpp" -#include "Player/LinkState4.hpp" -#include "Actor/ActorManager.hpp" -#include "Actor/Actor.hpp" - -class LinkStateGrab : public LinkStateBase { -public: - /* 00 (base) */ - /* 0c */ void *mUnk_0c; - /* 10 */ ActorRef mGrabRef; - /* 18 */ Vec3p mThrowOffset; - /* 24 */ unk8 mUnk_24[0x88]; // non-documented struct - /* ac */ unk32 mUnk_ac; - /* b0 */ unk8 mUnk_b0[4]; - /* b4 */ - - /* 00 */ virtual void vfunc_00() override; - /* 04 */ virtual ~LinkStateGrab() override; - /* 0c */ virtual LinkStateId GetId() override; - /* 10 */ virtual void CreateDebugHierarchy() override; - /* 14 */ virtual void OnStateEnter() override; - /* 18 */ virtual void OnStateLeave(s32 param1) override; - /* 1c */ virtual void vfunc_1c() override; - /* 20 */ virtual bool vfunc_20(s32 param1) override; - /* 24 */ virtual bool vfunc_24(s32 param1) override; - /* 2c */ virtual void vfunc_2c(u16 *param1) override; - /* 34 */ virtual bool vfunc_34(Vec3p *param1) override; - /* 44 */ - - s32 GetGrabActorId(); - bool func_ov00_020aa818(); - void func_ov00_020aa844(Actor *param1); - LinkState4* GetLinkState4(); - void SetGrabActorVelocity(Vec3p *velocity); - void SetBombVelocity(Vec3p *velocity); - void func_ov00_020ab6c8(); - unk32 func_ov00_020ab770(Vec3p *param1); - unk32 func_ov00_020ab7bc(Vec3p *param1, Actor *actor); - void SetNormalizedThrowOffset(Vec3p *target); - void SetThrowOffset(Vec3p *target); - void func_ov00_020ab934(Vec3p *target); - void func_ov00_020ab97c(Vec3p *target); - void func_ov00_020ab9b8(u32 param1, bool param2); - void Grab(ActorRef *ref); - void func_ov00_020abba0(ActorRef *ref); - void func_ov00_020abbdc(ActorRef *ref); // duplicate of func_ov00_020abba0 - void func_ov00_020abc18(ActorRef *ref); - bool func_ov00_020abc40(); - bool func_ov00_020abc78(ActorRef *ref); -}; diff --git a/include/Player/LinkStateInteract.hpp b/include/Player/LinkStateInteract.hpp new file mode 100644 index 00000000..8fe67f6a --- /dev/null +++ b/include/Player/LinkStateInteract.hpp @@ -0,0 +1,57 @@ +#pragma once + +#include "global.h" +#include "types.h" + +#include "lib/math.h" + +#include "Player/LinkStateBase.hpp" +#include "Player/LinkState4.hpp" +#include "Actor/ActorManager.hpp" +#include "Actor/Actor.hpp" + +class LinkStateInteract : public LinkStateBase { +public: + /* 00 (base) */ + /* 0c */ void *mUnk_0c; + /* 10 */ ActorRef mGrabRef; + /* 18 */ Vec3p mThrowOffset; + /* 24 */ unk8 mUnk_24[0x88]; // non-documented struct + /* ac */ unk32 mUnk_ac; + /* b0 */ unk8 mUnk_b0[4]; + /* b4 */ + + /* 00 */ virtual void vfunc_00() override; + /* 04 */ virtual ~LinkStateInteract() override; + /* 0c */ virtual LinkStateId GetId() override; + /* 10 */ virtual void CreateDebugHierarchy() override; + /* 14 */ virtual void OnStateEnter() override; + /* 18 */ virtual void OnStateLeave(s32 param1) override; + /* 1c */ virtual void vfunc_1c() override; + /* 20 */ virtual bool vfunc_20(s32 param1) override; + /* 24 */ virtual bool vfunc_24(s32 param1) override; + /* 2c */ virtual void vfunc_2c(u16 *param1) override; + /* 34 */ virtual bool vfunc_34(Vec3p *param1) override; + /* 44 */ + + s32 GetGrabActorId(); + bool func_ov00_020aa818(); + void func_ov00_020aa844(Actor *param1); + LinkState4* GetLinkState4(); + void SetGrabActorVelocity(Vec3p *velocity); + void SetBombVelocity(Vec3p *velocity); + void func_ov00_020ab6c8(); + unk32 func_ov00_020ab770(Vec3p *param1); + unk32 func_ov00_020ab7bc(Vec3p *param1, Actor *actor); + void SetNormalizedThrowOffset(Vec3p *target); + void SetThrowOffset(Vec3p *target); + void func_ov00_020ab934(Vec3p *target); + void func_ov00_020ab97c(Vec3p *target); + void func_ov00_020ab9b8(u32 param1, bool param2); + void Grab(ActorRef *ref); + void func_ov00_020abba0(ActorRef *ref); + void func_ov00_020abbdc(ActorRef *ref); // duplicate of func_ov00_020abba0 + void func_ov00_020abc18(ActorRef *ref); + bool func_ov00_020abc40(); + bool func_ov00_020abc78(ActorRef *ref); +}; -- cgit v1.2.3