From 11ad89ee81886b87486b2c61d11af851eee056a1 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 5 Jan 2023 18:31:58 -0700 Subject: [PATCH] inlined virtual func problem solution (thanks Julgodis) --- include/d/bg/d_bg_s_acch.h | 4 ++++ src/d/bg/d_bg_s_acch.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/include/d/bg/d_bg_s_acch.h b/include/d/bg/d_bg_s_acch.h index e73e3225b7e..5b7f6378666 100644 --- a/include/d/bg/d_bg_s_acch.h +++ b/include/d/bg/d_bg_s_acch.h @@ -38,7 +38,11 @@ public: /* 80075F58 */ void SetWall(f32, f32); /* 80075F80 */ void SetWallHDirect(f32); + #ifdef __dt__12dBgS_AcchCirFv_DEFINED + /* 80077414 */ virtual ~dBgS_AcchCir(); + #else /* 80077414 */ virtual ~dBgS_AcchCir() {} + #endif f32 GetWallH() { return m_wall_h; } f32 GetWallR() { return m_wall_r; } diff --git a/src/d/bg/d_bg_s_acch.cpp b/src/d/bg/d_bg_s_acch.cpp index 25a23d5b76d..8836b0eff68 100644 --- a/src/d/bg/d_bg_s_acch.cpp +++ b/src/d/bg/d_bg_s_acch.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/bg/d_bg_s_acch // +#define __dt__12dBgS_AcchCirFv_DEFINED + #include "d/bg/d_bg_s_acch.h" #include "d/bg/d_bg_s.h" #include "dol2asm.h"