The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-30 15:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed controller icons not being displayed on gameinfo page

Browse Source 
* Added Wifi10 and Wifi18 icons
* Added keyboard controller icon
This commit is contained in:
Drexyl950 2012-02-06 02:31:04 +00:00
parent 47aea503fa
commit 593c3e0362
4 changed files with 64 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/images/keyboard.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
data/images/wifi10.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
data/images/wifi18.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

87
source/menu/menu_gameinfo.cpp
View File

@ -11,8 +11,10 @@ extern const u8 wifi1_png[];
extern const u8 wifi2_png[]; extern const u8 wifi2_png[];
extern const u8 wifi4_png[]; extern const u8 wifi4_png[];
extern const u8 wifi8_png[]; extern const u8 wifi8_png[];
extern const u8 wifi10_png[];
extern const u8 wifi12_png[]; extern const u8 wifi12_png[];
extern const u8 wifi16_png[]; extern const u8 wifi16_png[];
extern const u8 wifi18_png[];
extern const u8 wifi32_png[]; extern const u8 wifi32_png[];
extern const u8 wiimote1_png[]; extern const u8 wiimote1_png[];
@ -24,6 +26,7 @@ extern const u8 wiimote8_png[];
extern const u8 guitar_png[]; extern const u8 guitar_png[];
extern const u8 guitarR_png[]; extern const u8 guitarR_png[];
extern const u8 microphone_png[]; extern const u8 microphone_png[];
extern const u8 microphoneR_png[];
extern const u8 gcncontroller_png[]; extern const u8 gcncontroller_png[];
extern const u8 classiccontroller_png[]; extern const u8 classiccontroller_png[];
extern const u8 nunchuk_png[]; extern const u8 nunchuk_png[];
@ -38,6 +41,7 @@ extern const u8 motionplus_png[];
extern const u8 motionplusR_png[]; extern const u8 motionplusR_png[];
extern const u8 wheel_png[]; extern const u8 wheel_png[];
extern const u8 zapper_png[]; extern const u8 zapper_png[];
extern const u8 keyboard_png[];
extern const u8 wiispeak_png[]; extern const u8 wiispeak_png[];
//Ratings //Ratings
@ -398,10 +402,14 @@ void CMenu::_textGameInfo(void)
m_wifi.fromPNG(wifi4_png); m_wifi.fromPNG(wifi4_png);
else if (gameinfo.WifiPlayers == 8) else if (gameinfo.WifiPlayers == 8)
m_wifi.fromPNG(wifi8_png); m_wifi.fromPNG(wifi8_png);
else if (gameinfo.WifiPlayers == 10)
m_wifi.fromPNG(wifi10_png);
else if (gameinfo.WifiPlayers == 12) else if (gameinfo.WifiPlayers == 12)
m_wifi.fromPNG(wifi12_png); m_wifi.fromPNG(wifi12_png);
else if (gameinfo.WifiPlayers == 16) else if (gameinfo.WifiPlayers == 16)
m_wifi.fromPNG(wifi16_png); m_wifi.fromPNG(wifi16_png);
else if (gameinfo.WifiPlayers == 18)
m_wifi.fromPNG(wifi18_png);
else if (gameinfo.WifiPlayers == 32) else if (gameinfo.WifiPlayers == 32)
m_wifi.fromPNG(wifi32_png); m_wifi.fromPNG(wifi32_png);
@ -412,15 +420,17 @@ void CMenu::_textGameInfo(void)
u8 wiimote=0, u8 wiimote=0,
nunchuk=0, nunchuk=0,
classiccontroller=0, classiccontroller=0,
balanceboard=0, balanceboard=0,
dancepad=0, dancepad=0,
guitar=0, guitar=0,
gamecube=0, gamecube=0,
motionplus=0, motionplus=0,
drums=0, drums=0,
microphone=0, microphone=0,
wheel=0; wheel=0,
keyboard,
zapper=0;
//check required controlls //check required controlls
for (safe_vector<Accessory>::iterator acc_itr = gameinfo.Accessories.begin(); acc_itr != gameinfo.Accessories.end(); acc_itr++) for (safe_vector<Accessory>::iterator acc_itr = gameinfo.Accessories.begin(); acc_itr != gameinfo.Accessories.end(); acc_itr++)
@ -439,6 +449,8 @@ void CMenu::_textGameInfo(void)
dancepad=1; dancepad=1;
else if (strcmp((acc_itr->Name).c_str(), "motionplus") == 0) else if (strcmp((acc_itr->Name).c_str(), "motionplus") == 0)
motionplus=1; motionplus=1;
else if (strcmp((acc_itr->Name).c_str(), "microphone") == 0)
microphone=1;
else if (strcmp((acc_itr->Name).c_str(), "balanceboard") == 0) else if (strcmp((acc_itr->Name).c_str(), "balanceboard") == 0)
balanceboard=1; balanceboard=1;
} }
@ -475,13 +487,13 @@ void CMenu::_textGameInfo(void)
if(guitar && x < max_controlsReq) if(guitar && x < max_controlsReq)
{ {
m_controlsreq[x].fromPNG(guitarR_png); m_controlsreq[x].fromPNG(guitarR_png);
m_btnMgr.setTexture(m_gameinfoLblControlsReq[x] ,m_controlsreq[x], 60, 60); m_btnMgr.setTexture(m_gameinfoLblControlsReq[x] ,m_controlsreq[x], 52, 60);
x++; x++;
} }
if(drums && x < max_controlsReq) if(drums && x < max_controlsReq)
{ {
m_controlsreq[x].fromPNG(drumsR_png); m_controlsreq[x].fromPNG(drumsR_png);
m_btnMgr.setTexture(m_gameinfoLblControlsReq[x] ,m_controlsreq[x], 60, 60); m_btnMgr.setTexture(m_gameinfoLblControlsReq[x] ,m_controlsreq[x], 52, 60);
x++; x++;
} }
if(motionplus && x < max_controlsReq) if(motionplus && x < max_controlsReq)
@ -493,13 +505,19 @@ void CMenu::_textGameInfo(void)
if(dancepad && x < max_controlsReq) if(dancepad && x < max_controlsReq)
{ {
m_controlsreq[x].fromPNG(dancepadR_png); m_controlsreq[x].fromPNG(dancepadR_png);
m_btnMgr.setTexture(m_gameinfoLblControlsReq[x] ,m_controlsreq[x], 60, 60); m_btnMgr.setTexture(m_gameinfoLblControlsReq[x] ,m_controlsreq[x], 52, 60);
x++;
}
if(microphone && x < max_controlsReq)
{
m_controlsreq[x].fromPNG(microphoneR_png);
m_btnMgr.setTexture(m_gameinfoLblControlsReq[x] ,m_controlsreq[x], 52, 60);
x++; x++;
} }
if(balanceboard && x < max_controlsReq) if(balanceboard && x < max_controlsReq)
{ {
m_controlsreq[x].fromPNG(balanceboardR_png); m_controlsreq[x].fromPNG(balanceboardR_png);
m_btnMgr.setTexture(m_gameinfoLblControlsReq[x] ,m_controlsreq[x], 60, 60); m_btnMgr.setTexture(m_gameinfoLblControlsReq[x] ,m_controlsreq[x], 52, 60);
x++; x++;
} }
@ -511,15 +529,17 @@ void CMenu::_textGameInfo(void)
//check optional controlls //check optional controlls
wiimote=0, wiimote=0,
nunchuk=0, nunchuk=0,
classiccontroller=0, classiccontroller=0,
balanceboard=0, balanceboard=0,
dancepad=0, dancepad=0,
guitar=0, guitar=0,
gamecube=0, gamecube=0,
motionplus=0, motionplus=0,
drums=0, drums=0,
microphone=0, microphone=0,
wheel=0; wheel=0,
keyboard=0,
zapper=0;
for (safe_vector<Accessory>::iterator acc_itr = gameinfo.Accessories.begin(); acc_itr != gameinfo.Accessories.end(); acc_itr++) for (safe_vector<Accessory>::iterator acc_itr = gameinfo.Accessories.begin(); acc_itr != gameinfo.Accessories.end(); acc_itr++)
{ {
@ -543,6 +563,10 @@ void CMenu::_textGameInfo(void)
microphone=1; microphone=1;
else if (strcmp((acc_itr->Name).c_str(), "gamecube") == 0) else if (strcmp((acc_itr->Name).c_str(), "gamecube") == 0)
gamecube=1; gamecube=1;
else if (strcmp((acc_itr->Name).c_str(), "keyboard") == 0)
keyboard=1;
else if (strcmp((acc_itr->Name).c_str(), "zapper") == 0)
zapper=1;
else if (strcmp((acc_itr->Name).c_str(), "wheel") == 0) else if (strcmp((acc_itr->Name).c_str(), "wheel") == 0)
wheel=1; wheel=1;
} }
@ -553,7 +577,7 @@ void CMenu::_textGameInfo(void)
if(classiccontroller && x < max_controls) if(classiccontroller && x < max_controls)
{ {
m_controls[x].fromPNG(classiccontroller_png); m_controls[x].fromPNG(classiccontroller_png);
m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 60, 60); m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 52, 60);
x++; x++;
} }
if(nunchuk && x < max_controls) if(nunchuk && x < max_controls)
@ -564,18 +588,20 @@ void CMenu::_textGameInfo(void)
} }
if(guitar && x < max_controls) if(guitar && x < max_controls)
{ {
m_controls[x].fromPNG(guitarR_png); m_controls[x].fromPNG(guitar_png);
m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 60, 60); m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 52, 60);
x++; x++;
} }
if(drums && x < max_controls) if(drums && x < max_controls)
{ {
m_controls[x].fromPNG(drums_png); m_controls[x].fromPNG(drums_png);
m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 52, 60);
x++; x++;
} }
if(dancepad && x < max_controls) if(dancepad && x < max_controls)
{ {
m_controls[x].fromPNG(dancepad_png); m_controls[x].fromPNG(dancepad_png);
m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 52, 60);
x++; x++;
} }
if(motionplus && x < max_controls) if(motionplus && x < max_controls)
@ -587,6 +613,7 @@ void CMenu::_textGameInfo(void)
if(balanceboard && x < max_controls) if(balanceboard && x < max_controls)
{ {
m_controls[x].fromPNG(balanceboard_png); m_controls[x].fromPNG(balanceboard_png);
m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 52, 60);
x++; x++;
} }
if(microphone && x < max_controls) if(microphone && x < max_controls)
@ -598,11 +625,25 @@ void CMenu::_textGameInfo(void)
if(gamecube && x < max_controls) if(gamecube && x < max_controls)
{ {
m_controls[x].fromPNG(gcncontroller_png); m_controls[x].fromPNG(gcncontroller_png);
m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 48, 60);
x++;
}
if(keyboard && x < max_controls)
{
m_controls[x].fromPNG(keyboard_png);
m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 52, 60);
x++;
}
if(zapper && x < max_controls)
{
m_controls[x].fromPNG(zapper_png);
m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 52, 70);
x++; x++;
} }
if(wheel && x < max_controls) if(wheel && x < max_controls)
{ {
m_controls[x].fromPNG(wheel_png); m_controls[x].fromPNG(wheel_png);
m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 52, 60);
x++; x++;
} }