mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-30 19:11:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_ovlp_fade match

Browse Source
This commit is contained in:
Jasper St. Pierre
2023-10-14 15:39:44 -07:00
parent 8845e983e1
commit 7591d35e52
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -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"),
include/JSystem/JFramework/JFWDisplay.h
+1
View File
@@ -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;
include/m_Do/m_Do_graphic.h
+1 -3
View File
@@ -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; }
src/d/d_ovlp_fade.cpp
+2 -3
View File
@@ -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;
}