From 613f0b37b63c9c6a374c0cc1f886912aba3e0dfa Mon Sep 17 00:00:00 2001 From: giantpune Date: Fri, 22 May 2009 07:15:01 +0000 Subject: [PATCH] fixed a bug that reset all playcounts. fixed u8 playcount limit. moved the favorite icon over the gamelist. added ABC and count icons and got rid of the entry in the settings page. new buttons can be themed but not moved yet. --- source/cfg.c | 6 +- source/cfg.h | 4 +- source/filelist.h | 13 ++- source/images/abcIcon.png | Bin 0 -> 6951 bytes source/images/favIcon.png | Bin 0 -> 7260 bytes source/images/playCountIcon.png | Bin 0 -> 6870 bytes source/menu.cpp | 187 +++++++++++++++++++++++--------- 7 files changed, 154 insertions(+), 56 deletions(-) create mode 100644 source/images/abcIcon.png create mode 100644 source/images/favIcon.png create mode 100644 source/images/playCountIcon.png diff --git a/source/cfg.c b/source/cfg.c index 356d85a4..79fce5b0 100644 --- a/source/cfg.c +++ b/source/cfg.c @@ -55,7 +55,7 @@ u8 qboot = 0; u8 wsprompt = 0; u8 keyset = 0; u8 favorite = 0; -u8 count = 0; +u16 count = 0; #define TITLE_MAX 65 @@ -252,7 +252,7 @@ void CFG_Default(int widescreen) // -1 = non forced Mode //all alignments are left top here THEME.selection_x = 200; - THEME.selection_y = 40; + THEME.selection_y = 49;//40; THEME.selection_w = 396; THEME.selection_h = 280; THEME.batteryUnused = 70; @@ -298,7 +298,7 @@ void CFG_Default(int widescreen) // -1 = non forced Mode THEME.prompttxt_g = 0; THEME.prompttxt_b = 0; THEME.clock_x = 0; - THEME.clock_y = 330; + THEME.clock_y = 335;//330; THEME.clockAlign = CFG_ALIGN_CENTRE; THEME.sdcard_x = 160; THEME.sdcard_y = 390; diff --git a/source/cfg.h b/source/cfg.h index 3cbd2309..03acf738 100644 --- a/source/cfg.h +++ b/source/cfg.h @@ -145,7 +145,7 @@ extern struct CFG CFG; extern struct THEME THEME; extern u8 ocarinaChoice; extern u8 sort; -extern u8 playcnt; +extern u16 playcnt; extern u8 videoChoice; extern u8 languageChoice; extern u8 viChoice; @@ -172,7 +172,7 @@ struct Game_NUM { u8 id[8]; u8 favorite; - u8 count; + u16 count; }; diff --git a/source/filelist.h b/source/filelist.h index 6be30dea..a932964d 100644 --- a/source/filelist.h +++ b/source/filelist.h @@ -251,7 +251,16 @@ extern const u32 mp3_stop_png_size; extern const u8 favorite_png[]; extern const u32 favorite_png_size; -extern const u8 not_favorite_png[]; -extern const u32 not_favorite_png_size; +extern const u8 not_favorite_png[]; +extern const u32 not_favorite_png_size; + +extern const u8 favIcon_png[]; +extern const u32 favIcon_png_size; + +extern const u8 abcIcon_png[]; +extern const u32 abcIcon_png_size; + +extern const u8 playCountIcon_png[]; +extern const u32 playCountIcon_png_size; #endif diff --git a/source/images/abcIcon.png b/source/images/abcIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..9e9a142c1149e6d3c535b0500980fd72f8d397bf GIT binary patch literal 6951 zcmV+?8`$KDP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000nDNklwACLF$ zyZ3zi$Flj=x~tpidPej7DQD^@pQ=t?Q-!X5+uvUY~z` z{R9&LalRFncel5DQ1u?|n!NTO-@MrP)l+}_#R(OP+3RkCd!Boqdmd1eYEn(Y{Jr^m z^YBq-UqpX4=sk*4|YcBB^SF3aA&b zDdZ*rOgyp&fMhI^0l!Md1UX6^00a0)2QEmXw1AwXmRcZ>WD)?2BmlN9!N?#U4N@+p ztie|0WYdJHQ)N=dK%F+L%~JPmUz5B3`B3Kc^qIRG?lq-PUCsEi=S<^?Pti;jBXgHH z&2f%Ch6W_wda5ub{o{#$^o_FL|Je6F^SzCe?{9kV*L-8kPdE)?g1TwcsB}>E>J~$w zhouidrO7aW)Zt?oNaY|wkaU7109_>03wSvo8f0D?i3j!&zz5R6Ieb789yHL1jR|6j zm#e^by5ubAc{wU3L<{Vj`W&q8eafA*&rjs1a*XD6jX!q3`1yZ3^x)V?_VCb;3+pZ! z4aO;>{xJYNcQJ2U!R~!u$$sB6A58wPFF&?Yd;kxQMDnbDP(I4Y1=&U_SFt65gLp8R zkldv|H!E(CFfiP7z-~Dq(RnT zvqADWj46$BnLVJ(WSV0@vV(4hx7Yipy^X3i|I;73@CU;$9Qn!Zq578&e8H>YUG=VR z2R_Ol^D*Y%6adF)khCz-SDYU?QiTOm?+L=x!FNx4*kE|d*y20bfN(g5yjG1=1uh zNFNX;hY^qzIYlyvn^N&;yDe@glv^f;B3;9k_mb*9oV2N)FGo7oCKrCbp;$PetJO{NH-Or$Mj*z1gDKs zHh|+%4Q3J8b;k9WCU6GSIoDcncBtb<1L#p1Qzf8}OBk=y`SA*adc3 zG$k5>Q1AW3nJkDlMambi!Sb=hl9WAQCc9EyQ=n7Ti0c}JcRW}#mk+@m(;Hq%h49#X z*4$n&63w8w7nUXX?bQXa{HFiHlf_`{Q^m3yoGt2Q?6+kH3wjvq7H5<0#x2(AWi@5;U4F_&#!J`7T1mZ_bvxaUFX{0p#9b3b{; z1Uan>^&oJ?z8uYfhu>{z5r4Yn6p8!yGfy{cF1UJYZr&OUuL zGZkX(%-nTbAbcgZHNFdG1M_9UY*?6zp0xLX5vQ)P4V&;Aq}Olg1hWV*i>d!kmGL3a z>)C@3?7dF2a|og((dp4u@}O-B733@ zFz0))cA*?1w^p18rNiQEs4SEM(--cand<^$w^N`zuviq_6}$#>S7$HG_`ox=GBK$M zGiKO*G4>L~7A-#*e*xU%@4T3O0b=&XmbmLdUksj~YXSVcLLVj;eR$pqfK1ha51R~m zUJih+l`;mv?zao08DI@X%te4*?$fcmu|38L%eM`4A$RubOesiyFh6t~Vp=819Dq5m zm8Mf+GIRX;&t@R>d~1(@z}SEcI+xU=IrmhA(x(i}A7A#`|QJEOp7`54XE08|n4_)(xlO=5u_ zq6`zFUh%RUB3mQFk#q>%3Y5%t!~I>8GcR|--O;g{pYDPwW1@ci7|dJ?T%Fqi!J$aA z-3JS6!wKPS5ROK6SXm&su6Q#5<_gbLTm~pFDbfPbE5XFMt)M1UpXveH)NNG?>X15& z0qU$uV+agwv=|+rYK?lM4U9>n#yA5;f=W<%KpulCAH;?w43FsqH*t)$AYW6%>MU4; zPPyI+3!4_KP$LA>=e&U~2!!u%y1x$=c7*CDyTSUW=)vd^7&nvKGO}UWXhL}PAn0<- z9Zm$#rMDgSrNOG_-+g&q2DtJ~JLVirZs{NBu_3tTmGYOnAz@$ojdvXdCUmEyfwlg@ ze4rVeX*J^IcjQ2mhdm`6dpqZM%Y9Nro`f? zAqWN*vldg~Zq}XP%Qs+g|9m)54$n;GUVDEH=3-&cADjV|9&<3(fKc^p^Sv7&$L$Pj zAGpHq6wg5jz3?k~(`D}E7ML%`b;KWqxb)Q{PgR4bD<;`21Yg`c zGP81ED*VI77q?^n{BF_hbdtE~ftYFEaeoIaPku7-nMCmD7~9;69XIMeWu66pLWVml5q#dH zp_Dv`J#Stz4}jP2PfQGg@BL|qGLL}!FP?ZY@kNOJzHj}?!{D!e$N0M^z?bOHTHOP& zmaD`#3M)@07eBog{6m@cbA8ycfBD3$zZTpdd0Tvf245g0=j~^}x5qz~*Z?uNRgGK% zy0E1S8|#fcz#Bz@I5J4X)E>P}$AG&zc3@l>Eqx4w`%yk+H)E~DeWVYaL29U}p zxPnQTN`Qxj!iNL6&RLFQOS>vj{|IJ{E6Y^`D>k|h8T)_&Mi~X-@EWt&oF{{1%$P%r z(+ZT(Kq{y~vQ#~onG9lp$IAfoAZ-+J4pa^acmRu11#pslvO!hQgAGQrtC#H%+sOoA z%Q%y?VG?2*4XTtpvLME1ZZ{erQmif-^`PoF&9m5)&=15c-7h@`fb;Y*55`lfL|I^# zyH2W3h^cl}8mB;QAb}7_3zz8!W?mDJqZE?~1eY#K`lX5MK)=c+1ymwCDF7~#K_*a6 zfDlL>Hy8nG>7pOFDW@3&8q^umfm0N+7St|wlL^G3F+p0HU>eLg*9FxDu7k$B8U$)o zGam#j*0AHPm_W5Ut+Lo)+%s0Ie+AcwvCEYVt_s62Du5hD833-aW@#rA6WGQ)w|;G> zBHTa=Nz4K!y|e>e^#0m+CD=>W`r3Z!>>>&1A%hT5%mh7vNjrT@KHUb2$RZ0|jYfg7 z9*m7fpV0~G&$wuOmQ1yVF%GNmt7KKFD)I4EzRABlN)+g(n>^Qgvs1c@&G^1HH zgHdA)81X=uVKM=mFyUVj3p_K-$87^z0J(F$sm=8 zLZzz-*F|ZTlhWsWT7q(0MmYP(8lY44lulP8DoM&E0Im^sV1X;&m{J+Q7$s^Opc$8m z-vR(lvPuF{>6Dw`8djSa1f!2c=>=(WYMpkMKRRg#?B>Nf3YDcS+8!Ce^@*N6-#t

