From 0b6c727e36a764c1eee496ab80b14a5da00f21c5 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 12 Oct 2024 16:16:32 +0200 Subject: Add `.clang-format` --- include/Player/EquipBomb.hpp | 3 ++- include/Player/EquipBombchu.hpp | 1 + include/Player/EquipBoomerang.hpp | 2 +- include/Player/EquipBow.hpp | 1 + include/Player/EquipHammer.hpp | 1 + include/Player/EquipItem.hpp | 2 +- include/Player/EquipPotion.hpp | 1 + include/Player/EquipRope.hpp | 6 ++--- include/Player/EquipScoop.hpp | 2 +- include/Player/EquipShield.hpp | 1 + include/Player/EquipSword.hpp | 3 ++- include/Player/LinkStateBase.hpp | 49 ++++++++++++++++++------------------ include/Player/LinkStateCutscene.hpp | 5 ++-- include/Player/LinkStateDamage.hpp | 3 +-- include/Player/LinkStateFollow.hpp | 5 ++-- include/Player/LinkStateInteract.hpp | 9 +++---- include/Player/LinkStateItem.hpp | 8 +++--- include/Player/MotionParams.hpp | 2 +- include/Player/PlayerBase.hpp | 25 +++++++++--------- include/Player/PlayerControl.hpp | 17 ++++++------- include/Player/PlayerControlData.hpp | 3 +-- include/Player/PlayerLinkBase.hpp | 16 ++++++------ include/Player/TouchControl.hpp | 8 +++--- include/Player/TouchGesture.hpp | 2 +- 24 files changed, 86 insertions(+), 89 deletions(-) (limited to 'include/Player') diff --git a/include/Player/EquipBomb.hpp b/include/Player/EquipBomb.hpp index 033755b2..d21e12f1 100644 --- a/include/Player/EquipBomb.hpp +++ b/include/Player/EquipBomb.hpp @@ -1,6 +1,7 @@ #pragma once #include "types.h" + #include "Player/EquipItem.hpp" class EquipBomb : public EquipItem { @@ -9,7 +10,7 @@ private: /* 09 */ unk8 mUnk_09[3]; /* 0c */ unk32 mUnk_0c; /* 10 */ unk8 mUnk_10[0x14]; - /* 24 */ + /* 24 */ public: EquipBomb(); diff --git a/include/Player/EquipBombchu.hpp b/include/Player/EquipBombchu.hpp index 609fd317..449e6512 100644 --- a/include/Player/EquipBombchu.hpp +++ b/include/Player/EquipBombchu.hpp @@ -1,6 +1,7 @@ #pragma once #include "types.h" + #include "Player/EquipItem.hpp" class EquipBombchu : public EquipItem { diff --git a/include/Player/EquipBoomerang.hpp b/include/Player/EquipBoomerang.hpp index 3b33bbd9..1fc97caa 100644 --- a/include/Player/EquipBoomerang.hpp +++ b/include/Player/EquipBoomerang.hpp @@ -35,5 +35,5 @@ public: /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov53_02199318 /* 50 */ - Actor* GetActor(); + Actor *GetActor(); }; diff --git a/include/Player/EquipBow.hpp b/include/Player/EquipBow.hpp index e3280d7f..d9cf0433 100644 --- a/include/Player/EquipBow.hpp +++ b/include/Player/EquipBow.hpp @@ -1,6 +1,7 @@ #pragma once #include "types.h" + #include "Player/EquipItem.hpp" class EquipBow : public EquipItem { diff --git a/include/Player/EquipHammer.hpp b/include/Player/EquipHammer.hpp index 934b3386..4cf56a21 100644 --- a/include/Player/EquipHammer.hpp +++ b/include/Player/EquipHammer.hpp @@ -1,6 +1,7 @@ #pragma once #include "types.h" + #include "Player/EquipItem.hpp" class EquipHammer : public EquipItem { diff --git a/include/Player/EquipItem.hpp b/include/Player/EquipItem.hpp index 93fe9e3e..d429a2e7 100644 --- a/include/Player/EquipItem.hpp +++ b/include/Player/EquipItem.hpp @@ -1,7 +1,7 @@ #pragma once -#include "types.h" #include "global.h" +#include "types.h" #include "Item/Item.hpp" #include "Physics/Cylinder.hpp" diff --git a/include/Player/EquipPotion.hpp b/include/Player/EquipPotion.hpp index 9cb35c6e..a80c0492 100644 --- a/include/Player/EquipPotion.hpp +++ b/include/Player/EquipPotion.hpp @@ -1,6 +1,7 @@ #pragma once #include "types.h" + #include "Player/EquipItem.hpp" class EquipPotion : public EquipItem { diff --git a/include/Player/EquipRope.hpp b/include/Player/EquipRope.hpp index 19aa6997..9eb7cdec 100644 --- a/include/Player/EquipRope.hpp +++ b/include/Player/EquipRope.hpp @@ -1,8 +1,8 @@ #pragma once #include "global.h" -#include "types.h" #include "lib/math.h" +#include "types.h" #include "Actor/ActorRef.hpp" #include "Physics/Cylinder.hpp" @@ -45,13 +45,13 @@ public: u16 GetAmmo(); /* 14 */ virtual bool IsUsable(unk32 param1) const override; /* 18 */ virtual void vfunc_18() override; // func_ov57_021992f4 - /* 1c */ virtual void vfunc_1c() override; // func_ov57_0219935c + /* 1c */ virtual void vfunc_1c() override; // func_ov57_0219935c /* 30 */ virtual void vfunc_30() override; // func_ov57_02199744 /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov57_021998f0 /* 50 */ - Actor* func_ov14_0213d420(); + Actor *func_ov14_0213d420(); s32 func_ov14_0213d440(s32 actorId); s32 func_ov14_0213d480(s32 actorId); bool func_ov14_0213d81c(s32 index, Vec3p *vec); diff --git a/include/Player/EquipScoop.hpp b/include/Player/EquipScoop.hpp index 778f99ba..f0958df5 100644 --- a/include/Player/EquipScoop.hpp +++ b/include/Player/EquipScoop.hpp @@ -1,6 +1,7 @@ #pragma once #include "types.h" + #include "Player/EquipItem.hpp" class EquipScoop : public EquipItem { @@ -24,4 +25,3 @@ public: /* 48 */ virtual unk32 vfunc_48(unk32 param1) const override; // func_ov54_02198d48 /* 50 */ }; - diff --git a/include/Player/EquipShield.hpp b/include/Player/EquipShield.hpp index 8bf435df..b83a5557 100644 --- a/include/Player/EquipShield.hpp +++ b/include/Player/EquipShield.hpp @@ -1,6 +1,7 @@ #pragma once #include "types.h" + #include "Player/EquipItem.hpp" class EquipShield { diff --git a/include/Player/EquipSword.hpp b/include/Player/EquipSword.hpp index 988ccdda..d7cd47ad 100644 --- a/include/Player/EquipSword.hpp +++ b/include/Player/EquipSword.hpp @@ -1,6 +1,7 @@ #pragma once #include "types.h" + #include "Player/EquipItem.hpp" #include "Player/EquipRope.hpp" @@ -57,5 +58,5 @@ public: /* 3c */ virtual bool GetHitbox(Cylinder *hitbox) const override; // func_ov00_020c01dc /* 50 */ - static EquipRope* GetEquipRope(); + static EquipRope *GetEquipRope(); }; diff --git a/include/Player/LinkStateBase.hpp b/include/Player/LinkStateBase.hpp index 58d6fb57..f4591991 100644 --- a/include/Player/LinkStateBase.hpp +++ b/include/Player/LinkStateBase.hpp @@ -1,26 +1,25 @@ #pragma once #include "global.h" -#include "types.h" - #include "lib/math.h" +#include "types.h" -#include "System/SysNew.hpp" -#include "Player/PlayerLinkBase.hpp" -#include "Player/PlayerControlData.hpp" #include "Actor/Actor.hpp" #include "Actor/ActorManager.hpp" -#include "Player/EquipItem.hpp" #include "Debug/DebugHierarchy.hpp" +#include "Player/EquipItem.hpp" +#include "Player/PlayerControlData.hpp" +#include "Player/PlayerLinkBase.hpp" +#include "System/SysNew.hpp" typedef unk32 LinkStateId; enum LinkStateId_ { - LinkStateId_Move = 0, - LinkStateId_Item = 1, - LinkStateId_Grab = 2, - LinkStateId_Unk3 = 3, - LinkStateId_Unk4 = 4, - LinkStateId_Damage = 5, + LinkStateId_Move = 0, + LinkStateId_Item = 1, + LinkStateId_Grab = 2, + LinkStateId_Unk3 = 3, + LinkStateId_Unk4 = 4, + LinkStateId_Damage = 5, LinkStateId_ItemGet = 6, LinkStateId_COUNT }; @@ -59,7 +58,7 @@ public: void EquipItem_vfunc_28(); void UpdateSwordShieldInUse(); void func_ov00_020a81b8(unk32 param1, unk32 param2); - LinkStateItem* GetLinkItemState(); + LinkStateItem *GetLinkItemState(); void LookAt(Vec3p *target); void func_ov00_020a81fc(); void AddHealth(s16 amount); @@ -102,30 +101,30 @@ public: unk8 Get_PlayerLinkBase_Unk5e(); unk32 Get_PlayerControlData_Unk004(); PlayerCharacter GetCurrentCharacter(); - PlayerControlData* GetPlayerControlData(); + PlayerControlData *GetPlayerControlData(); LinkStateId GetStateId(); s32 GetHealth(); s32 GetCurrentCharacterHealth(); bool func_ov00_020a8c34(); - Vec3p* GetPlayerPos(); - Vec3p* GetPlayerVel(); - unk8* func_ov00_020a8c64(); - s16* GetPlayerAngle(); - void* GetPlayer_Unk18(); + Vec3p *GetPlayerPos(); + Vec3p *GetPlayerVel(); + unk8 *func_ov00_020a8c64(); + s16 *GetPlayerAngle(); + void *GetPlayer_Unk18(); s32 Get_PlayerControlData_Unk32(); - Actor* GetGrabActor(); - ActorRef* GetGrabActorRef(); + Actor *GetGrabActor(); + ActorRef *GetGrabActorRef(); unk32 Grab(); s32 Get_PlayerLinkBase_Unk44(); bool IsEquipBeingUsed(ItemFlag id); - EquipItem* GetEquipItem(ItemFlag id); - void* func_ov00_020a8d40(); + EquipItem *GetEquipItem(ItemFlag id); + void *func_ov00_020a8d40(); unk32 func_ov00_020a8d50(); unk32 func_ov00_020a8d6c(); s32 PlayerControlData_vfunc_14(s32 param1); unk32 Get_PlayerControlData_Unk100(); unk32 Get_PlayerControlData_Unk120(); s32 Get_PlayerLinkBase_Unk38(); - DebugHierarchy* GetDebugHierarchy0(); - DebugHierarchy* GetDebugHierarchy1(); + DebugHierarchy *GetDebugHierarchy0(); + DebugHierarchy *GetDebugHierarchy1(); }; diff --git a/include/Player/LinkStateCutscene.hpp b/include/Player/LinkStateCutscene.hpp index 4b16c4e1..f39c7430 100644 --- a/include/Player/LinkStateCutscene.hpp +++ b/include/Player/LinkStateCutscene.hpp @@ -1,12 +1,11 @@ #pragma once #include "global.h" -#include "types.h" - #include "lib/math.h" +#include "types.h" -#include "Player/LinkStateBase.hpp" #include "Item/Item.hpp" +#include "Player/LinkStateBase.hpp" class LinkStateCutscene : public LinkStateBase { public: diff --git a/include/Player/LinkStateDamage.hpp b/include/Player/LinkStateDamage.hpp index e682c2b3..2c5e6e00 100644 --- a/include/Player/LinkStateDamage.hpp +++ b/include/Player/LinkStateDamage.hpp @@ -1,9 +1,8 @@ #pragma once #include "global.h" -#include "types.h" - #include "lib/math.h" +#include "types.h" #include "Player/LinkStateBase.hpp" #include "Render/ModelRender.hpp" diff --git a/include/Player/LinkStateFollow.hpp b/include/Player/LinkStateFollow.hpp index 0206e493..c422faa1 100644 --- a/include/Player/LinkStateFollow.hpp +++ b/include/Player/LinkStateFollow.hpp @@ -1,9 +1,8 @@ #pragma once #include "global.h" -#include "types.h" - #include "lib/math.h" +#include "types.h" #include "Actor/Actor.hpp" #include "Player/LinkStateBase.hpp" @@ -35,7 +34,7 @@ public: /* 44 */ void MoveTowardTarget(); - LinkStateCutscene* GetLinkStateCutscene(); + LinkStateCutscene *GetLinkStateCutscene(); bool func_ov00_020a9180(Vec3p *param1); bool func_ov00_020a9210(Vec3p *param1, Actor *param2); }; 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(); diff --git a/include/Player/LinkStateItem.hpp b/include/Player/LinkStateItem.hpp index 680ebbd9..591614f2 100644 --- a/include/Player/LinkStateItem.hpp +++ b/include/Player/LinkStateItem.hpp @@ -3,10 +3,10 @@ #include "global.h" #include "types.h" +#include "Item/Item.hpp" +#include "Player/EquipBombchu.hpp" #include "Player/LinkStateBase.hpp" #include "Player/LinkStateMove.hpp" -#include "Player/EquipBombchu.hpp" -#include "Item/Item.hpp" class LinkStateItem : public LinkStateBase { public: @@ -47,7 +47,7 @@ public: /* 44 */ s32 IsHammerEquipped(); // returns 0 if hammer is equipped, otherwise -1 - EquipBombchu* GetEquipBombchu(); - LinkStateMove* GetLinkStateMove(); + EquipBombchu *GetEquipBombchu(); + LinkStateMove *GetLinkStateMove(); bool func_ov00_020abf70(); }; diff --git a/include/Player/MotionParams.hpp b/include/Player/MotionParams.hpp index 017800ff..f04f8a08 100644 --- a/include/Player/MotionParams.hpp +++ b/include/Player/MotionParams.hpp @@ -1,8 +1,8 @@ #pragma once #include "global.h" -#include "types.h" #include "lib/files.h" +#include "types.h" struct MotionParams { /* 00 */ FileEntry motionBhio; // motion.bhio diff --git a/include/Player/PlayerBase.hpp b/include/Player/PlayerBase.hpp index 0b6a5187..578f3e27 100644 --- a/include/Player/PlayerBase.hpp +++ b/include/Player/PlayerBase.hpp @@ -4,10 +4,9 @@ #include "types.h" #include "Item/Item.hpp" -#include "Player/EquipSword.hpp" -#include "Player/EquipShield.hpp" - #include "Physics/Cylinder.hpp" +#include "Player/EquipShield.hpp" +#include "Player/EquipSword.hpp" #include "Render/FadeControl.hpp" #include "System/SysNew.hpp" @@ -28,14 +27,14 @@ public: /* 04 */ virtual bool vfunc_04(); /* 08 */ virtual ItemFlag GetEquipId(); /* 0c */ virtual bool CanMove(); - /* 10 */ virtual void vfunc_10(Cylinder *param1) = 0; - /* 14 */ virtual void vfunc_14(Cylinder *param1) = 0; - /* 18 */ virtual void vfunc_18() = 0; - /* 1c */ virtual void Init() = 0; - /* 20 */ virtual void vfunc_20() = 0; - /* 24 */ virtual void vfunc_24() = 0; - /* 28 */ virtual void vfunc_28(s32 param1) = 0; - /* 2c */ virtual void vfunc_2c(s32 param1, unk8 param2) = 0; + /* 10 */ virtual void vfunc_10(Cylinder *param1) = 0; + /* 14 */ virtual void vfunc_14(Cylinder *param1) = 0; + /* 18 */ virtual void vfunc_18() = 0; + /* 1c */ virtual void Init() = 0; + /* 20 */ virtual void vfunc_20() = 0; + /* 24 */ virtual void vfunc_24() = 0; + /* 28 */ virtual void vfunc_28(s32 param1) = 0; + /* 2c */ virtual void vfunc_2c(s32 param1, unk8 param2) = 0; /* 30 */ virtual bool vfunc_30(s32 param1, Vec3p *param2, s32 param3) = 0; /* 34 */ virtual bool Teleport(Vec3p *pos, s16 angle, unk32 param3, bool param4, bool param5); /* 38 */ virtual bool TeleportToEntrance(unk32 entranceId, bool param2); @@ -49,8 +48,8 @@ public: void SetUpdatePos(bool updatePos); void SetVisible(bool visible); - EquipSword* GetEquipSword(); - EquipShield* GetEquipShield(); + EquipSword *GetEquipSword(); + EquipShield *GetEquipShield(); void LookAt(Vec3p *target); bool func_ov00_020a7c00(s32 param1); bool CollidesWith(Cylinder *cylinder); diff --git a/include/Player/PlayerControl.hpp b/include/Player/PlayerControl.hpp index 5b424979..0e0da8ae 100644 --- a/include/Player/PlayerControl.hpp +++ b/include/Player/PlayerControl.hpp @@ -1,23 +1,22 @@ #pragma once #include "global.h" -#include "types.h" - #include "lib/math.h" +#include "types.h" -#include "Player/TouchControl.hpp" -#include "Player/TouchGesture.hpp" -#include "Actor/ActorManager.hpp" #include "Actor/Actor.hpp" +#include "Actor/ActorManager.hpp" #include "Debug/DebugHierarchy.hpp" #include "Item/Item.hpp" +#include "Player/TouchControl.hpp" +#include "Player/TouchGesture.hpp" typedef u16 TouchEdge; enum TouchEdge_ { - TouchEdge_Right = 0, - TouchEdge_Left = 1, + TouchEdge_Right = 0, + TouchEdge_Left = 1, TouchEdge_Bottom = 2, - TouchEdge_Top = 3, + TouchEdge_Top = 3, TouchEdge_Middle = 4 }; @@ -79,7 +78,7 @@ public: void func_ov00_020aeef8(); void func_ov00_020aef30(); void UpdateAim(); - Actor* GetFollowActor(); + Actor *GetFollowActor(); bool func_ov00_020af01c(unk8 *param1); void SetUnk_80(); void StopFollowing(); diff --git a/include/Player/PlayerControlData.hpp b/include/Player/PlayerControlData.hpp index e772b474..3f998186 100644 --- a/include/Player/PlayerControlData.hpp +++ b/include/Player/PlayerControlData.hpp @@ -1,9 +1,8 @@ #pragma once #include "global.h" -#include "types.h" - #include "lib/math.h" +#include "types.h" #include "System/SysNew.hpp" diff --git a/include/Player/PlayerLinkBase.hpp b/include/Player/PlayerLinkBase.hpp index 09eefeb1..7d9c4b75 100644 --- a/include/Player/PlayerLinkBase.hpp +++ b/include/Player/PlayerLinkBase.hpp @@ -1,24 +1,22 @@ #pragma once #include "global.h" -#include "types.h" #include "lib/math.h" - -#include "Player/PlayerBase.hpp" -#include "Player/MotionParams.hpp" +#include "types.h" #include "Actor/ActorManager.hpp" - #include "Debug/DebugHierarchy.hpp" +#include "Player/MotionParams.hpp" +#include "Player/PlayerBase.hpp" typedef s32 PlayerCharacter; enum PlayerCharacter_ { - PlayerCharacter_Link = 0, + PlayerCharacter_Link = 0, PlayerCharacter_Gongoron = 1, - PlayerCharacter_COUNT = 2, + PlayerCharacter_COUNT = 2, }; -class PlayerLinkBase: public PlayerBase { +class PlayerLinkBase : public PlayerBase { public: /* 00 (base) */ /* 14 */ Vec3p mPos; @@ -44,7 +42,7 @@ public: /* 68 */ DebugHierarchy *mDebugHierarchy_1; /* 6c */ DebugHierarchy *mDebugHierarchy_2; /* 70 */ - + /* 00 */ s32 GetMaxHealth() override; /* 08 */ ItemFlag GetEquipId() override; /* 0c */ bool CanMove() override; diff --git a/include/Player/TouchControl.hpp b/include/Player/TouchControl.hpp index 480ee42c..47349d28 100644 --- a/include/Player/TouchControl.hpp +++ b/include/Player/TouchControl.hpp @@ -1,15 +1,15 @@ #pragma once #include "global.h" -#include "types.h" -#include "lib/touch.h" #include "lib/math.h" +#include "lib/touch.h" +#include "types.h" typedef u16 TouchFlags; enum TouchFlag_ { - TouchFlag_TouchedNow = 0x0001, + TouchFlag_TouchedNow = 0x0001, TouchFlag_UntouchedNow = 0x0002, - TouchFlag_Repeat = 0x0004, + TouchFlag_Repeat = 0x0004, }; class TouchControl { diff --git a/include/Player/TouchGesture.hpp b/include/Player/TouchGesture.hpp index 59a756ef..5009525e 100644 --- a/include/Player/TouchGesture.hpp +++ b/include/Player/TouchGesture.hpp @@ -29,7 +29,7 @@ public: /* 2c */ u16 mTouchX[GESTURE_BUFFER_LENGTH]; /* 48 */ u16 mTouchY[GESTURE_BUFFER_LENGTH]; /* 64 */ - + /* 00 */ virtual ~TouchGesture() override; /* 08 */ virtual void ResetTouchHistory() override; /* 0c */ virtual void Update(void *param1) override; -- cgit v1.2.3