- small changes for last commit. sometimes i don't notice things until right after i commit. oh well.

This commit is contained in:
Fledge68 2019-11-23 18:25:49 -06:00
parent d2c23240e7
commit e18c3569a6
2 changed files with 5 additions and 13 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 MiB

After

Width:  |  Height:  |  Size: 3.6 MiB

View File

@ -11,7 +11,6 @@ extern const u32 gc_ogg_size;
bool m_zoom_banner = false; bool m_zoom_banner = false;
bool m_banner_loaded = false; bool m_banner_loaded = false;
bool m_setMainBg = false;
s16 m_gameBtnPlayFull; s16 m_gameBtnPlayFull;
s16 m_gameBtnBackFull; s16 m_gameBtnBackFull;
s16 m_gameBtnToggle; s16 m_gameBtnToggle;
@ -280,16 +279,14 @@ void CMenu::_showGame(void)
m_fa.getBackground(bg, bglq); m_fa.getBackground(bg, bglq);
_setBg(*bg, *bglq); _setBg(*bg, *bglq);
CoverFlow.hideCover(); CoverFlow.hideCover();
m_setMainBg = true;
} }
else if(m_setMainBg) else
{ {
CoverFlow.showCover(); CoverFlow.showCover();
if(customBg) if(customBg)
_setBg(m_mainCustomBg[curCustBg], m_mainCustomBg[curCustBg]); _setBg(m_mainCustomBg[curCustBg], m_mainCustomBg[curCustBg]);
else else
_setBg(m_gameBg, m_gameBgLQ); _setBg(m_gameBg, m_gameBgLQ);
m_setMainBg = false;
} }
} }
@ -383,7 +380,6 @@ bool CMenu::_startVideo()
void CMenu::_game(bool launch) void CMenu::_game(bool launch)
{ {
m_banner_loaded = false; m_banner_loaded = false;
m_setMainBg = true;
bool coverFlipped = false; bool coverFlipped = false;
int cf_version = 1; int cf_version = 1;
string domain; string domain;
@ -442,7 +438,6 @@ void CMenu::_game(bool launch)
_setBg(m_mainCustomBg[curCustBg], m_mainCustomBg[curCustBg]); _setBg(m_mainCustomBg[curCustBg], m_mainCustomBg[curCustBg]);
else else
_setBg(m_gameBg, m_gameBgLQ); _setBg(m_gameBg, m_gameBgLQ);
m_setMainBg = false;
} }
else //loop fanart else //loop fanart
m_fa.reset(); m_fa.reset();
@ -513,7 +508,6 @@ void CMenu::_game(bool launch)
_hideGame(); _hideGame();
m_banner.SetShowBanner(false); m_banner.SetShowBanner(false);
_gameinfo(); _gameinfo();
m_setMainBg = true;
_showGame(); _showGame();
m_banner.SetShowBanner(true); m_banner.SetShowBanner(true);
} }
@ -549,8 +543,10 @@ void CMenu::_game(bool launch)
{ {
m_fa.unload(); m_fa.unload();
CoverFlow.showCover(); CoverFlow.showCover();
_setMainBg(); if(customBg)
m_setMainBg = false; _setBg(m_mainCustomBg[curCustBg], m_mainCustomBg[curCustBg]);
else
_setBg(m_gameBg, m_gameBgLQ);
continue; continue;
} }
/* delete button */ /* delete button */
@ -576,7 +572,6 @@ void CMenu::_game(bool launch)
startGameSound = -10; startGameSound = -10;
} }
} }
m_setMainBg = true;
_showGame(); _showGame();
m_banner.SetShowBanner(true); m_banner.SetShowBanner(true);
} }
@ -598,7 +593,6 @@ void CMenu::_game(bool launch)
m_banner.ToggleGameSettings();//reset brightness m_banner.ToggleGameSettings();//reset brightness
m_banner.ToggleZoom();//de zoom to small m_banner.ToggleZoom();//de zoom to small
} }
m_setMainBg = true;
_showGame(); _showGame();
} }
else if(m_btnMgr.selected(m_gameBtnFavoriteOn) || m_btnMgr.selected(m_gameBtnFavoriteOff)) else if(m_btnMgr.selected(m_gameBtnFavoriteOn) || m_btnMgr.selected(m_gameBtnFavoriteOff))
@ -628,7 +622,6 @@ void CMenu::_game(bool launch)
m_banner.ToggleGameSettings();//reset brightness m_banner.ToggleGameSettings();//reset brightness
m_banner.ToggleZoom();//de zoom to small m_banner.ToggleZoom();//de zoom to small
} }
m_setMainBg = true;
_showGame(); _showGame();
if(m_newGame) if(m_newGame)
startGameSound = -10; startGameSound = -10;
@ -655,7 +648,6 @@ void CMenu::_game(bool launch)
{ {
error(_t("errgame19", L"Can't launch in Wii virtual console mode!")); error(_t("errgame19", L"Can't launch in Wii virtual console mode!"));
launch = false; launch = false;
m_setMainBg = true;
_showGame(); _showGame();
} }
else else