summaryrefslogtreecommitdiff
path: root/include/f
diff options
context:
space:
mode:
authorrobojumper <robojumper@gmail.com>2025-04-07 11:29:30 +0200
committerrobojumper <robojumper@gmail.com>2025-04-07 14:02:19 +0200
commit35f90de9295c22580031a5bed5d280433e321217 (patch)
tree4479a6b055747b88361e545e08a0fd91dc5fdc88 /include/f
parent5172f5a99ae26cd0ff797785a328f40c88fb33d3 (diff)
Link f_base in the least intrusive way
Diffstat (limited to 'include/f')
-rw-r--r--include/f/f_base.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/f/f_base.h b/include/f/f_base.h
index cc6d8005..c24095fe 100644
--- a/include/f/f_base.h
+++ b/include/f/f_base.h
@@ -5,6 +5,7 @@
// https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_base.hpp and the Skyward Sword
// Ghidra database. Comments and docs can be seen above. stripped in this file for easier looking
+#include "c/c_list.h"
#include "common.h"
#include "egg/core/eggExpHeap.h"
#include "egg/core/eggFrmHeap.h"
@@ -31,7 +32,7 @@ public:
/* 0x0F */ u8 proc_control;
/* 0x10 */ fManager_c manager;
/* 0x50 */ fBaHelper_c *p_helper;
- /* 0x54 */ fLiMgBa_c actor_list;
+ /* 0x54 */ cListMg_c actor_list;
/* 0x5C */ EGG::FrmHeap *p_heap;
/* 0x60 */ // vtable
public:
@@ -83,10 +84,6 @@ public:
proc_control &= ~flag;
}
- fManager_c *getManager() {
- return &manager;
- }
-
void setParams() {
unique_ID = m_rootUniqueID;
params = m_tmpCtData.params;