diff options
| author | Aetias <aetias@outlook.com> | 2024-10-21 20:36:15 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-10-21 20:36:15 +0200 |
| commit | a62cc074e93cdd77605bddcd145a96d3cfa7618d (patch) | |
| tree | 31f0d5bf0872b316643d543957ea2a6d22e632e2 /include/Player/LinkStateInteract.hpp | |
| parent | 5c3e3aee99af35884462f518a9bc1fbf65ae92d4 (diff) | |
| parent | f4c5e4862419a14487575bf477118458c0e4a289 (diff) | |
Merge branch 'main' into actor-manager
Diffstat (limited to 'include/Player/LinkStateInteract.hpp')
| -rw-r--r-- | include/Player/LinkStateInteract.hpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/Player/LinkStateInteract.hpp b/include/Player/LinkStateInteract.hpp index a994fb06..150983b8 100644 --- a/include/Player/LinkStateInteract.hpp +++ b/include/Player/LinkStateInteract.hpp @@ -1,14 +1,13 @@ #pragma once #include "global.h" -#include "types.h" - #include "lib/math.h" +#include "types.h" +#include "Actor/Actor.hpp" +#include "Actor/ActorManager.hpp" #include "Player/LinkStateBase.hpp" #include "Player/LinkStateRoll.hpp" -#include "Actor/ActorManager.hpp" -#include "Actor/Actor.hpp" class LinkStateInteract : public LinkStateBase { public: @@ -37,7 +36,7 @@ public: s32 GetGrabActorId(); bool func_ov00_020aa818(); void func_ov00_020aa844(Actor *param1); - LinkStateRoll* GetLinkStateRoll(); + LinkStateRoll *GetLinkStateRoll(); void SetGrabActorVelocity(Vec3p *velocity); void SetBombVelocity(Vec3p *velocity); void func_ov00_020ab6c8(); |