From 593c3e0362a737fb723cb3cce7405cc8a394c636 Mon Sep 17 00:00:00 2001 From: Drexyl950 Date: Mon, 6 Feb 2012 02:31:04 +0000 Subject: [PATCH] * Fixed controller icons not being displayed on gameinfo page * Added Wifi10 and Wifi18 icons * Added keyboard controller icon --- data/images/keyboard.png | Bin 0 -> 3923 bytes data/images/wifi10.png | Bin 0 -> 7612 bytes data/images/wifi18.png | Bin 0 -> 7636 bytes source/menu/menu_gameinfo.cpp | 87 +++++++++++++++++++++++++--------- 4 files changed, 64 insertions(+), 23 deletions(-) create mode 100644 data/images/keyboard.png create mode 100644 data/images/wifi10.png create mode 100644 data/images/wifi18.png diff --git a/data/images/keyboard.png b/data/images/keyboard.png new file mode 100644 index 0000000000000000000000000000000000000000..7a3807f6fcde514c70256de730d07f5ccd0d49d4 GIT binary patch literal 3923 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 literal 0 HcmV?d00001 diff --git a/data/images/wifi10.png b/data/images/wifi10.png new file mode 100644 index 0000000000000000000000000000000000000000..51694f4b87a4986774626c9759faa5a3fe69c017 GIT binary patch literal 7612 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 xe9*r+fH6G*_zK{Rfekawq@* literal 0 HcmV?d00001 diff --git a/data/images/wifi18.png b/data/images/wifi18.png new file mode 100644 index 0000000000000000000000000000000000000000..5ebe63cd957579478240fccadc04ebac180440b9 GIT binary patch literal 7636 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 UbuBgk{A~tOlv9::iterator acc_itr = gameinfo.Accessories.begin(); acc_itr != gameinfo.Accessories.end(); acc_itr++) @@ -439,6 +449,8 @@ void CMenu::_textGameInfo(void) dancepad=1; else if (strcmp((acc_itr->Name).c_str(), "motionplus") == 0) motionplus=1; + else if (strcmp((acc_itr->Name).c_str(), "microphone") == 0) + microphone=1; else if (strcmp((acc_itr->Name).c_str(), "balanceboard") == 0) balanceboard=1; } @@ -475,13 +487,13 @@ void CMenu::_textGameInfo(void) if(guitar && x < max_controlsReq) { 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++; } if(drums && x < max_controlsReq) { 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++; } if(motionplus && x < max_controlsReq) @@ -493,13 +505,19 @@ void CMenu::_textGameInfo(void) if(dancepad && x < max_controlsReq) { 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++; } if(balanceboard && x < max_controlsReq) { 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++; } @@ -511,15 +529,17 @@ void CMenu::_textGameInfo(void) //check optional controlls wiimote=0, nunchuk=0, - classiccontroller=0, - balanceboard=0, - dancepad=0, - guitar=0, - gamecube=0, - motionplus=0, - drums=0, + classiccontroller=0, + balanceboard=0, + dancepad=0, + guitar=0, + gamecube=0, + motionplus=0, + drums=0, microphone=0, - wheel=0; + wheel=0, + keyboard=0, + zapper=0; for (safe_vector::iterator acc_itr = gameinfo.Accessories.begin(); acc_itr != gameinfo.Accessories.end(); acc_itr++) { @@ -543,6 +563,10 @@ void CMenu::_textGameInfo(void) microphone=1; else if (strcmp((acc_itr->Name).c_str(), "gamecube") == 0) 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) wheel=1; } @@ -553,7 +577,7 @@ void CMenu::_textGameInfo(void) if(classiccontroller && x < max_controls) { 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++; } if(nunchuk && x < max_controls) @@ -564,18 +588,20 @@ void CMenu::_textGameInfo(void) } if(guitar && x < max_controls) { - m_controls[x].fromPNG(guitarR_png); - m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 60, 60); + m_controls[x].fromPNG(guitar_png); + m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 52, 60); x++; } if(drums && x < max_controls) { m_controls[x].fromPNG(drums_png); + m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 52, 60); x++; } if(dancepad && x < max_controls) { m_controls[x].fromPNG(dancepad_png); + m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 52, 60); x++; } if(motionplus && x < max_controls) @@ -587,6 +613,7 @@ void CMenu::_textGameInfo(void) if(balanceboard && x < max_controls) { m_controls[x].fromPNG(balanceboard_png); + m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 52, 60); x++; } if(microphone && x < max_controls) @@ -598,11 +625,25 @@ void CMenu::_textGameInfo(void) if(gamecube && x < max_controls) { 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++; } if(wheel && x < max_controls) { m_controls[x].fromPNG(wheel_png); + m_btnMgr.setTexture(m_gameinfoLblControls[x] ,m_controls[x], 52, 60); x++; }