Cut logo length down

This commit is contained in:
RocketRobz 2020-06-06 20:36:48 -06:00
parent 8901b863b7
commit 7554c988c5
3 changed files with 10 additions and 10 deletions

View File

@ -31,7 +31,7 @@ int iFps = 60;
std::string currentMusicPack = ""; std::string currentMusicPack = "";
//sound *music = NULL; //sound *music = NULL;
sound *mus_logos = NULL; //sound *mus_logos = NULL;
sound *sfx_select = NULL; sound *sfx_select = NULL;
sound *sfx_back = NULL; sound *sfx_back = NULL;
sound *sfx_highlight = NULL; sound *sfx_highlight = NULL;
@ -71,11 +71,11 @@ void saveSettings(void) {
} }
}*/ }*/
void musLogos(void) { /*void musLogos(void) {
if (!dspfirmfound) return; if (!dspfirmfound) return;
mus_logos->stop(); mus_logos->stop();
mus_logos->play(); mus_logos->play();
} }*/
void sndSelect(void) { void sndSelect(void) {
if (!dspfirmfound) return; if (!dspfirmfound) return;
@ -248,7 +248,7 @@ int main()
// Load the sound effects if DSP is available. // Load the sound effects if DSP is available.
if (dspfirmfound) { if (dspfirmfound) {
mus_logos = new sound("romfs:/sounds/logos.wav", 0, false); //mus_logos = new sound("romfs:/sounds/logos.wav", 0, false);
//music = new sound("romfs:/sounds/music.wav", 1, true); //music = new sound("romfs:/sounds/music.wav", 1, true);
sfx_select = new sound("romfs:/sounds/select.wav", 2, false); sfx_select = new sound("romfs:/sounds/select.wav", 2, false);
sfx_back = new sound("romfs:/sounds/back.wav", 3, false); sfx_back = new sound("romfs:/sounds/back.wav", 3, false);
@ -328,7 +328,7 @@ int main()
svcCreateEvent(&threadRequest,(ResetType)0); svcCreateEvent(&threadRequest,(ResetType)0);
createThread((ThreadFunc)controlThread); createThread((ThreadFunc)controlThread);
//Play_Music(); //Play_Music();
musLogos(); //musLogos();
// Loop as long as the status is not exit // Loop as long as the status is not exit
while(aptMainLoop()) { while(aptMainLoop()) {
@ -353,7 +353,7 @@ int main()
if (isInit) { if (isInit) {
delay++; delay++;
if (delay > iFps*15) { if (delay > iFps*10) {
Gui::setScreen(std::make_unique<GameSelect>(), true); // Set after delay to the GameSelect screen. Gui::setScreen(std::make_unique<GameSelect>(), true); // Set after delay to the GameSelect screen.
isInit = false; isInit = false;
} }
@ -430,7 +430,7 @@ int main()
archiveUnmountAll(); archiveUnmountAll();
//delete music; //delete music;
delete mus_logos; //delete mus_logos;
delete sfx_select; delete sfx_select;
delete sfx_back; delete sfx_back;
delete sfx_highlight; delete sfx_highlight;

View File

@ -76,9 +76,9 @@ void RocketRobz::Draw(void) const {
if (rr_fadeAlpha > 255) rr_fadeAlpha = 255; if (rr_fadeAlpha > 255) rr_fadeAlpha = 255;
} }
if (delay > iFps*13) { /*if (delay > iFps*13) {
rr_fadeType = false; rr_fadeType = false;
} else if (delay > iFps*8) { } else*/ if (delay > iFps*6) {
if (prevSubMode != 1) { if (prevSubMode != 1) {
rr_fadeType = false; rr_fadeType = false;
} }
@ -87,7 +87,7 @@ void RocketRobz::Draw(void) const {
rr_fadeType = true; rr_fadeType = true;
prevSubMode++; prevSubMode++;
} }
} else if (delay > iFps*4) { } else if (delay > iFps*3) {
if (prevSubMode != 0) { if (prevSubMode != 0) {
rr_fadeType = false; rr_fadeType = false;
} }