etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-30 08:23:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

dev142 - get rid of TE stuff

Browse source
This commit is contained in:
tildearrow 2023-02-19 17:40:34 -05:00
parent a249f40716
commit 5d6a338f41
4 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engine/engine.h
View file

@ -47,8 +47,8 @@
#define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock(); #define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock();
#define BUSY_END isBusy.unlock(); softLocked=false; #define BUSY_END isBusy.unlock(); softLocked=false;
#define DIV_VERSION "Tournament Edition" #define DIV_VERSION "dev142"
#define DIV_ENGINE_VERSION 141 #define DIV_ENGINE_VERSION 142
// for imports // for imports
#define DIV_VERSION_MOD 0xff01 #define DIV_VERSION_MOD 0xff01
#define DIV_VERSION_FC 0xff02 #define DIV_VERSION_FC 0xff02

8
src/gui/gui.cpp
View file

@ -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("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("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("speed",BIND_FOR(GUI_ACTION_WINDOW_SPEED),speedOpen)) speedOpen=!speedOpen;
if (ImGui::MenuItem("---> IntroMon X <---",NULL,introMonOpen)) introMonOpen=!introMonOpen;
if (settings.unifiedDataView) { if (settings.unifiedDataView) {
if (ImGui::MenuItem("assets",BIND_FOR(GUI_ACTION_WINDOW_INS_LIST),insListOpen)) insListOpen=!insListOpen; if (ImGui::MenuItem("assets",BIND_FOR(GUI_ACTION_WINDOW_INS_LIST),insListOpen)) insListOpen=!insListOpen;
} else { } else {
@ -5263,10 +5262,6 @@ bool FurnaceGUI::loop() {
if (mustClear) { if (mustClear) {
SDL_RenderClear(sdlRend); SDL_RenderClear(sdlRend);
mustClear--; 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 { } else {
if (initialScreenWipe>0.0f && !settings.disableFadeIn) { if (initialScreenWipe>0.0f && !settings.disableFadeIn) {
WAKE_UP; WAKE_UP;
@ -6277,8 +6272,7 @@ FurnaceGUI::FurnaceGUI():
monitorPos(0.0), monitorPos(0.0),
mustClear(2), mustClear(2),
initialScreenWipe(1.0f), initialScreenWipe(1.0f),
introSkipDo(false), introSkipDo(false) {
teWarn(false) {
// value keys // value keys
valueKeys[SDLK_0]=0; valueKeys[SDLK_0]=0;
valueKeys[SDLK_1]=1; valueKeys[SDLK_1]=1;

2
src/gui/gui.h
View file

@ -1841,7 +1841,7 @@ class FurnaceGUI {
double monitorPos; double monitorPos;
int mustClear; int mustClear;
float initialScreenWipe; float initialScreenWipe;
bool introSkipDo, teWarn; bool introSkipDo;
ImVec2 introMin, introMax; ImVec2 introMin, introMax;
void drawSSGEnv(unsigned char type, const ImVec2& size); void drawSSGEnv(unsigned char type, const ImVec2& size);

8
src/gui/intro.cpp
View file

@ -265,7 +265,6 @@ void FurnaceGUI::drawIntro(double introTime, bool monitor) {
introSkip+=ImGui::GetIO().DeltaTime; introSkip+=ImGui::GetIO().DeltaTime;
if (introSkip>=0.5) { if (introSkip>=0.5) {
introPos=0.1; introPos=0.1;
if (e->isPlaying()) stop();
if (introSkip>=0.75) introPos=9.1; if (introSkip>=0.75) introPos=9.1;
} }
} else { } else {
@ -287,17 +286,10 @@ void FurnaceGUI::drawIntro(double introTime, bool monitor) {
if (mustClear<=0 && !monitor) { if (mustClear<=0 && !monitor) {
introPos+=ImGui::GetIO().DeltaTime; introPos+=ImGui::GetIO().DeltaTime;
if (e->isPlaying() && introPos>=8.0) {
stop();
}
if (introPos>=(shortIntro?1.0:9.0)) { if (introPos>=(shortIntro?1.0:9.0)) {
introPos=10.0; introPos=10.0;
tutorial.introPlayed=true; tutorial.introPlayed=true;
commitTutorial(); 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;
}
} }
} }
} }