diff --git a/Aquaria/BitBlotLogo.cpp b/Aquaria/BitBlotLogo.cpp index 28475d9..f209832 100644 --- a/Aquaria/BitBlotLogo.cpp +++ b/Aquaria/BitBlotLogo.cpp @@ -62,14 +62,7 @@ void BitBlotLogo::doShortBitBlot() void BitBlotLogo::getOut() { -#ifdef AQUARIA_DEMO dsq->title(); -#else - if (dsq->user.demo.intro != 0) - dsq->enqueueJumpState("Intro"); - else - dsq->title(); -#endif } void BitBlotLogo::applyState() diff --git a/Aquaria/DSQ.cpp b/Aquaria/DSQ.cpp index e67982e..d56c7d9 100644 --- a/Aquaria/DSQ.cpp +++ b/Aquaria/DSQ.cpp @@ -1339,7 +1339,7 @@ void DSQ::init() // Don't do transitions for a faster start up in dev mode if (!isDeveloperKeys()) { - float trans = 0.5; + float trans = 0.2f; overlay->alpha.interpolateTo(1, trans); run(trans); } @@ -1363,7 +1363,11 @@ void DSQ::init() setInputGrab(user.system.grabInput); // 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(); else enqueueJumpState("BitBlotLogo");