From fd9cb51a46f7c520c5f0a9c91c139af9424a4ce1 Mon Sep 17 00:00:00 2001 From: Mike Lester Date: Mon, 28 Oct 2024 23:01:12 -0600 Subject: [PATCH] d_wood: Mark as matching in configure.py Had to move Packet_c destructor to get the functions in the right order. See discussion: https://discord.com/channels/727908905392275526/873250400483024976/1300680009458913280 --- configure.py | 2 +- include/d/d_wood.h | 2 +- src/d/d_wood.cpp | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.py b/configure.py index 849ef94c..6efec96f 100644 --- a/configure.py +++ b/configure.py @@ -496,7 +496,7 @@ def MatchingFor(*versions): Object(NonMatching, "d/d_cam_style.cpp"), Object(NonMatching, "d/d_cam_type2.cpp"), Object(NonMatching, "d/d_ev_camera.cpp"), - Object(NonMatching, "d/d_wood.cpp"), + Object(Matching, "d/d_wood.cpp", extra_cflags=["-sym off"]), Object(NonMatching, "d/d_flower.cpp"), Object(Matching, "d/d_item_data.cpp"), Object(Matching, "d/d_seafightgame.cpp"), diff --git a/include/d/d_wood.h b/include/d/d_wood.h index c87bc3c8..b859a7af 100644 --- a/include/d/d_wood.h +++ b/include/d/d_wood.h @@ -153,7 +153,7 @@ class Packet_c : public J3DPacket { inline Anm_c* get_anm_p(AnmID_e idx) { return &mAnm[idx]; } virtual void draw(); - virtual ~Packet_c() {}; + virtual ~Packet_c(); /* 0x00010 */ Unit_c mUnit[200]; /* 0x13570 */ Anm_c mAnm[72]; diff --git a/src/d/d_wood.cpp b/src/d/d_wood.cpp index 4f4fef80..b9d7fa61 100644 --- a/src/d/d_wood.cpp +++ b/src/d/d_wood.cpp @@ -732,6 +732,8 @@ dWood::Packet_c::Packet_c() { } } +dWood::Packet_c::~Packet_c() {}; + /* 800BF194-800BF1C8 .text delete_room__Q25dWood8Packet_cFi */ void dWood::Packet_c::delete_room(int room_no) { mRoom[room_no].delete_all_unit();