mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-01-24 17:26:41 +00:00
Code Issues Releases Wiki Activity

better way to skip the logo; do post-load transitions in a single place now

Browse source
This commit is contained in:
fgenesis 2023-06-01 04:19:41 +02:00
parent b9798a1889
commit e00940b2ae
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Aquaria/BitBlotLogo.cpp
View file

@ -62,14 +62,7 @@ void BitBlotLogo::doShortBitBlot()
void BitBlotLogo::getOut() void BitBlotLogo::getOut()
{ {
#ifdef AQUARIA_DEMO
dsq->title(); dsq->title();
#else
if (dsq->user.demo.intro != 0)
dsq->enqueueJumpState("Intro");
else
dsq->title();
#endif
} }
void BitBlotLogo::applyState() void BitBlotLogo::applyState()

8
Aquaria/DSQ.cpp
View file

@ -1339,7 +1339,7 @@ void DSQ::init()
// Don't do transitions for a faster start up in dev mode // Don't do transitions for a faster start up in dev mode
if (!isDeveloperKeys()) if (!isDeveloperKeys())
{ {
float trans = 0.5; float trans = 0.2f;
overlay->alpha.interpolateTo(1, trans); overlay->alpha.interpolateTo(1, trans);
run(trans); run(trans);
} }
@ -1363,7 +1363,11 @@ void DSQ::init()
setInputGrab(user.system.grabInput); setInputGrab(user.system.grabInput);
// Go directly to the title in dev mode // Go directly to the title in dev mode
if(isDeveloperKeys() || (dsq->user.demo.shortLogos && !dsq->user.demo.intro)) if(isDeveloperKeys())
title();
else if (dsq->user.demo.intro != 0)
enqueueJumpState("Intro");
else if(dsq->user.demo.shortLogos)
title(); title();
else else
enqueueJumpState("BitBlotLogo"); enqueueJumpState("BitBlotLogo");