diff options
| author | Aetias <aetias@outlook.com> | 2024-10-22 21:25:59 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-10-22 21:25:59 +0200 |
| commit | bced23471af823a455810168448db457ec03097b (patch) | |
| tree | af67e96af257262d1e358779783e9b3960072b05 /include | |
| parent | 52d4fce35141121262d0a93b64f2f778ef89767a (diff) | |
Decomp `ActorManager`
Diffstat (limited to 'include')
| -rw-r--r-- | include/Actor/ActorManager.hpp | 2 | ||||
| -rw-r--r-- | include/Map/MapManager.hpp | 2 | ||||
| -rw-r--r-- | include/Physics/AABB.hpp | 1 | ||||
| -rw-r--r-- | include/global.h | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/include/Actor/ActorManager.hpp b/include/Actor/ActorManager.hpp index d4acdc5f..88a9cc0b 100644 --- a/include/Actor/ActorManager.hpp +++ b/include/Actor/ActorManager.hpp @@ -90,7 +90,7 @@ public: Actor *func_ov00_020c39ac(u32 index, ActorTypeId *actorTypes, bool param3); s32 func_ov00_020c3b2c(s32 *param1); s32 func_ov00_020c3bb0(unk32 param1, s32 *param2); - void func_ov00_020c3ce8(unk32 param1, unk32 param2); + void func_ov00_020c3ce8(unk32 param1, bool param2); void Actor_vfunc_28(); static bool ActorTypeIsOneOf(ActorTypeId type, ActorTypeId *types); }; diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index 4e969c5a..ff3397b9 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -131,7 +131,7 @@ public: bool GetEntrancePos(Vec3p *param_2, unk32 entranceId); bool func_ov00_02083664(Vec3p *param_2, unk32 entranceId); s32 func_ov00_020836bc(u32 param_2, unk32 *param_3); - u32 func_ov00_020836cc(u32 param_2, AABB *param_3, u32 param_4); + s32 GetTriggerBoundingBoxes(u32 param_2, AABB *param_3, u32 param_4); unk8 func_ov00_020836dc(unk32 param_2, unk32 param_3); bool func_ov00_02083770(u32 param_2, unk32 param_3); bool func_ov00_02083780(unk32 param_2); diff --git a/include/Physics/AABB.hpp b/include/Physics/AABB.hpp index 07f64910..ef90ffcd 100644 --- a/include/Physics/AABB.hpp +++ b/include/Physics/AABB.hpp @@ -9,5 +9,6 @@ struct AABB { Vec3p min; Vec3p max; + bool Contains(Vec3p *vec); bool ContainsInXZ(Vec3p *vec); }; diff --git a/include/global.h b/include/global.h index 83b4c87f..617f672f 100644 --- a/include/global.h +++ b/include/global.h @@ -7,6 +7,8 @@ #define SET_FLAG(arr, pos) ((arr)[((u32) (pos)) >> 5] |= 1 << ((pos) & 0x1f)) #define RESET_FLAG(arr, pos) ((arr)[((u32) (pos)) >> 5] &= ~(1 << ((pos) & 0x1f))) +#define ARRAY_LEN(arr) ((sizeof(arr) / sizeof(*arr))) + // Prevent the IDE from reporting errors that the compiler/linker won't report #ifdef __INTELLISENSE__ #endif |