diff options
| author | Aetias <144526980+AetiasHax@users.noreply.github.com> | 2024-10-19 13:20:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-19 13:20:17 +0200 |
| commit | ffdfd609fb9bc8f968ddc6f187da1d50731cbf69 (patch) | |
| tree | d13b6142759bc78d50a491d87de56e7e9213c9a4 /include/Map/MapBase.hpp | |
| parent | 32c4725191813003e34a263a6d1530f806d1ac7c (diff) | |
| parent | 10c2e3413b3244c5f2adffac1140f37920f13988 (diff) | |
Merge pull request #51 from AetiasHax/dsd
`dsd` integration
Diffstat (limited to 'include/Map/MapBase.hpp')
| -rw-r--r-- | include/Map/MapBase.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp index c9497a0a..f9d08cac 100644 --- a/include/Map/MapBase.hpp +++ b/include/Map/MapBase.hpp @@ -7,11 +7,11 @@ #include "lib/math.h" +#include "Map/CameraViewpoint.hpp" #include "Map/Course.hpp" #include "Map/Entrance.hpp" -#include "Map/TriggerBase.hpp" #include "Map/Exit.hpp" -#include "Map/CameraViewpoint.hpp" +#include "Map/TriggerBase.hpp" #include "System/SysNew.hpp" #define MAX_ENTRANCES 0x40 @@ -94,10 +94,10 @@ public: /* 0e8 */ Vec3p mUnk_0e8; /* 0f4 */ Vec3p mUnk_0f4; /* 100 */ std::vector<Entrance> mEntrances; - /* 10c */ std::vector<TriggerBase*> mTriggers; + /* 10c */ std::vector<TriggerBase *> mTriggers; /* 118 */ std::vector<Exit> mExits; /* 124 */ std::vector<CameraViewpoint> mViewpoints; - /* 130 */ std::vector<TriggerBase*> mUnk_130; + /* 130 */ std::vector<TriggerBase *> mUnk_130; /* 13c */ unk32 mUnk_13c; /* 140 */ unk32 mUnk_140; /* 144 */ void *mUnk_144; @@ -144,7 +144,7 @@ public: /* 68 */ virtual unk8 vfunc_68(unk32 param_2, unk32 param_3); /* 6c */ virtual unk8 vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4); /* 70 */ virtual unk32 vfunc_70(Vec3p *param_2); - /* 74 */ virtual s32* vfunc_74(Vec3p *param_2); + /* 74 */ virtual s32 *vfunc_74(Vec3p *param_2); /* 78 */ virtual unk32 vfunc_78(); /* 7c */ virtual unk32 vfunc_7c(); /* 80 */ virtual unk32 vfunc_80(); @@ -206,7 +206,7 @@ public: unk8 GetTriggerBoundingBoxes(unk32 param_2, AABB *param_3, unk32 param_4); unk32 GetOverlappingTrigger(Vec3p *param_2); unk8 FindTrigger(unk32 type); - unk8 GetOverlappingTriggers(Vec3p *param_2, TriggerBase * *triggers, unk32 capacity); + unk8 GetOverlappingTriggers(Vec3p *param_2, TriggerBase **triggers, unk32 capacity); bool IsTriggerTypeOverlapped(unk32 type, Vec3p *param_3); bool AnyTrigger_func_0c(unk32 type); unk8 Trigger_vfunc_08(); |