From 7591d35e520fe0b7f1192ec4c5ddc331050cb2c7 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sat, 14 Oct 2023 15:39:44 -0700
Subject: [PATCH] d_ovlp_fade match

---
 configure.py                            | 2 +-
 include/JSystem/JFramework/JFWDisplay.h | 1 +
 include/m_Do/m_Do_graphic.h             | 4 +---
 src/d/d_ovlp_fade.cpp                   | 5 ++---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/configure.py b/configure.py
index d54a561be..e83a428ad 100644
--- a/configure.py
+++ b/configure.py
@@ -472,7 +472,7 @@ config.libs = [
             Object(NonMatching, "d/d_npc.cpp"),
             Object(NonMatching, "d/d_operate_wind.cpp"),
             Object(NonMatching, "d/d_metronome.cpp"),
-            Object(NonMatching, "d/d_ovlp_fade.cpp"),
+            Object(Matching,    "d/d_ovlp_fade.cpp"),
             Object(NonMatching, "d/d_ovlp_fade2.cpp"),
             Object(NonMatching, "d/d_ovlp_fade3.cpp"),
             Object(NonMatching, "d/d_ovlp_fade4.cpp"),
diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h
index 42039d6b0..ba2b21b01 100644
--- a/include/JSystem/JFramework/JFWDisplay.h
+++ b/include/JSystem/JFramework/JFWDisplay.h
@@ -86,6 +86,7 @@ public:
 
     void setDrawDoneMethod(EDrawDone drawDone) { mDrawDoneMethod = drawDone; }
     void setFader(JUTFader* fader) { mpFader = fader; }
+    JUTFader * getFader() { return mpFader; }
     void setClearColor(JUtility::TColor color) { mClearColor = color; }
 
     static JFWDisplay* sManager;
diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h
index 43b4f1272..1bd87fc62 100644
--- a/include/m_Do/m_Do_graphic.h
+++ b/include/m_Do/m_Do_graphic.h
@@ -32,9 +32,7 @@ public:
     static BOOL startFadeOut(int param_0) { return JFWDisplay::getManager()->startFadeOut(param_0); }
     static BOOL startFadeIn(int param_0) { return JFWDisplay::getManager()->startFadeIn(param_0); }
     static void setFadeColor(JUtility::TColor color) { mFader->mColor.set(color); }
-    static void setClearColor(JUtility::TColor color) {
-        JFWDisplay::getManager()->setClearColor(color);
-    }
+    static void setClearColor(JUtility::TColor color) { JFWDisplay::getManager()->setClearColor(color); }
     static void setBackColor(GXColor& color) { mBackColor = color; }
     static void endFrame() { JFWDisplay::getManager()->endFrame(); }
     static void offFade() { mFade = 0; }
diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp
index b94b879fb..c5125bd5c 100644
--- a/src/d/d_ovlp_fade.cpp
+++ b/src/d/d_ovlp_fade.cpp
@@ -24,14 +24,13 @@ BOOL dOvlpFd_Draw(overlap1_class* i_this) {
 
 /* 802235D4-802236AC       .text dOvlpFd_FadeOut__FP14overlap1_class */
 BOOL dOvlpFd_FadeOut(overlap1_class* i_this) {
-    /* Nonmatching - extra comparisons */
     if (i_this->mFadeOutTime == 0) {
         if (fpcM_GetProfName(i_this) != PROC_OVERLAP6) {
-            if (!mDoGph_gInf_c::startFadeIn(26))
+            if (!JFWDisplay::getManager()->getFader()->startFadeIn(26))
                 return TRUE;
             i_this->mFadeOutTime = 26;
         } else {
-            if (mDoGph_gInf_c::startFadeIn(0))
+            if (!JFWDisplay::getManager()->getFader()->startFadeIn(0))
                 return TRUE;
             i_this->mFadeOutTime = 1;
         }