summaryrefslogtreecommitdiff
path: root/include/f
diff options
context:
space:
mode:
authorElijah Thomas <42302100+elijah-thomas774@users.noreply.github.com>2024-10-16 15:36:02 -0400
committerGitHub <noreply@github.com>2024-10-16 15:36:02 -0400
commit26af4db82da23364961ebb440efba88846240731 (patch)
tree9cfe6a427cfe59c13c64928ccef6ba3c5ccfec21 /include/f
parent4543ec129ec02649b24ae0e20d8325a5f066c9b1 (diff)
update from dtk-template - clangd :) (#66)
* update from dtk-template and start work towards using clangd * include <a> -> "a" * Update build.yml * remove/add non-trivial class in union warning
Diffstat (limited to 'include/f')
-rw-r--r--include/f/f_base.h3
-rw-r--r--include/f/f_helper_unk.h2
-rw-r--r--include/f/f_list_mg.h3
-rw-r--r--include/f/f_list_mg_ptmf.h4
-rw-r--r--include/f/f_list_nd.h2
-rw-r--r--include/f/f_list_nd_prio.h3
-rw-r--r--include/f/f_profile.h28
-rw-r--r--include/f/f_tree_mg.h3
-rw-r--r--include/f/f_tree_mg_ptmf.h3
-rw-r--r--include/f/f_tree_nd.h3
10 files changed, 30 insertions, 24 deletions
diff --git a/include/f/f_base.h b/include/f/f_base.h
index cd6bc24a..cc6d8005 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 "common.h"
#include "egg/core/eggExpHeap.h"
#include "egg/core/eggFrmHeap.h"
#include "f/f_base_id.h"
@@ -13,8 +14,6 @@
#include "f/f_manager.h"
#include "f/f_profile.h"
-#include <common.h>
-
// Ghidra: fBase
// size: 0x64
diff --git a/include/f/f_helper_unk.h b/include/f/f_helper_unk.h
index 6d755313..4c8919ff 100644
--- a/include/f/f_helper_unk.h
+++ b/include/f/f_helper_unk.h
@@ -4,7 +4,7 @@
// This file was ported from
// https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_helper_unk.hpp
-#include <common.h>
+#include "common.h"
/// @brief [A helper class for fBase_c with unknown purpose].
/// @note Unofficial name.
diff --git a/include/f/f_list_mg.h b/include/f/f_list_mg.h
index c6601f21..d1c754fb 100644
--- a/include/f/f_list_mg.h
+++ b/include/f/f_list_mg.h
@@ -5,10 +5,11 @@
// https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_list_mg.hpp
#include "c/c_list.h"
+#include "common.h"
#include "f/f_base_id.h"
#include "f/f_list_nd.h"
#include "f/f_profile.h"
-#include <common.h>
+
class fBase_c;
diff --git a/include/f/f_list_mg_ptmf.h b/include/f/f_list_mg_ptmf.h
index 30b3f491..a0f3a24b 100644
--- a/include/f/f_list_mg_ptmf.h
+++ b/include/f/f_list_mg_ptmf.h
@@ -4,11 +4,11 @@
// This file was ported from
// https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_list_mg_ptmf.hpp
-#include <common.h>
-
+#include "common.h"
#include "f/f_list_mg.h"
#include "f/f_list_nd_prio.h"
+
class fBase_c;
/// @brief A list of fLiNdPrio_c nodes with a reference to a process function.
diff --git a/include/f/f_list_nd.h b/include/f/f_list_nd.h
index 4ef42769..fabac72c 100644
--- a/include/f/f_list_nd.h
+++ b/include/f/f_list_nd.h
@@ -5,7 +5,7 @@
// https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_list_nd.hpp
#include "c/c_list.h"
-#include <common.h>
+#include "common.h"
class fBase_c;
diff --git a/include/f/f_list_nd_prio.h b/include/f/f_list_nd_prio.h
index 16785e39..a2905c68 100644
--- a/include/f/f_list_nd_prio.h
+++ b/include/f/f_list_nd_prio.h
@@ -4,9 +4,10 @@
// This file was ported from
// https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_list_nd_prio.hpp
+#include "common.h"
#include "f/f_list_nd.h"
#include "f/f_profile.h"
-#include <common.h>
+
/// @brief A list node with priority fields for an order in a list.
/// @note Unofficial name.
diff --git a/include/f/f_profile.h b/include/f/f_profile.h
index 43ee7750..b887d216 100644
--- a/include/f/f_profile.h
+++ b/include/f/f_profile.h
@@ -3,32 +3,34 @@
// Ported from https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_profile.hpp
+#include "common.h"
#include "f/f_profile_name.h"
-#include <common.h>
+
/// @brief Creates a profile of a base with given values for execute and draw order.
-#define SPECIAL_BASE_PROFILE(profName, className, executeOrder, drawOrder, baseProperties) \
- void *className##_classInit() { \
- return new className(); \
- } \
+#define SPECIAL_BASE_PROFILE(profName, className, executeOrder, drawOrder, baseProperties) \
+ void *className##_classInit() { \
+ return new className(); \
+ } \
fProfile::fBaseProfile_c g_profile_##profName = {&className##_classInit, executeOrder, drawOrder, baseProperties}
/// @brief Creates a profile of an actor with given values for execute and draw order and the actor properties. @see
/// SPECIAL_BASE_PROFILE
-#define SPECIAL_ACTOR_PROFILE(profName, className, executeOrder, drawOrder, baseProperties, properties) \
- void *className##_classInit() { \
- return new className(); \
- } \
- fProfile::fActorProfile_c g_profile_##profName = {&className##_classInit, executeOrder, drawOrder, baseProperties, \
- properties}
+#define SPECIAL_ACTOR_PROFILE(profName, className, executeOrder, drawOrder, baseProperties, properties) \
+ void *className##_classInit() { \
+ return new className(); \
+ } \
+ fProfile::fActorProfile_c g_profile_##profName = { \
+ &className##_classInit, executeOrder, drawOrder, baseProperties, properties \
+ }
/// @brief Creates a profile for a base, with the profile number as the priority for both the draw and execute order.
/// @see SPECIAL_BASE_PROFILE
-#define DEFAULT_BASE_PROFILE(profName, className) \
+#define DEFAULT_BASE_PROFILE(profName, className) \
SPECIAL_BASE_PROFILE(profName, className, fProfile::profName, fProfile::profName);
/// @brief Creates a profile of an actor with default values. @see DEFAULT_BASE_PROFILE
-#define DEFAULT_ACTOR_PROFILE(profName, className, baseProperties, properties) \
+#define DEFAULT_ACTOR_PROFILE(profName, className, baseProperties, properties) \
SPECIAL_ACTOR_PROFILE(profName, className, fProfile::profName, fProfile::profName, baseProperties, properties);
/*
diff --git a/include/f/f_tree_mg.h b/include/f/f_tree_mg.h
index d53e4a64..3988aedc 100644
--- a/include/f/f_tree_mg.h
+++ b/include/f/f_tree_mg.h
@@ -5,8 +5,9 @@
// https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_tree_mg.hpp
#include "c/c_tree.h"
+#include "common.h"
#include "f/f_profile.h"
-#include <common.h>
+
class fTrNdBa_c;
diff --git a/include/f/f_tree_mg_ptmf.h b/include/f/f_tree_mg_ptmf.h
index 07ea3221..bdbecda0 100644
--- a/include/f/f_tree_mg_ptmf.h
+++ b/include/f/f_tree_mg_ptmf.h
@@ -5,8 +5,9 @@
// https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_tree_mg_ptmf.hpp
#include "c/c_tree.h"
+#include "common.h"
#include "f/f_tree_mg.h"
-#include <common.h>
+
class fBase_c;
diff --git a/include/f/f_tree_nd.h b/include/f/f_tree_nd.h
index 7f0bbec7..d6b2a612 100644
--- a/include/f/f_tree_nd.h
+++ b/include/f/f_tree_nd.h
@@ -5,8 +5,9 @@
// https://github.com/NSMBW-Community/NSMBW-Decomp/blob/master/include/dol/framework/f_tree_nd.hpp
#include "c/c_tree.h"
+#include "common.h"
#include "f/f_profile.h"
-#include <common.h>
+
class fBase_c;