From 55d7db1ea564454629454b79925edc72b34d6d57 Mon Sep 17 00:00:00 2001 From: mrb0nk500 Date: Sun, 12 Feb 2023 12:22:47 -0400 Subject: TObject: Add `m_` prefix to non-function members, and remove `get_` from getter function names --- src/pso/TObject.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/pso') diff --git a/src/pso/TObject.cpp b/src/pso/TObject.cpp index 3fa37d2..9c97146 100644 --- a/src/pso/TObject.cpp +++ b/src/pso/TObject.cpp @@ -42,7 +42,7 @@ void *TObject::alloc(size_t size) { bool TObject::all_parents_unqueued_for_destruction() { - for (TObject *parent = this; parent != NULL; parent = parent->up) { + for (TObject *parent = this; parent != NULL; parent = parent->m_up) { if (parent->get_flags(QUEUE_DESTRUCTION)) { return false; } @@ -54,7 +54,7 @@ int TObject::get_node_count() { // NOTE: The order of the variable declarations matter for matching. TObject *child; int node_count = 0; - FOREACH_NODE_NODECL(TObject, this->down, child) { + FOREACH_NODE_NODECL(TObject, this->m_down, child) { node_count += child->get_node_count() + 1; } return node_count; @@ -90,7 +90,7 @@ void TObject::empty_func() { } void TObject::render_nodes2() { - FOREACH_NODE(TObject, this->down, child) { + FOREACH_NODE(TObject, this->m_down, child) { if (child->get_flags(BIT_9)) { child->render(); child->clear_flag_9(); @@ -100,7 +100,7 @@ void TObject::render_nodes2() { } void TObject::render_shadows_for_each_node() { - FOREACH_NODE(TObject, this->down, child) { + FOREACH_NODE(TObject, this->m_down, child) { if (!child->get_flags(DISALLOW_RENDER_SHADOWS)) { child->render_shadows(); child->render_shadows_for_each_node(); @@ -109,7 +109,7 @@ void TObject::render_shadows_for_each_node() { } void TObject::render_nodes() { - FOREACH_NODE(TObject, this->down, child) { + FOREACH_NODE(TObject, this->m_down, child) { if (!child->get_flags(DISALLOW_RENDER)) { child->render(); child->render_nodes(); @@ -119,10 +119,10 @@ void TObject::render_nodes() { // Perfect match, needed to do some weird stuff to get it to match, see below. void TObject::run_tasks() { - TObject *child = this->down; - while (this->down != NULL && child != NULL) { + TObject *child = this->m_down; + while (this->m_down != NULL && child != NULL) { TObject *node = child; - child = child->next; + child = child->m_next; if (node->get_flags(DISALLOW_UPDATE)) { // Clearing flag 0 in the if statement is required to match. if (node->get_flags(QUEUE_DESTRUCTION) && (node->clear_flags(QUEUE_DESTRUCTION), !node->get_flags(DISALLOW_DESTRUCTION))) { @@ -149,7 +149,7 @@ void TObject::run_tasks() { } void TObject::queue_destruction_for_each_node() { - FOREACH_NODE(TObject, this->down, child) { + FOREACH_NODE(TObject, this->m_down, child) { child->queue_destruction(); child->queue_destruction_for_each_node(); } @@ -168,9 +168,9 @@ TObject::~TObject() { } TObject::TObject(TObject *parent) { - flags = NONE; - up = parent; - down = NULL; - name = TObject_name; + m_flags = NONE; + m_up = parent; + m_down = NULL; + m_name = TObject_name; add_parent(parent, false); } -- cgit v1.2.3-13-gbd6f