From 135436ed81d155faff26d6969b39ad9c6c77cb73 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 19 May 2024 13:04:14 +0200 Subject: Rename `PlayerBase::CollidesWith` --- src/00_Core/Player/PlayerBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/00_Core/Player/PlayerBase.cpp') diff --git a/src/00_Core/Player/PlayerBase.cpp b/src/00_Core/Player/PlayerBase.cpp index 24619493..c5a93674 100644 --- a/src/00_Core/Player/PlayerBase.cpp +++ b/src/00_Core/Player/PlayerBase.cpp @@ -11,7 +11,7 @@ EquipSword* PlayerBase::GetEquipSword() {} EquipShield* PlayerBase::GetEquipShield() {} void PlayerBase::LookAt(Vec3p *target) {} bool PlayerBase::func_ov00_020a7c00(s32 param1) {} -bool PlayerBase::func_ov00_020a7c1c(Cylinder *cylinder) {} +bool PlayerBase::CollidesWith(Cylinder *cylinder) {} bool PlayerBase::func_ov00_020a7c60(Vec3p *param1, Vec3p *param2, s32 param3) {} void PlayerBase::EquipItem_vfunc_3c(Cylinder *cylinder, ItemFlag equipId) {} void PlayerBase::EquipItem_vfunc_2c() {} -- cgit v1.2.3 From 31669e142453758d8ee4278043943329ac830984 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 26 May 2024 10:49:32 +0200 Subject: Decomp `Actor` --- src/00_Core/Player/PlayerBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/00_Core/Player/PlayerBase.cpp') diff --git a/src/00_Core/Player/PlayerBase.cpp b/src/00_Core/Player/PlayerBase.cpp index c5a93674..dfdb4eb5 100644 --- a/src/00_Core/Player/PlayerBase.cpp +++ b/src/00_Core/Player/PlayerBase.cpp @@ -14,7 +14,7 @@ bool PlayerBase::func_ov00_020a7c00(s32 param1) {} bool PlayerBase::CollidesWith(Cylinder *cylinder) {} bool PlayerBase::func_ov00_020a7c60(Vec3p *param1, Vec3p *param2, s32 param3) {} void PlayerBase::EquipItem_vfunc_3c(Cylinder *cylinder, ItemFlag equipId) {} -void PlayerBase::EquipItem_vfunc_2c() {} +s32 PlayerBase::EquipItem_vfunc_2c() {} void PlayerBase::SetHealth(s16 health) {} void PlayerBase::AddHealth(s16 amount) {} bool PlayerBase::Teleport(Vec3p *pos, s16 angle, unk32 param3, bool param4, bool param5) {} -- cgit v1.2.3 From 1fe5a6157587401e122c864f3b50cd223f4d4f98 Mon Sep 17 00:00:00 2001 From: Aetias Date: Thu, 20 Jun 2024 18:48:09 +0200 Subject: Remove `#ifdef STUBS` --- src/00_Core/Player/PlayerBase.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/00_Core/Player/PlayerBase.cpp') diff --git a/src/00_Core/Player/PlayerBase.cpp b/src/00_Core/Player/PlayerBase.cpp index 24619493..a9d83c5b 100644 --- a/src/00_Core/Player/PlayerBase.cpp +++ b/src/00_Core/Player/PlayerBase.cpp @@ -1,7 +1,5 @@ #include "Player/PlayerLinkBase.hpp" -#ifdef STUBS - bool PlayerBase::vfunc_04() {} ItemFlag PlayerBase::GetEquipId() {} bool PlayerBase::CanMove() {} @@ -20,5 +18,3 @@ void PlayerBase::AddHealth(s16 amount) {} bool PlayerBase::Teleport(Vec3p *pos, s16 angle, unk32 param3, bool param4, bool param5) {} bool PlayerBase::TeleportToEntrance(unk32 entranceId, bool param2) {} bool PlayerBase::TeleportToLastEntrance(bool param1) {} - -#endif -- cgit v1.2.3 From c7195d52d9349369725d7e8eb5f6c6e0a5f57dce Mon Sep 17 00:00:00 2001 From: Aetias Date: Fri, 21 Jun 2024 12:05:31 +0200 Subject: Fix build error --- src/00_Core/Player/PlayerBase.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/00_Core/Player/PlayerBase.cpp') diff --git a/src/00_Core/Player/PlayerBase.cpp b/src/00_Core/Player/PlayerBase.cpp index fc5c92fb..4736b928 100644 --- a/src/00_Core/Player/PlayerBase.cpp +++ b/src/00_Core/Player/PlayerBase.cpp @@ -1,4 +1,4 @@ -#include "Player/PlayerLinkBase.hpp" +#include "Player/PlayerBase.hpp" bool PlayerBase::vfunc_04() {} ItemFlag PlayerBase::GetEquipId() {} @@ -11,7 +11,7 @@ void PlayerBase::LookAt(Vec3p *target) {} bool PlayerBase::func_ov00_020a7c00(s32 param1) {} bool PlayerBase::CollidesWith(Cylinder *cylinder) {} bool PlayerBase::func_ov00_020a7c60(Vec3p *param1, Vec3p *param2, s32 param3) {} -void PlayerBase::EquipItem_vfunc_3c(Cylinder *cylinder, ItemFlag equipId) {} +bool PlayerBase::EquipCollidesWith(Cylinder *cylinder, ItemFlag equipId) {} s32 PlayerBase::EquipItem_vfunc_2c() {} void PlayerBase::SetHealth(s16 health) {} void PlayerBase::AddHealth(s16 amount) {} -- cgit v1.2.3 From 0b6c727e36a764c1eee496ab80b14a5da00f21c5 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 12 Oct 2024 16:16:32 +0200 Subject: Add `.clang-format` --- src/00_Core/Player/PlayerBase.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/00_Core/Player/PlayerBase.cpp') 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) {} -- cgit v1.2.3