summaryrefslogtreecommitdiff
path: root/include/pso/TObject.h
diff options
context:
space:
mode:
authormrb0nk500 <b0nk@b0nk.xyz>2023-03-05 12:32:38 -0400
committermrb0nk500 <b0nk@b0nk.xyz>2023-03-05 12:32:38 -0400
commit306a76cb444102bc207ee16e8a65aa9e90bbd37a (patch)
treed6e64d7496837bddb89c5ef34be5eca536de4103 /include/pso/TObject.h
parentcb40b0808a639fa0de330cb2b88574a0e8b4d2d5 (diff)
global: Start work on making the codebase match without inlining
It seems more, and more obvious that the codebase was originally compiled without inlining.
Diffstat (limited to 'include/pso/TObject.h')
-rw-r--r--include/pso/TObject.h21
1 files changed, 1 insertions, 20 deletions
diff --git a/include/pso/TObject.h b/include/pso/TObject.h
index ef2cf66..1478871 100644
--- a/include/pso/TObject.h
+++ b/include/pso/TObject.h
@@ -110,9 +110,8 @@ private:
};
-protected:
+public:
const char *m_name;
-private:
union {
object_flags m_flags;
u16 m_flags_u16;
@@ -141,24 +140,6 @@ public:
void *operator new (size_t size) { return alloc(size); };
void operator delete(void *ptr) { free(ptr); };
- const char *name() { return m_name; };
- object_flags flags() { return m_flags; };
- u16 flags_u16() { return m_flags_u16; };
- u16 id() { return m_id; };
- TObject *prev() { return m_prev; };
- TObject *next() { return m_next; };
- TObject *up() { return m_up; };
- TObject *down() { return m_down; };
-
- void set_name(const char *name) { m_name = name; };
- void set_obj_flags(object_flags flags) { m_flags = flags; };
- void set_flags_u16(u16 flags) { m_flags_u16 = flags; };
- void set_id(u16 id) { m_id = id; };
- void set_prev(TObject *node) { m_prev = node; };
- void set_next(TObject *node) { m_next = node; };
- void set_up(TObject *node) { m_up = node; };
- void set_down(TObject *node) { m_down = node; };
-
void delete_children();
void queue_destruction_for_each_node();
void run_tasks();