k2T*b(($)01{a*mqB~=5q%g|c$fFM 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 literal 0 HcmV?d00001 diff --git a/source/menu.cpp b/source/menu.cpp index d9c5792f..f18d1d50 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -980,7 +980,7 @@ int GameWindowPrompt() char IDFull[7]; char gameName[CFG.maxcharacters + 4]; u8 faveChoice = 0; - u8 playCount = 0; + u16 playCount = 0; GuiWindow promptWindow(472,320); promptWindow.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); @@ -1322,7 +1322,7 @@ int GameWindowPrompt() if(btn1.GetState() == STATE_CLICKED) { //boot //////////save game play count//////////////// extern u8 favorite; - extern u8 count; + extern u16 count; struct Game_NUM* game_num = CFG_get_game_num(header->id); if (game_num) { @@ -2314,8 +2314,8 @@ s32 __Menu_EntryCmpCount(const void *a, const void *b) struct discHdr *hdr2 = (struct discHdr *)b; /* Compare Play Count */ - u8 count1 = 0; - u8 count2 = 0; + u16 count1 = 0; + u16 count2 = 0; struct Game_NUM* game_num1 = CFG_get_game_num(hdr1->id); struct Game_NUM* game_num2 = CFG_get_game_num(hdr2->id); @@ -2376,7 +2376,7 @@ s32 __Menu_GetEntries(void) u8 favorite = 0; struct Game_NUM* game_num = CFG_get_game_num(header->id); if (game_num) { - favorite = game_num->favorite; + favorite = game_num->favorite; } if (favorite==1) { buffer2 = (discHdr *) realloc(buffer2, (cnt2+1) * sizeof(struct discHdr)); @@ -2772,10 +2772,23 @@ static int MenuDiscList() snprintf(imgPath, sizeof(imgPath), "%sbattery_bar.png", CFG.theme_path); GuiImageData batteryBar(imgPath, battery_bar_png); - snprintf(imgPath, sizeof(imgPath), "%sfavorite.png", CFG.theme_path); - GuiImageData imgFavoriteOn(imgPath, favorite_png); - snprintf(imgPath, sizeof(imgPath), "%snot_favorite.png", CFG.theme_path); - GuiImageData imgFavoriteOff(imgPath, not_favorite_png); + /*snprintf(imgPath, sizeof(imgPath), "%sfavorite.png", CFG.theme_path); + GuiImageData imgFavoriteOn(imgPath, favorite_png); + snprintf(imgPath, sizeof(imgPath), "%snot_favorite.png", CFG.theme_path); + GuiImageData imgFavoriteOff(imgPath, not_favorite_png);*/ + + snprintf(imgPath, sizeof(imgPath), "%sfavIcon.png", CFG.theme_path); + GuiImageData imgfavIcon(imgPath, favIcon_png); + //snprintf(imgPath, sizeof(imgPath), "%snot_favorite.png", CFG.theme_path); + //GuiImageData imgFavoriteOff(imgPath, not_favorite_png); + + snprintf(imgPath, sizeof(imgPath), "%sabcIcon.png", CFG.theme_path); + GuiImageData imgabcIcon(imgPath, abcIcon_png); + //snprintf(imgPath, sizeof(imgPath), "%snot_favorite.png", CFG.theme_path); + //GuiImageData imgFavoriteOff(imgPath, not_favorite_png); + snprintf(imgPath, sizeof(imgPath), "%splayCountIcon.png", CFG.theme_path); + GuiImageData imgplayCountIcon(imgPath, playCountIcon_png); + GuiTrigger trigA; trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); @@ -2896,16 +2909,47 @@ static int MenuDiscList() wiiBtn.SetSoundClick(&btnClick); wiiBtn.SetTrigger(&trigA); - GuiImage favoriteBtnImg(dispFave ? &imgFavoriteOn : &imgFavoriteOff);; - favoriteBtnImg.SetWidescreen(CFG.widescreen); - GuiButton favoriteBtn(imgFavoriteOn.GetWidth(), imgFavoriteOn.GetHeight()); - favoriteBtn.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); - favoriteBtn.SetPosition(-90, 105); - favoriteBtn.SetImage(&favoriteBtnImg); - favoriteBtn.SetSoundOver(&btnSoundOver); - favoriteBtn.SetSoundClick(&btnClick); - favoriteBtn.SetTrigger(&trigA); - favoriteBtn.SetEffectGrow(); + //GuiImage favoriteBtnImg((Settings.sort==fave) ? &imgFavoriteOn : &imgFavoriteOff);; + GuiImage favoriteBtnImg(&imgfavIcon); + favoriteBtnImg.SetWidescreen(CFG.widescreen); + GuiButton favoriteBtn(imgfavIcon.GetWidth(), imgfavIcon.GetHeight()); + favoriteBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);//(ALIGN_CENTRE, ALIGN_MIDDLE); + favoriteBtn.SetPosition(-80, 15); + favoriteBtn.SetImage(&favoriteBtnImg); + favoriteBtn.SetSoundOver(&btnSoundOver); + favoriteBtn.SetSoundClick(&btnClick); + favoriteBtn.SetTrigger(&trigA); + favoriteBtn.SetEffectGrow(); + favoriteBtn.SetAlpha(70); + + GuiImage abcBtnImg(&imgabcIcon); + abcBtnImg.SetWidescreen(CFG.widescreen); + GuiButton abcBtn(abcBtnImg.GetWidth(), abcBtnImg.GetHeight()); + abcBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);//(ALIGN_CENTRE, ALIGN_MIDDLE); + abcBtn.SetPosition(-40, 15); + abcBtn.SetImage(&abcBtnImg); + abcBtn.SetSoundOver(&btnSoundOver); + abcBtn.SetSoundClick(&btnClick); + abcBtn.SetTrigger(&trigA); + abcBtn.SetEffectGrow(); + abcBtn.SetAlpha(70); + + + GuiImage countBtnImg(&imgplayCountIcon); + countBtnImg.SetWidescreen(CFG.widescreen); + GuiButton countBtn(countBtnImg.GetWidth(), countBtnImg.GetHeight()); + countBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);//(ALIGN_CENTRE, ALIGN_MIDDLE); + countBtn.SetPosition(0, 15); + countBtn.SetImage(&countBtnImg); + countBtn.SetSoundOver(&btnSoundOver); + countBtn.SetSoundClick(&btnClick); + countBtn.SetTrigger(&trigA); + countBtn.SetEffectGrow(); + countBtn.SetAlpha(70); + + if (Settings.sort==fave)favoriteBtn.SetAlpha(255); + else if (Settings.sort==all)abcBtn.SetAlpha(255); + else if (Settings.sort==pcount)countBtn.SetAlpha(255); //Downloading Covers GuiTooltip DownloadBtnTT(LANGUAGE.ClicktoDownloadCovers); @@ -2957,8 +3001,10 @@ static int MenuDiscList() w.Append(&installBtn); w.Append(&homeBtn); w.Append(&settingsBtn); - w.Append(&DownloadBtn); + w.Append(&DownloadBtn); w.Append(&favoriteBtn); + w.Append(&abcBtn); + w.Append(&countBtn); if((Settings.hddinfo == hr12)||(Settings.hddinfo == hr24)) { @@ -3164,17 +3210,62 @@ static int MenuDiscList() } - else if(favoriteBtn.GetState() == STATE_CLICKED) - { - dispFave = !dispFave; - __Menu_GetEntries(); - gameBrowser.Reload(gameList, gameCnt); + else if(favoriteBtn.GetState() == STATE_CLICKED) + { + //dispFave = !dispFave; + Settings.sort=fave; + if(isSdInserted() == 1) { + cfg_save_global(); + } + __Menu_GetEntries(); + gameBrowser.Reload(gameList, gameCnt); sprintf(GamesCnt,"%s: %i",LANGUAGE.Games, gameCnt); - gamecntTxt.SetText(GamesCnt); - selectedold = 1; - favoriteBtnImg.SetImage(dispFave ? &imgFavoriteOn : &imgFavoriteOff); - favoriteBtn.ResetState(); - } + gamecntTxt.SetText(GamesCnt); + selectedold = 1; + //favoriteBtnImg.SetImage((Settings.sort==fave) ? &imgFavoriteOn : &imgFavoriteOff); + favoriteBtn.ResetState(); + favoriteBtn.SetAlpha(255); + abcBtn.SetAlpha(70); + countBtn.SetAlpha(70); + } + + else if(abcBtn.GetState() == STATE_CLICKED) + { + //dispFave = !dispFave; + Settings.sort=all; + if(isSdInserted() == 1) { + cfg_save_global(); + } + __Menu_GetEntries(); + gameBrowser.Reload(gameList, gameCnt); + sprintf(GamesCnt,"%s: %i",LANGUAGE.Games, gameCnt); + gamecntTxt.SetText(GamesCnt); + selectedold = 1; + //favoriteBtnImg.SetImage((Settings.sort==fave) ? &imgFavoriteOn : &imgFavoriteOff); + abcBtn.ResetState(); + favoriteBtn.SetAlpha(70); + abcBtn.SetAlpha(255); + countBtn.SetAlpha(70); + } + + else if(countBtn.GetState() == STATE_CLICKED) + { + //dispFave = !dispFave; + if(isSdInserted() == 1) { + cfg_save_global(); + } + Settings.sort=pcount; + __Menu_GetEntries(); + gameBrowser.Reload(gameList, gameCnt); + sprintf(GamesCnt,"%s: %i",LANGUAGE.Games, gameCnt); + gamecntTxt.SetText(GamesCnt); + selectedold = 1; + //favoriteBtnImg.SetImage((Settings.sort==fave) ? &imgFavoriteOn : &imgFavoriteOff); + countBtn.ResetState(); + favoriteBtn.SetAlpha(70); + abcBtn.SetAlpha(70); + countBtn.SetAlpha(255); + } //Get selected game under cursor int selectimg;//, promptnumber; @@ -3305,7 +3396,7 @@ static int MenuDiscList() wiilight(0); //////////save game play count//////////////// extern u8 favorite; - extern u8 count; + extern u16 count; struct Game_NUM* game_num = CFG_get_game_num(header->id); if (game_num) @@ -4036,7 +4127,7 @@ static int MenuSettings() sprintf(options2.name[2], "%s",LANGUAGE.keyboard); sprintf(options2.name[3], "%s",LANGUAGE.Unicodefix); sprintf(options2.name[4], "%s",LANGUAGE.Backgroundmusic); - sprintf(options2.name[5], "%s",LANGUAGE.ListSort); + sprintf(options2.name[5], " "); sprintf(options2.name[6], " "); sprintf(options2.name[7], " "); sprintf(options2.name[8], "%s",LANGUAGE.MP3Menu); @@ -4441,8 +4532,8 @@ static int MenuSettings() Settings.keyset = 0; if ( Settings.unicodefix > 2 ) Settings.unicodefix = 0; - if ( Settings.sort > 2 ) - Settings.sort = 0; + //if ( Settings.sort > 2 ) + // Settings.sort = 0; if (strlen(CFG.titlestxt_path) < (9 + 3)) { sprintf(cfgtext, "%s", CFG.titlestxt_path); @@ -4484,9 +4575,7 @@ static int MenuSettings() sprintf(options2.value[4], "%s", cfgtext); } - if (Settings.sort == all) sprintf (options2.value[5],"%s",LANGUAGE.all); - else if (Settings.sort == fave) sprintf (options2.value[5],"%s",LANGUAGE.fave); - else if (Settings.sort == pcount) sprintf (options2.value[5],"%s",LANGUAGE.count); + sprintf(options2.value[5], " "); sprintf(options2.value[6], " "); sprintf(options2.value[7], " "); sprintf(options2.value[8], "not working!"); @@ -4599,10 +4688,6 @@ static int MenuSettings() } else { WindowPrompt(LANGUAGE.NoSDcardinserted, LANGUAGE.InsertaSDCardtousethatoption, LANGUAGE.ok, 0,0,0); } - break; - case 5: - Settings.sort++; - //__Menu_GetEntries(); break; } @@ -4760,7 +4845,7 @@ int GameSettings(struct discHdr * header) sprintf(options3.name[2],"%s", LANGUAGE.Language); sprintf(options3.name[3], "Ocarina"); sprintf(options3.name[4], "IOS"); - sprintf(options3.name[5],"%s", LANGUAGE.addToFavorite); + sprintf(options3.name[5],"Parental Control");//sprintf(options3.name[5],"%s", LANGUAGE.addToFavorite); GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, vol); @@ -4855,7 +4940,7 @@ int GameSettings(struct discHdr * header) ResumeGui(); //extern u8 favorite; - extern u8 count; + /*extern u16 count; struct Game_NUM* game_num = CFG_get_game_num(header->id); if (game_num) @@ -4865,7 +4950,7 @@ int GameSettings(struct discHdr * header) } else { - faveChoice = no;} + faveChoice = no;}*/ struct Game_CFG* game_cfg = CFG_get_game_opt(header->id); @@ -4877,6 +4962,7 @@ int GameSettings(struct discHdr * header) ocarinaChoice = game_cfg->ocarina; viChoice = game_cfg->vipatch; iosChoice = game_cfg->ios; + parentalcontrolChoice = game_cfg->parentalcontrol; } else// otherwise use the global settings { @@ -4889,6 +4975,7 @@ int GameSettings(struct discHdr * header) } else { iosChoice = i249; } + parentalcontrolChoice = 0; } while(!exit) @@ -4924,8 +5011,10 @@ int GameSettings(struct discHdr * header) if (iosChoice == i249) sprintf (options3.value[4],"249"); else if (iosChoice == i222) sprintf (options3.value[4],"222"); - if (faveChoice == yes) sprintf (options3.value[5],"%s",LANGUAGE.Yes); - else if (faveChoice == no) sprintf (options3.value[5],"%s",LANGUAGE.No); + if (parentalcontrolChoice == 0) sprintf (options3.value[5],"0 (Always)"); + else if (parentalcontrolChoice == 1) sprintf (options3.value[5],"1"); + else if (parentalcontrolChoice == 2) sprintf (options3.value[5],"2"); + else if (parentalcontrolChoice == 3) sprintf (options3.value[5],"3 (Mature)"); if(shutdown == 1) @@ -4953,7 +5042,7 @@ int GameSettings(struct discHdr * header) iosChoice = (iosChoice + 1) % 2; break; case 5: - faveChoice = (faveChoice + 1) % 2; + parentalcontrolChoice = (parentalcontrolChoice + 1) % 4; break; } @@ -4961,7 +5050,7 @@ int GameSettings(struct discHdr * header) { if(isSdInserted() == 1) { - //////////save game play count//////////////// + /*//////////save game play count//////////////// extern u8 favorite; extern u8 count; struct Game_NUM* game_num = CFG_get_game_num(header->id); @@ -4985,7 +5074,7 @@ int GameSettings(struct discHdr * header) } else { WindowPrompt(LANGUAGE.NoSDcardinserted, LANGUAGE.InsertaSDCardtosave, LANGUAGE.ok, 0,0,0); } - ////////////end save play count////////////// + *////////////end save play count////////////// if (CFG_save_game_opt(header->id)) { WindowPrompt(LANGUAGE.SuccessfullySaved, 0, LANGUAGE.ok, 0,0,0);