[WIP] REGRESS: Segfault bisecting

vabold · Feb 23, 2025 · aa797ad · aa797ad
1 parent 153ed3a
commit aa797ad
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 27 deletions.
diff --git a/source/game/field/ObjectCollisionKart.cc b/source/game/field/ObjectCollisionKart.cc
@@ -12,9 +12,7 @@ namespace Field {
 ObjectCollisionKart::ObjectCollisionKart() : m_kartObject(nullptr) {}
 
 /// @addr{0x8081E0E4}
-ObjectCollisionKart::~ObjectCollisionKart() {
-    delete m_hull;
-}
+ObjectCollisionKart::~ObjectCollisionKart() = default;
 
 /// @addr{0x8081D090}
 void ObjectCollisionKart::init(u32 idx) {

diff --git a/source/game/field/ObjectDirector.cc b/source/game/field/ObjectDirector.cc
@@ -45,10 +45,6 @@ void ObjectDirector::addObject(ObjectCollidable *obj) {
     m_objects.push_back(obj);
 }
 
-void ObjectDirector::addObjectNoImpl(ObjectNoImpl *obj) {
-    m_objects.push_back(obj);
-}
-
 /// @addr{0x8082AB04}
 size_t ObjectDirector::checkKartObjectCollision(Kart::KartObject *kartObj,
         ObjectCollisionConvexHull *convexHull) {

diff --git a/source/game/field/ObjectDirector.hh b/source/game/field/ObjectDirector.hh
@@ -4,7 +4,6 @@
 #include "game/field/ObjectFlowTable.hh"
 #include "game/field/ObjectHitTable.hh"
 #include "game/field/obj/ObjectCollidable.hh"
-#include "game/field/obj/ObjectNoImpl.hh"
 
 #include <vector>
 
@@ -15,7 +14,6 @@ public:
     void init();
     void calc();
     void addObject(ObjectCollidable *obj);
-    void addObjectNoImpl(ObjectNoImpl *obj);
 
     size_t checkKartObjectCollision(Kart::KartObject *kartObj,
             ObjectCollisionConvexHull *convexHull);

diff --git a/source/game/field/ObjectHitTable.cc b/source/game/field/ObjectHitTable.cc
@@ -28,9 +28,7 @@ ObjectHitTable::ObjectHitTable(const char *filename) {
 }
 
 /// @addr{0x807F9348}
-ObjectHitTable::~ObjectHitTable() {
-    delete m_reactions.data();
-}
+ObjectHitTable::~ObjectHitTable() = default;
 
 Kart::Reaction ObjectHitTable::reaction(s16 i) const {
     ASSERT(i != -1);

diff --git a/source/game/field/obj/ObjectCollidable.cc b/source/game/field/obj/ObjectCollidable.cc
@@ -13,9 +13,7 @@ namespace Field {
 ObjectCollidable::ObjectCollidable(const System::MapdataGeoObj &params) : ObjectBase(params) {}
 
 /// @addr{0x8067E384}
-ObjectCollidable::~ObjectCollidable() {
-    delete m_collision;
-}
+ObjectCollidable::~ObjectCollidable() = default;
 
 /// @addr{0x8081F0A0}
 void ObjectCollidable::load() {

diff --git a/source/game/field/obj/ObjectNoImpl.cc b/source/game/field/obj/ObjectNoImpl.cc
@@ -1,15 +1,9 @@
 #include "ObjectNoImpl.hh"
 
-#include "game/field/ObjectDirector.hh"
-
 namespace Field {
 
 ObjectNoImpl::ObjectNoImpl(const System::MapdataGeoObj &params) : ObjectBase(params) {}
 
 ObjectNoImpl::~ObjectNoImpl() = default;
 
-void ObjectNoImpl::load() {
-    ObjectDirector::Instance()->addObjectNoImpl(this);
-}
-
 } // namespace Field
diff --git a/source/game/field/obj/ObjectNoImpl.hh b/source/game/field/obj/ObjectNoImpl.hh
@@ -9,7 +9,7 @@ public:
     ObjectNoImpl(const System::MapdataGeoObj &params);
     ~ObjectNoImpl() override;
 
-    void load() override;
+    void load() override {}
     void calcCollisionTransform() override {}
 };
 

diff --git a/source/game/kart/KartMove.cc b/source/game/kart/KartMove.cc
@@ -47,10 +47,7 @@ KartMove::KartMove() : m_smoothedUp(EGG::Vector3f::ey), m_scale(1.0f, 1.0f, 1.0f
 }
 
 /// @addr{0x80587B78}
-KartMove::~KartMove() {
-    delete m_jump;
-    delete m_halfPipe;
-}
+KartMove::~KartMove() = default;
 
 /// @addr{0x8057821C}
 void KartMove::createSubsystems() {

diff --git a/source/game/kart/KartObject.cc b/source/game/kart/KartObject.cc
@@ -25,7 +25,6 @@ KartObject::~KartObject() {
     delete m_pointers.body;
     delete m_pointers.sub;
     delete m_pointers.model;
-    delete m_pointers.objectCollisionKart;
 
     for (auto *susp : m_pointers.suspensions) {
         delete susp;