From 26af4db82da23364961ebb440efba88846240731 Mon Sep 17 00:00:00 2001 From: Elijah Thomas <42302100+elijah-thomas774@users.noreply.github.com> Date: Wed, 16 Oct 2024 15:36:02 -0400 Subject: update from dtk-template - clangd :) (#66) * update from dtk-template and start work towards using clangd * include -> "a" * Update build.yml * remove/add non-trivial class in union warning --- src/d/d_fader.cpp | 62 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) (limited to 'src/d/d_fader.cpp') diff --git a/src/d/d_fader.cpp b/src/d/d_fader.cpp index 34242d0c..05fe7c60 100644 --- a/src/d/d_fader.cpp +++ b/src/d/d_fader.cpp @@ -1,5 +1,7 @@ -#include -#include +#include "d/d_fader.h" + +#include "m/m_fader.h" + static mColor mFaderColor = mColor(200, 200, 200, 0xFF); @@ -45,38 +47,38 @@ bool dFader_c::create() { bool dFader_c::setFader(s32 fader) { switch (fader) { - case 0: - if (mFader_c::setFader(mpColorFader)) { - if (mpColorFader->getStatus() == mFaderBase_c::FADED_IN) { - mpColorFader->setColor(mColor(0, 0, 0, 0xFF)); + case 0: + if (mFader_c::setFader(mpColorFader)) { + if (mpColorFader->getStatus() == mFaderBase_c::FADED_IN) { + mpColorFader->setColor(mColor(0, 0, 0, 0xFF)); + } + return true; } - return true; - } - break; - case 1: - if (mFader_c::setFader(mpColorFader)) { - if (mpColorFader->getStatus() == mFaderBase_c::FADED_IN) { - mpColorFader->setColor(mFaderColor); + break; + case 1: + if (mFader_c::setFader(mpColorFader)) { + if (mpColorFader->getStatus() == mFaderBase_c::FADED_IN) { + mpColorFader->setColor(mFaderColor); + } + return true; } - return true; - } - break; - case 2: - if (mFader_c::setFader(mpLytFader)) { - if (mpLytFader->getStatus() == mFaderBase_c::FADED_IN) { - mpLytFader->setColor(mColor(0, 0, 0, 0xFF)); + break; + case 2: + if (mFader_c::setFader(mpLytFader)) { + if (mpLytFader->getStatus() == mFaderBase_c::FADED_IN) { + mpLytFader->setColor(mColor(0, 0, 0, 0xFF)); + } + return true; } - return true; - } - break; - case 3: - if (mFader_c::setFader(mpScreenFader)) { - if (mpScreenFader->getStatus() == mFaderBase_c::FADED_IN) { - mpScreenFader->setColor(mColor(0, 0, 0, 0xFF)); + break; + case 3: + if (mFader_c::setFader(mpScreenFader)) { + if (mpScreenFader->getStatus() == mFaderBase_c::FADED_IN) { + mpScreenFader->setColor(mColor(0, 0, 0, 0xFF)); + } + return true; } - return true; - } - break; + break; } return false; -- cgit v1.2.3