mirror of
https://github.com/Fledge68/WiiFlow_Lite.git
synced 2024-11-24 04:09:15 +01:00
-reverted changes of r282 again since categories working
now with emulator coverflow
This commit is contained in:
parent
250bd63781
commit
f75ac72826
@ -1701,11 +1701,6 @@ void CCoverFlow::_instantTarget(int i)
|
|||||||
cvr.txtColor = cvr.txtTargetColor;
|
cvr.txtColor = cvr.txtTargetColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CCoverFlow::_sortByMagic(CItem item1, CItem item2)
|
|
||||||
{
|
|
||||||
return (item1.hdr->hdr.magic == item2.hdr->hdr.magic) ? _sortByAlpha(item1, item2) : item1.hdr->hdr.magic > item2.hdr->hdr.magic;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool CCoverFlow::_sortByPlayCount(CItem item1, CItem item2)
|
bool CCoverFlow::_sortByPlayCount(CItem item1, CItem item2)
|
||||||
{
|
{
|
||||||
return (item1.playcount == item2.playcount) ? _sortByAlpha(item1, item2) : item1.playcount > item2.playcount;
|
return (item1.playcount == item2.playcount) ? _sortByAlpha(item1, item2) : item1.playcount > item2.playcount;
|
||||||
@ -1768,8 +1763,6 @@ bool CCoverFlow::start(const char *id)
|
|||||||
// Sort items
|
// Sort items
|
||||||
if (m_sorting == SORT_ALPHA)
|
if (m_sorting == SORT_ALPHA)
|
||||||
sort(m_items.begin(), m_items.end(), CCoverFlow::_sortByAlpha);
|
sort(m_items.begin(), m_items.end(), CCoverFlow::_sortByAlpha);
|
||||||
else if (m_sorting == SORT_MAGIC)
|
|
||||||
sort(m_items.begin(), m_items.end(), CCoverFlow::_sortByMagic);
|
|
||||||
else if (m_sorting == SORT_PLAYCOUNT)
|
else if (m_sorting == SORT_PLAYCOUNT)
|
||||||
sort(m_items.begin(), m_items.end(), CCoverFlow::_sortByPlayCount);
|
sort(m_items.begin(), m_items.end(), CCoverFlow::_sortByPlayCount);
|
||||||
else if (m_sorting == SORT_LASTPLAYED)
|
else if (m_sorting == SORT_LASTPLAYED)
|
||||||
|
@ -28,7 +28,6 @@ enum Sorting
|
|||||||
SORT_LASTPLAYED,
|
SORT_LASTPLAYED,
|
||||||
SORT_WIFIPLAYERS,
|
SORT_WIFIPLAYERS,
|
||||||
SORT_PLAYERS,
|
SORT_PLAYERS,
|
||||||
SORT_MAGIC,
|
|
||||||
SORT_MAX,
|
SORT_MAX,
|
||||||
SORT_ESRB,
|
SORT_ESRB,
|
||||||
SORT_CONTROLLERS,
|
SORT_CONTROLLERS,
|
||||||
@ -330,7 +329,6 @@ private:
|
|||||||
void _stopSound(SmartGuiSound snd);
|
void _stopSound(SmartGuiSound snd);
|
||||||
void _playSound(SmartGuiSound snd);
|
void _playSound(SmartGuiSound snd);
|
||||||
|
|
||||||
static bool _sortByMagic(CItem item1, CItem item2);
|
|
||||||
static bool _sortByPlayCount(CItem item1, CItem item2);
|
static bool _sortByPlayCount(CItem item1, CItem item2);
|
||||||
static bool _sortByLastPlayed(CItem item1, CItem item2);
|
static bool _sortByLastPlayed(CItem item1, CItem item2);
|
||||||
static bool _sortByGameID(CItem item1, CItem item2);
|
static bool _sortByGameID(CItem item1, CItem item2);
|
||||||
|
@ -372,7 +372,7 @@ int CMenu::main(void)
|
|||||||
else if (BTN_PLUS_PRESSED && !m_locked)
|
else if (BTN_PLUS_PRESSED && !m_locked)
|
||||||
{
|
{
|
||||||
u32 sort = 0;
|
u32 sort = 0;
|
||||||
sort = loopNum((m_cfg.getInt(domain, "sort", 0)) + 1, SORT_MAX);
|
sort = loopNum((m_cfg.getInt(domain, "sort", 0)) + 1, SORT_MAX - 1);
|
||||||
m_cf.setSorting((Sorting)sort);
|
m_cf.setSorting((Sorting)sort);
|
||||||
m_cfg.setInt(domain, "sort", sort);
|
m_cfg.setInt(domain, "sort", sort);
|
||||||
wstringEx curSort ;
|
wstringEx curSort ;
|
||||||
@ -390,8 +390,6 @@ int CMenu::main(void)
|
|||||||
curSort = m_loc.getWString(m_curLanguage, "bywifiplayers", L"By Wifi Players");
|
curSort = m_loc.getWString(m_curLanguage, "bywifiplayers", L"By Wifi Players");
|
||||||
else if (sort == SORT_PLAYERS)
|
else if (sort == SORT_PLAYERS)
|
||||||
curSort = m_loc.getWString(m_curLanguage, "byplayers", L"By Players");
|
curSort = m_loc.getWString(m_curLanguage, "byplayers", L"By Players");
|
||||||
else if (sort == SORT_MAGIC)
|
|
||||||
curSort = m_loc.getWString(m_curLanguage, "bypluginmagic", L"By Plugin Magic");
|
|
||||||
else if (sort == SORT_CONTROLLERS)
|
else if (sort == SORT_CONTROLLERS)
|
||||||
curSort = m_loc.getWString(m_curLanguage, "bycontrollers", L"By Controllers");
|
curSort = m_loc.getWString(m_curLanguage, "bycontrollers", L"By Controllers");
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user