summaryrefslogtreecommitdiff
path: root/src/KingSystem/Physics/System/physSystem.h
diff options
context:
space:
mode:
authorMichael Zhao <44533763+Pistonight@users.noreply.github.com>2026-07-30 17:06:14 -0700
committerGitHub <noreply@github.com>2026-07-30 17:06:14 -0700
commit7c65472576f5857bbcca71697f5e71aa93af6f8c (patch)
treedc415e01bcc296d7312aaf6cd6c94367b6cac394 /src/KingSystem/Physics/System/physSystem.h
parent4f1f92f132249b67316565ff5cb2fb4370c5c725 (diff)
parentc6c8beaf58523d2bc045e4753ac6ad8736d317f3 (diff)
Merge pull request #185 from RobbyV2/phys-system-heap-accessorsHEADmaster
Match phys::System heap accessors
Diffstat (limited to 'src/KingSystem/Physics/System/physSystem.h')
-rw-r--r--src/KingSystem/Physics/System/physSystem.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/KingSystem/Physics/System/physSystem.h b/src/KingSystem/Physics/System/physSystem.h
index 67559001..9c48510d 100644
--- a/src/KingSystem/Physics/System/physSystem.h
+++ b/src/KingSystem/Physics/System/physSystem.h
@@ -18,6 +18,7 @@ class ContactListener;
class ContactMgr;
class ContactPointInfo;
class GroupFilter;
+class HavokMemoryAllocator;
class LayerContactPointInfo;
class MaterialTable;
class RayCastForRequest;
@@ -133,7 +134,8 @@ public:
// 0x000000710121684c
void decrementWorldUnkCounter(ContactLayerType layer_type);
- // 0x0000007101216cec
+ bool isHavokMainHeapOom() const;
+
sead::Heap* getPhysicsTempHeap(LowPriority low_priority) const;
private:
@@ -145,7 +147,8 @@ private:
float _6c = 1.0;
float _70 = 1.0 / 30.0;
float mTimeFactor{};
- u8 _78[0xa8 - 0x78];
+ HavokMemoryAllocator* mHavokAllocator{};
+ u8 _80[0xa8 - 0x80];
sead::CriticalSection mCS;
void* _e8{};
void* _f0{};