diff --git a/src/engine/engine.h b/src/engine/engine.h index 04b643289..35e7336db 100644 --- a/src/engine/engine.h +++ b/src/engine/engine.h @@ -47,8 +47,8 @@ #define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock(); #define BUSY_END isBusy.unlock(); softLocked=false; -#define DIV_VERSION "Tournament Edition" -#define DIV_ENGINE_VERSION 141 +#define DIV_VERSION "dev142" +#define DIV_ENGINE_VERSION 142 // for imports #define DIV_VERSION_MOD 0xff01 #define DIV_VERSION_FC 0xff02 diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index bb1218e79..c5c534eb9 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -3774,7 +3774,6 @@ bool FurnaceGUI::loop() { if (ImGui::MenuItem("song information",BIND_FOR(GUI_ACTION_WINDOW_SONG_INFO),songInfoOpen)) songInfoOpen=!songInfoOpen; if (ImGui::MenuItem("subsongs",BIND_FOR(GUI_ACTION_WINDOW_SUBSONGS),subSongsOpen)) subSongsOpen=!subSongsOpen; if (ImGui::MenuItem("speed",BIND_FOR(GUI_ACTION_WINDOW_SPEED),speedOpen)) speedOpen=!speedOpen; - if (ImGui::MenuItem("---> IntroMon X <---",NULL,introMonOpen)) introMonOpen=!introMonOpen; if (settings.unifiedDataView) { if (ImGui::MenuItem("assets",BIND_FOR(GUI_ACTION_WINDOW_INS_LIST),insListOpen)) insListOpen=!insListOpen; } else { @@ -5263,10 +5262,6 @@ bool FurnaceGUI::loop() { if (mustClear) { SDL_RenderClear(sdlRend); mustClear--; - if (mustClear==0 && !teWarn) { - showWarning("welcome to Furnace Tournament Edition!\n\nthis version of Furnace is specifically designed for the\nIntro Tune Contest of February 2023.\n\ngo to window > IntroMon X to enable something that will be\nuseful during the making of your intro tune!\nsee the #intro-tune-contest channel in the Furnace Discord for more info.",GUI_WARN_GENERIC); - teWarn=true; - } } else { if (initialScreenWipe>0.0f && !settings.disableFadeIn) { WAKE_UP; @@ -6277,8 +6272,7 @@ FurnaceGUI::FurnaceGUI(): monitorPos(0.0), mustClear(2), initialScreenWipe(1.0f), - introSkipDo(false), - teWarn(false) { + introSkipDo(false) { // value keys valueKeys[SDLK_0]=0; valueKeys[SDLK_1]=1; diff --git a/src/gui/gui.h b/src/gui/gui.h index 9d5364456..b5d8b3851 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -1841,7 +1841,7 @@ class FurnaceGUI { double monitorPos; int mustClear; float initialScreenWipe; - bool introSkipDo, teWarn; + bool introSkipDo; ImVec2 introMin, introMax; void drawSSGEnv(unsigned char type, const ImVec2& size); diff --git a/src/gui/intro.cpp b/src/gui/intro.cpp index e768427bc..39b8c5eab 100644 --- a/src/gui/intro.cpp +++ b/src/gui/intro.cpp @@ -265,7 +265,6 @@ void FurnaceGUI::drawIntro(double introTime, bool monitor) { introSkip+=ImGui::GetIO().DeltaTime; if (introSkip>=0.5) { introPos=0.1; - if (e->isPlaying()) stop(); if (introSkip>=0.75) introPos=9.1; } } else { @@ -287,17 +286,10 @@ void FurnaceGUI::drawIntro(double introTime, bool monitor) { if (mustClear<=0 && !monitor) { introPos+=ImGui::GetIO().DeltaTime; - if (e->isPlaying() && introPos>=8.0) { - stop(); - } if (introPos>=(shortIntro?1.0:9.0)) { introPos=10.0; tutorial.introPlayed=true; commitTutorial(); - if (!teWarn) { - showWarning("welcome to Furnace Tournament Edition!\n\nthis version of Furnace is specifically designed for the\nIntro Tune Contest of February 2023.\n\ngo to window > IntroMon X to enable something that will be\nuseful during the making of your intro tune!\nsee the #intro-tune-contest channel in the Furnace Discord for more info.",GUI_WARN_GENERIC); - teWarn=true; - } } } }