summaryrefslogtreecommitdiff
path: root/src/00_Core/Player
diff options
context:
space:
mode:
authorAetias <144526980+AetiasHax@users.noreply.github.com>2024-10-19 13:20:17 +0200
committerGitHub <noreply@github.com>2024-10-19 13:20:17 +0200
commitffdfd609fb9bc8f968ddc6f187da1d50731cbf69 (patch)
treed13b6142759bc78d50a491d87de56e7e9213c9a4 /src/00_Core/Player
parent32c4725191813003e34a263a6d1530f806d1ac7c (diff)
parent10c2e3413b3244c5f2adffac1140f37920f13988 (diff)
Merge pull request #51 from AetiasHax/dsd
`dsd` integration
Diffstat (limited to 'src/00_Core/Player')
-rw-r--r--src/00_Core/Player/LinkStateBase.cpp26
-rw-r--r--src/00_Core/Player/LinkStateFollow.cpp2
-rw-r--r--src/00_Core/Player/LinkStateInteract.cpp2
-rw-r--r--src/00_Core/Player/LinkStateItem.cpp4
-rw-r--r--src/00_Core/Player/PlayerBase.cpp4
-rw-r--r--src/00_Core/Player/PlayerControl.cpp2
6 files changed, 20 insertions, 20 deletions
diff --git a/src/00_Core/Player/LinkStateBase.cpp b/src/00_Core/Player/LinkStateBase.cpp
index abe7bd34..7479667e 100644
--- a/src/00_Core/Player/LinkStateBase.cpp
+++ b/src/00_Core/Player/LinkStateBase.cpp
@@ -14,7 +14,7 @@ void LinkStateBase::ChangeLinkSubState(LinkStateId id, s32 subState) {}
void LinkStateBase::EquipItem_vfunc_28() {}
void LinkStateBase::UpdateSwordShieldInUse() {}
void LinkStateBase::func_ov00_020a81b8(unk32 param1, unk32 param2) {}
-LinkStateItem* LinkStateBase::GetLinkItemState() {}
+LinkStateItem *LinkStateBase::GetLinkItemState() {}
void LinkStateBase::LookAt(Vec3p *target) {}
void LinkStateBase::func_ov00_020a81fc() {}
void LinkStateBase::AddHealth(s16 amount) {}
@@ -57,29 +57,29 @@ bool LinkStateBase::HasFlags_PlayerLinkBase_Unk48(u16 flags) {}
unk8 LinkStateBase::Get_PlayerLinkBase_Unk5e() {}
unk32 LinkStateBase::Get_PlayerControlData_Unk004() {}
PlayerCharacter LinkStateBase::GetCurrentCharacter() {}
-PlayerControlData* LinkStateBase::GetPlayerControlData() {}
+PlayerControlData *LinkStateBase::GetPlayerControlData() {}
LinkStateId LinkStateBase::GetStateId() {}
s32 LinkStateBase::GetHealth() {}
s32 LinkStateBase::GetCurrentCharacterHealth() {}
bool LinkStateBase::func_ov00_020a8c34() {}
-Vec3p* LinkStateBase::GetPlayerPos() {}
-Vec3p* LinkStateBase::GetPlayerVel() {}
-unk8* LinkStateBase::func_ov00_020a8c64() {}
-s16* LinkStateBase::GetPlayerAngle() {}
-void* LinkStateBase::GetPlayer_Unk18() {}
+Vec3p *LinkStateBase::GetPlayerPos() {}
+Vec3p *LinkStateBase::GetPlayerVel() {}
+unk8 *LinkStateBase::func_ov00_020a8c64() {}
+s16 *LinkStateBase::GetPlayerAngle() {}
+void *LinkStateBase::GetPlayer_Unk18() {}
s32 LinkStateBase::Get_PlayerControlData_Unk32() {}
-Actor* LinkStateBase::GetGrabActor() {}
-ActorRef* LinkStateBase::GetGrabActorRef() {}
+Actor *LinkStateBase::GetGrabActor() {}
+ActorRef *LinkStateBase::GetGrabActorRef() {}
unk32 LinkStateBase::Grab() {}
s32 LinkStateBase::Get_PlayerLinkBase_Unk44() {}
bool LinkStateBase::IsEquipBeingUsed(ItemFlag id) {}
-EquipItem* LinkStateBase::GetEquipItem(ItemFlag id) {}
-void* LinkStateBase::func_ov00_020a8d40() {}
+EquipItem *LinkStateBase::GetEquipItem(ItemFlag id) {}
+void *LinkStateBase::func_ov00_020a8d40() {}
unk32 LinkStateBase::func_ov00_020a8d50() {}
unk32 LinkStateBase::func_ov00_020a8d6c() {}
s32 LinkStateBase::PlayerControlData_vfunc_14(s32 param1) {}
unk32 LinkStateBase::Get_PlayerControlData_Unk100() {}
unk32 LinkStateBase::Get_PlayerControlData_Unk120() {}
s32 LinkStateBase::Get_PlayerLinkBase_Unk38() {}
-DebugHierarchy* LinkStateBase::GetDebugHierarchy0() {}
-DebugHierarchy* LinkStateBase::GetDebugHierarchy1() {}
+DebugHierarchy *LinkStateBase::GetDebugHierarchy0() {}
+DebugHierarchy *LinkStateBase::GetDebugHierarchy1() {}
diff --git a/src/00_Core/Player/LinkStateFollow.cpp b/src/00_Core/Player/LinkStateFollow.cpp
index 69d173dd..4ffbb0a4 100644
--- a/src/00_Core/Player/LinkStateFollow.cpp
+++ b/src/00_Core/Player/LinkStateFollow.cpp
@@ -6,7 +6,7 @@ void LinkStateFollow::MoveTowardTarget() {}
void LinkStateFollow::OnStateLeave(s32 param1) {}
bool LinkStateFollow::vfunc_24(s32 param1) {}
bool LinkStateFollow::vfunc_28() {}
-LinkStateCutscene* LinkStateFollow::GetLinkStateCutscene() {}
+LinkStateCutscene *LinkStateFollow::GetLinkStateCutscene() {}
bool LinkStateFollow::vfunc_34(Vec3p *param1) {}
bool LinkStateFollow::func_ov00_020a9180(Vec3p *param1) {}
bool LinkStateFollow::func_ov00_020a9210(Vec3p *param1, Actor *param2) {}
diff --git a/src/00_Core/Player/LinkStateInteract.cpp b/src/00_Core/Player/LinkStateInteract.cpp
index 6cbda713..cf71654d 100644
--- a/src/00_Core/Player/LinkStateInteract.cpp
+++ b/src/00_Core/Player/LinkStateInteract.cpp
@@ -9,7 +9,7 @@ void LinkStateInteract::OnStateLeave(s32 param1) {}
bool LinkStateInteract::func_ov00_020aa818() {}
void LinkStateInteract::func_ov00_020aa844(Actor *param1) {}
bool LinkStateInteract::vfunc_20(s32 param1) {}
-LinkStateRoll* LinkStateInteract::GetLinkStateRoll() {}
+LinkStateRoll *LinkStateInteract::GetLinkStateRoll() {}
bool LinkStateInteract::vfunc_24(s32 param1) {}
bool LinkStateInteract::vfunc_34(Vec3p *param1) {}
void LinkStateInteract::SetGrabActorVelocity(Vec3p *velocity) {}
diff --git a/src/00_Core/Player/LinkStateItem.cpp b/src/00_Core/Player/LinkStateItem.cpp
index eaf3c8b6..ecedca78 100644
--- a/src/00_Core/Player/LinkStateItem.cpp
+++ b/src/00_Core/Player/LinkStateItem.cpp
@@ -4,7 +4,7 @@ void LinkStateItem::vfunc_00() {}
LinkStateId LinkStateItem::GetId() {}
s32 LinkStateItem::IsHammerEquipped() {}
void LinkStateItem::OnStateLeave(s32 param1) {}
-EquipBombchu* LinkStateItem::GetEquipBombchu() {}
-LinkStateMove* LinkStateItem::GetLinkStateMove() {}
+EquipBombchu *LinkStateItem::GetEquipBombchu() {}
+LinkStateMove *LinkStateItem::GetLinkStateMove() {}
bool LinkStateItem::func_ov00_020abf70() {}
bool LinkStateItem::vfunc_28() {}
diff --git a/src/00_Core/Player/PlayerBase.cpp b/src/00_Core/Player/PlayerBase.cpp
index 4736b928..a33dc210 100644
--- a/src/00_Core/Player/PlayerBase.cpp
+++ b/src/00_Core/Player/PlayerBase.cpp
@@ -5,8 +5,8 @@ ItemFlag PlayerBase::GetEquipId() {}
bool PlayerBase::CanMove() {}
void PlayerBase::SetUpdatePos(bool updatePos) {}
void PlayerBase::SetVisible(bool visible) {}
-EquipSword* PlayerBase::GetEquipSword() {}
-EquipShield* PlayerBase::GetEquipShield() {}
+EquipSword *PlayerBase::GetEquipSword() {}
+EquipShield *PlayerBase::GetEquipShield() {}
void PlayerBase::LookAt(Vec3p *target) {}
bool PlayerBase::func_ov00_020a7c00(s32 param1) {}
bool PlayerBase::CollidesWith(Cylinder *cylinder) {}
diff --git a/src/00_Core/Player/PlayerControl.cpp b/src/00_Core/Player/PlayerControl.cpp
index f51d0a89..6cf39bda 100644
--- a/src/00_Core/Player/PlayerControl.cpp
+++ b/src/00_Core/Player/PlayerControl.cpp
@@ -4,7 +4,7 @@ bool PlayerControl::func_ov00_020aeeac() {}
void PlayerControl::func_ov00_020aeef8() {}
void PlayerControl::func_ov00_020aef30() {}
void PlayerControl::UpdateAim() {}
-Actor* PlayerControl::GetFollowActor() {}
+Actor *PlayerControl::GetFollowActor() {}
bool PlayerControl::func_ov00_020af01c(unk8 *param1) {}
void PlayerControl::SetUnk_80() {}
void PlayerControl::StopFollowing() {}