From 468f678ac21d39322116de709c6cf3bda1a740d7 Mon Sep 17 00:00:00 2001 From: "fix94.1" Date: Wed, 1 Feb 2012 22:26:51 +0000 Subject: [PATCH] -sync with wiiflow r418 --- resources/dvdskin(original).png | Bin 0 -> 7713 bytes scripts/buildtype.sh | 58 +++++++++++----------- scripts/svnrev.sh | 84 ++++++++++++++++---------------- source/defines.h | 7 +-- source/list/cachedlist.cpp | 2 +- source/menu/menu.hpp | 3 +- source/menu/menu_download.cpp | 5 +- source/menu/menu_game.cpp | 4 +- source/menu/menu_main.cpp | 43 +++++++--------- wiiflow.pnproj | 2 +- wiiflow.pnps | 2 +- 11 files changed, 102 insertions(+), 108 deletions(-) create mode 100644 resources/dvdskin(original).png diff --git a/resources/dvdskin(original).png b/resources/dvdskin(original).png new file mode 100644 index 0000000000000000000000000000000000000000..ec1c686b5cdd618c9b3b24e277f6558333751c9a GIT binary patch literal 7713 zcmYkBcOX^oAIG0NT=!o4O0E&t%3fI|<3`zX?HM;3$SfqQV-;mqMk1SQWM!r35~0Xm zMTv$@*@WNy{`dRqInO!&Jm)#*^ZvYF?Fb?0qm4uWU;quLUBwCi zHl+=)TV}dipyCtnJZ*x!e$MzD0M&^M|1Q(f<^&f#Gh+aPP67Z$0kB8A1!dqxC+6T$lD z&shXIE@xdGQnK~G_muSSP1JM+M*)7a*@vs(UIa_yF`4Msug``PAs`@tS>fwaT1|O% zy?Sd!V^W^d@v@E`4Temgqce!D-l8n*uI+rI_tw|hTj@9wT=AN?!VJeW5L z`}>&xaP9t)f5mL4=Arx*VxMf-9|qURwr_`94M}_VHUE8=_;k1lhvttu!N1>yf0|cA zSHB(I^!cS}MUS0pPSD=;)sJRQC4zrn3fYbUn@%}8lE4eZ{#{@loLhpta&!?xh+4gS zw0~NWzB3=0T6@C~le6HOAaQJPtmM8_*Fh^w7&y_W#jE%=$>pN*h^h+U_9n=NF{MeXfj)F&?D=5s@d zVSv`Yp`oH;CsJjiTm&Pro|1r48qexp)vXVpA{3D@L$ra&C{STfms>sb`cxM>IrToC69>1E6 z!yos+R#a(1 z60dWLrUxKoVnqA(&Oa>WbYHo7f*LFMM-`;#F1(wvyWWAyY0;U%lDh-SBC=AEJ>RuL z?M^B!94r=wca)jtcTRHAf6{_0jgH!}u`q1fJp3-zyjiF*|HwAG3F&eA%O*bzAh1it zvLXyaQeuG@*&t=oK6A>$5FX5&PO;kaJk_&2t~zg+iH!GkYR#WOIu6Ywx*R5QD|dGg zsv0*|j|58J4pwe2Uo>eZ^~N;*I{R&xIa{WCoY^4c#I4sa<(y#!D%>inmzvDsy)lx| z$;U6j^uoOfS7Fi^U$LW}O5HJNThTc(Xv<(}#LD(TyCIHZ5aE-j^_l3h_I$~N@P!XD zcC$PqaZDnarDhQIF91vK2(afJ2gFg)6bSg8D^eX9szlf%IxwX;x*7tj%NN-(aex}z zajVdgqBElaPhv7r?UV?|=5SS0pHLfGHl=Ize3u_L7%RC;z?9Wa^k*F>E`*;9_cPAG z-m&El+^6i@f*8aLQ}K$btu>=uq3kQc_XQ`+;QpS02D*#JpvOTKGjB$3mL_*XCRtHP z!=o>A&pbHRzl9@X!_=})1_>qGr<8v#Ze#`I%a4hIMDx(~7%Z8)ErT^6qx}K)drW}G zYsH6|aJ;D3&1pF2R>s&-84TnmQy;|hNrXEc?TtFjT>JlcMB>$XJrk6h_w zUg_4;%ez@oqYQt=Iw+hG!Zic&Fv|8UYrz>aRlUs_4z*1;IFxt;utwpCiYr+<@W~t` zdEFK9eeRLH;uzkNQWJoAcMP;QUT4J+3w)>VTDsCfCmV6}qmj_^aW2_c#b{uZk1PW2 zGPTU)a`uSJCLCrgrcqNkRses1EtIZ6E+n|I_xJ~7=+=g{`-17&RPcoQWIMjn9Gsmp zeO|t4Z^jR(y>;`8qAjCSUoj1Qapd=^=Gk8=GMhf3sGs-&0rRh9 ze1gbJ#O823D{SeZt+7E}O*pJJ#!3l7}h6+BSq;y?XpRPfJy|M@2%h7rim@YXy+ty(lZ^m}_9b zta4czR`o8-(%3^ai&I<|?DwpSh34A&OIr{`j>AwtS>iy3R z{nK@ysdqt0>Nvm%?f`$qk4Hy4+fB|9(I0XrKwLhQGIqb{b>owy4|0)Y59-4-MrvhT zD4gVGf(3INfF)XcAE8Gm+tlvpx0pKyBe$T)r!8P{yd%G!5aZh&&tRoL5q&^u7})@b&Jzp_3|_ znDJo90uHJ#!E6qEaj4d!Cs!+ zLe~@IeHbyi3Z`MsC6oMoeNc42(}7Y->ZLoQX#ibMQ0jFAic&?DVCSVixi%c{3u^5p zpct)6%Xk}}aTFwRMbM(;X^_B+HwHPM56r~Y_S9iXyM437O)UdZIL3gXE-Ra+0KKO? zCLfeWBGQ6vlyJ8ym6Mik=)>s|a?Is=M9?bqOcE+u%s1qa12fTa2#G5SGw%StOL0bo z0}ExW8;SG}4jwm4s(K+DT_pnfb7W-vwSc?T*Kd4E7XuH&dqH_%E{9M8)~&T}>a4Wz z>F$)qfsMD!AZfF(ge_lFH!v5F7JJsrLK5)Kh?*lgOgTc1O)FZDWBYc#B|MfobsuLe@?*0Xa#l3nx1%I2#z@-YgJKvISlkz%k<+ zrElrFab~#(3;l|Aw-bSeO*#=>&zuYh%H(rz9v{5O`IB0zZ1{={2%hg-fvf#uG&e-) zKLn$W7hITn;JJWNALVIX-rq`G}yX93~12 zJ&e+jsRSe$EnTrhVe^;2zHW@({tTI00fRat8XH427{Z~iHO^*`7fK*6bg zP29ex*v>9Zzz;b$iFBlI&FoapmNhzI==LqyjV8{&_WEiTaMY4FR>zIA z6WzI)hy6k07DZrG&AI#WOkHd{MH2LU54BTWIx8#(r}{`j99v^~MnFb*6+>tcgDL1~ zBqGW7%o;GjGi^&LlBg}Xu=}B10hDX8cclh?19`equ}PLl>UM7>}!0duB%3}0Eb8BaNCp5 z45_`>Y-g;*OGwGkIr5W0&(s3b6{C=w%~(Q}Z(M^yK9@fowL28n*pwV9YLrOSJlgHM z(e8DHB#C>`=3mmSDvxi}c^PXK?Ht_XIk%mG42f7Cn8Hy2W1;(%&m9%~j?GD7BX3s_ zC9m)8upgh%*4Uru3tPFB{Stq3qAY%oH?dc!Q3S^dVdfn{jjbs#ibdwUYpq5!yTALW zvHr9#WWhXpZ-?go2NJ_Jg!p&S^qJo!BlS^&{^?tCXh#&e#EBm2Tz!?qBT{}1hXlYd z2ayqXwW4{XZvVWo40Y-JRZc|2ztnYH`*kwI4h>8;IyJVcx8EKetcGpB{U(AXjEMT4L9J7xA$3kkR1%)aB>s!D6wD5PN923nMSdp;#O zC(O^-IcG9Ic&v8xj>ba_PCIS?q0jBccPG4pzkK;hdy(M7_3S>xPqr~M;kDf4x#fzN z80d}aVmk!}p07oTI)v^1R6Eh+O>6D{S)-%3J_bO8hm0-L3rQg zm=DVvD<70e&i}QGkN?kthdK1>bFcbBSLii&TG@!H-N!|$kkbz&DOD%(;m8Vi~l6?GWpCb z4IAamHCB8RgFoGR9=VSw9kvEZ&zcx-mL1O7oQ{kPqTz1H&lGECLp63c7t^_sYkq3_vZe?1oUo0;W zi1p1{&e6D6)*$ve@mM=&SMN24+qW}FHtO|zD7}>eBj3!peuP&zNs;yayD;H@>78n* zv??ax8lfJg1Jo96`$|EaaS;(ro8L|QOB9B$HBTN>xi$@-Cg?DN2&xPJzReo7gh`kL zBZN1+`6(@j`k6e#cx2RkT!6^ScpPM_P7JdYQK;0TJOw?VAcR(1Fii}a_~@u3{Qkv! zbb_@2EUAzh_HTn$dwvlze38?Mj-hkf{B71rC(psQa#GLYn2>Uo0*3r#q6k1M&9VI9 zGY=bh=y+cED*Rk1C2vjD@gFt)F6V=uWuf!(mZc0M#1%?lE9J*KTV2= zCu5VL-sti`o(>CvNoFo&_Z{QnL>Tcxs)ypdA|MI;L+q;JNkKhO!RK>uBjr}5u2L?@ z@g|nIAZ;7FQZNLc-rW&wV-`)MPl~wr>d#&Q&IfH`AU3^DlVRm<7Wcgf&NtAy7+yxU zcl$JHN-f(m+T(J1_k4b1GEu+uZ;Y-QT$lb?4C3^S2T`Fgl5NG4Cq__lXVwHye7t+* zFJ|8(x3?3!gN7$@!G&XZNhDFP^-q2w8n)m&v7MgW#4V`s5B>>kFQOg5?eZgPXY3hdvH&0Lk;^LwlPmkEl7Y!&a0V2~#g>KEd zHzyhNJ>0)t{HZTeLOk`JIoqkQy*0CHNg}*1FASOVKwn5msi7e<-^i&;SwCZXD`0T> zyS@F%qRoIa_CjJOa)T=4xmK86?#4 zG)!4;&E|0EFW-7~Y+9fHDto*=j{U}UuNT#p-<-7I6xreF;Wk6jdfgva+zRyX(?wQ# zil;g_UBw?Cj;sYL05Z#41W>fm5)QUCcCWjrh$}Kd*&Z|Zy7s1YW4s#sI3D7rd6>{I zi(oo-?YStNy7Kw-snE?AB}n&sqH#f?!5J^y+FyUQn{3u{DQJHOh)e-v&c~-pcGnS)O%m$Dn?Eng{Eas>Vj^}V#p)K_)G^e1NfCe4P%Ap#TM2p? zXdn=_<{;9qGcs>r4lEQXsU%PFdQ(`Ao)I^AotB;|3^6rcY#oy9(|O1U&>Wzl+%V@A zvZC__El81zpW=k3I+}Xi)lQul{4y-R$L=3z@;DlsW9Jjh?BpwAj;1!|BH@I$o<8HM z^207Dc-7k~X2Li3c1L~${@KwZ2foY(VR z+}q1~ZJG6%T6jy%-_NjgP~AX6GmZ(`<)vXhB}p|D32}^UOTum-PFmZ;tISJ~+`!*W zBK(b&#$E+mpDNV!-A$IG6ep+uO9428d{s-KGiZ?1sNz+tPlMb;LE^#X=M)lcyDrhp z*m)83U_v5EAg$G$b@eJj2%NkadQ2z*>7E!=>s|IeDxwgbzOI(K*v&1ioCSko=dr#SwHW5bZR}{Gt*TTqJ_*`t%_dp`-@)%rp}8=Td$}l^IZBIiAx%=qLes%^7;F7Uaeaj_?l zH-;e5jwD%4(BiMy+{vN$R@{ypkTO|b&iL2p&0Jbr!L9e#4{3{ZyFO6t)hXMx0s-=q zKBY)y6xk&YCTE-OOo}!tzOkmm-6{ts*q`A5-15Naex8;tkbA&IF98znEL{UN@=|p1 zSN~iD2HKZyrg<=YRbm_iV<2-Fr2_)29x;nYxwjf8?+h`u%(y+R*CM9P#GL+Bqetce zb+T73WqUZEfXIU3fU@U;VgvWS|6sF+cflvH(6tYTXAE+F^%)T4!!=)heeWu*JA>jUTt{e%PelX@Sd?RNQflcdmBnu~Si1 znwi3lV+bELN=eIo@tu~@+?x)(!2clqvDzK%^o~-E9<^)6M%}iDhY9eXa+`p(+k}xcrLkN&bFZ?D@(^ZyE0q(Ody44HS5$0-He(1O{uF3kqv=={E$RB;&utp3&Vk@!Lg@58Co@8 zrHj=%Ee%R)IJ9_7BZFEbbbfAZjPq!R9-E(zUNMc9>ZCCtbgww$L8s-|tv`XMlv#y2 zs0p{l)3yxeh?i8y>Lo(+6|Y?38Tz=OpZ!WETnLt)BMZYnRS$Y}?@rLeVG~%U-)rOg zPA=rkbY`U)dxeU1qb4+I<4LR0&6Ew$RsYUZI}gM^e04K+@r>qQM@C(*KzC67$V^g6 zAgVPV+1BL`42QE%(306AjAisf$~h(XPbC!AqDkzifw4&23U`20mUoZeFqH$)d+dFz zHv3Ex!NH1(Js-O~q)juQR zXrAmC|24#{$zvl+3Oq(oN%ok#L^>+}lKGLEKj^Jime@_bs`NGTdq?DwHh;9wcMwHT zm6!6^`_+C1k@F(SPc{17x}m%2iHdk_by<@FQMrY|2gsTBga+7Wrk2)f7Ui&FhF#VL10KMs##>eWApV6v#-dvhAWz9P z4iz>{>+IQhc(9P~GU7^+0dV}R{${;tu8VNeZSiUtpB-#?lX>jZdp1C(;9`!)J2r~M zC?$Dfa!j)|c~D^b?v5uKW%naEJwbfFmwm}1cS<%=8FOV%1lZo+G-$BD?%F<7?O3@G z{e-w5|Dq$??MCHnsa7X!?I+J=sc!cTSU%4bAN1s^MfG|3?iLAfzjH;C)5WVmUo-D!10F`x&DAD*3TPGJ(1Y?g?fyr)c?W5dZ-ks_Gy=czhCf@FwKe2 z5~Jkct`>a7T7O=Spz4u?d%pzBDn0JmTe^1J>8uXN?U2E2pZ}=d8#wvL-Z_99mQ{r~ zg2#2Dm7fq9-W%rTyA4>tXT8hH56JHOm*YY$C>{4XRO%GaE0}57FuA&e`VVYC=fS}_ zb~95a^fys>1*Lyu%=4F~@u^Z)nKSbn7loJ~p~(7K?-j2EW6D9&2UTt;q|TWIdwq(5 zb|4Y}Cq4$WRQ`IaHcBAdbou-uVy^C*|~r zm}03EYmV%{DZoVVD^IGRyV1_|8 zS#I4MFyoi1Y2BaEvm^V}_;Ef+a(w $FILENAME -#include "alt_ios.h" -int mainIOS = $VERSION; -EOF +#!/bin/bash + +FILENAME=source/loader/alt_ios_gen.c +GENERATE=0 +VERSION=249 + +if [ ! -z "$1" ]; +then + VERSION=$1 +fi + +if [ ! -f $FILENAME ]; +then + GENERATE=1 +else + CURRENT_VERSION=`grep mainIOS\ = $FILENAME | awk '{printf "%d", $4}'` + if [ $CURRENT_VERSION -ne $VERSION ]; + then + GENERATE=1 + fi +fi + +if [ $GENERATE -eq 1 ]; +then + + cat < $FILENAME +#include "alt_ios.h" +int mainIOS = $VERSION; +EOF fi \ No newline at end of file diff --git a/scripts/svnrev.sh b/scripts/svnrev.sh index 28551a10..2a9f3940 100644 --- a/scripts/svnrev.sh +++ b/scripts/svnrev.sh @@ -1,42 +1,42 @@ -#! /bin/bash -# -rev_new_raw=$(svnversion -n . 2>/dev/null | tr '\n' ' ' | tr -d '\r') -[ -n "$rev_new_raw" ] || rev_new_raw=$(SubWCRev . 2>/dev/null | tr '\n' ' ' | tr -d '\r') - -if [ "$rev_new_raw" == "exported" ]; -then - echo This copy of wiiflow is not under source control - exit -fi - - -rev_new_raw=$(echo $rev_new_raw | sed 's/[^0-9]*\([0-9]*\)\(.*\)/\1 \2/') -rev_new=0 -a=$(echo $rev_new_raw | sed 's/\([0-9]*\).*/\1/') -let "a+=0" -#find max rev -while [ "$a" ]; do - [ "$a" -gt "$rev_new" ] && rev_new=$a - rev_new_raw=$(echo -n $rev_new_raw | sed 's/[0-9]*[^0-9]*\([0-9]*\)\(.*\)/\1 \2/') - a=$(echo $rev_new_raw | sed 's/\([0-9]*\).*/\1/') -done - -rev_old=$(cat ./source/svnrev.h 2>/dev/null | tr -d '\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/') - -if [ "$rev_new" != "$rev_old" ] || [ ! -f ./source/svnrev.h ]; then - - cat < ./source/svnrev.h -#define SVN_REV "$rev_new" -EOF - - if [ -n "$rev_old" ]; then - echo "Changed Rev $rev_old to $rev_new" >&2 - else - echo "svnrev.h created" >&2 - fi - - rev_new=`expr $rev_new + 1` - rev_date=`date +%Y%m%d%H%M -u` - - -fi +#! /bin/bash +# +rev_new_raw=$(svnversion -n . 2>/dev/null | tr '\n' ' ' | tr -d '\r') +[ -n "$rev_new_raw" ] || rev_new_raw=$(SubWCRev . 2>/dev/null | tr '\n' ' ' | tr -d '\r') + +if [ "$rev_new_raw" == "exported" ]; +then + echo This copy of wiiflow is not under source control + exit +fi + + +rev_new_raw=$(echo $rev_new_raw | sed 's/[^0-9]*\([0-9]*\)\(.*\)/\1 \2/') +rev_new=0 +a=$(echo $rev_new_raw | sed 's/\([0-9]*\).*/\1/') +let "a+=0" +#find max rev +while [ "$a" ]; do + [ "$a" -gt "$rev_new" ] && rev_new=$a + rev_new_raw=$(echo -n $rev_new_raw | sed 's/[0-9]*[^0-9]*\([0-9]*\)\(.*\)/\1 \2/') + a=$(echo $rev_new_raw | sed 's/\([0-9]*\).*/\1/') +done + +rev_old=$(cat ./source/svnrev.h 2>/dev/null | tr -d '\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/') + +if [ "$rev_new" != "$rev_old" ] || [ ! -f ./source/svnrev.h ]; then + + cat < ./source/svnrev.h +#define SVN_REV "$rev_new" +EOF + + if [ -n "$rev_old" ]; then + echo "Changed Rev $rev_old to $rev_new" >&2 + else + echo "svnrev.h created" >&2 + fi + + rev_new=`expr $rev_new + 1` + rev_date=`date +%Y%m%d%H%M -u` + + +fi diff --git a/source/defines.h b/source/defines.h index 3a7b647f..7c241c61 100644 --- a/source/defines.h +++ b/source/defines.h @@ -1,5 +1,5 @@ #define APP_NAME "WiiFlow" -#define APP_VERSION "3.0 ALPHA" +#define APP_VERSION "3.1 Alpha" #define APPDATA_DIR "wiiflow" #define APPDATA_DIR2 "apps/wiiflow" @@ -22,8 +22,9 @@ "Lustar, CedWii, Benjay, Domi78, Oops, Celtiore, Jiiwah, FluffyKiwi, Roku93, \ Spayrosam, Bluescreen81, Chappy23, BlindDude, Bubba, DJTaz, OggZee, Usptactical, \ WiiPower, Hermes, Spidy1000, Dimok, Kovani, Drexyl, DvZ, Etheboss, FIX94, GaiaKnight, \ -nibb, NJ7, Plasma, Pakatus, ravmn, spidercaleb, Ziggy34, And to anyone who has donated or contributed to Wiiflow \ -\nthat we missed!" +nibb, NJ7, Plasma, Pakatus, ravmn, spidercaleb, Ziggy34 \ + And to anyone who has donated or contributed to Wiiflow \ +that we missed!" #define THANKS_SITES "devkitpro.org, wiibrew.org, gametdb.com, ohloh.net, wiifanart.com, wiiflowiki.com, tgames.fr.nf" #define THANKS_CODE "CFG Loader, uLoader, USB Loader GX, NeoGamma, WiiXplorer, Triiforce, Mighty Channels" diff --git a/source/list/cachedlist.cpp b/source/list/cachedlist.cpp index a7a61deb..00511364 100644 --- a/source/list/cachedlist.cpp +++ b/source/list/cachedlist.cpp @@ -102,7 +102,7 @@ void CachedList::LoadChannels(string path, u32 channelType) if(m_update) { - gprintf("Updating\n"); + gprintf("Updating channels\n"); list.GetChannels(*this, m_settingsDir, channelType, m_channelLang); m_loaded = true; diff --git a/source/menu/menu.hpp b/source/menu/menu.hpp index 10cdd1cc..856773a3 100644 --- a/source/menu/menu.hpp +++ b/source/menu/menu.hpp @@ -166,6 +166,7 @@ private: u32 m_mainLblInit; u32 m_mainLblUser[6]; bool m_show_dml; + bool m_GameTDBLoaded; //Main Config menus u32 m_configLblPage; u32 m_configBtnPageM; @@ -700,7 +701,7 @@ private: int _config4(void); int _configAdv(void); int _configSnd(void); - void _game(bool launch = false, bool gametdb = false); + void _game(bool launch = false); void _download(std::string gameId = std::string()); bool _code(char code[4], bool erase = false); void _about(void); diff --git a/source/menu/menu_download.cpp b/source/menu/menu_download.cpp index 7d0bd850..26769e75 100644 --- a/source/menu/menu_download.cpp +++ b/source/menu/menu_download.cpp @@ -119,8 +119,9 @@ static string countryCode(const string &gameId) static string makeURL(const string format, const string gameId, const string country) { string url = format; - if (url.find(TAG_LOC) != url.npos) //check if {loc} is in the URL before trying to replace it - url.replace(url.find(TAG_LOC), strlen(TAG_LOC), country.c_str()); + if (url.find(TAG_LOC) != url.npos) + url.replace(url.find(TAG_LOC), strlen(TAG_LOC), country.c_str()); + url.replace(url.find(TAG_GAME_ID), strlen(TAG_GAME_ID), gameId.c_str()); return url; diff --git a/source/menu/menu_game.cpp b/source/menu/menu_game.cpp index 9174b9d5..826602ed 100644 --- a/source/menu/menu_game.cpp +++ b/source/menu/menu_game.cpp @@ -284,7 +284,7 @@ static void setLanguage(int l) configbytes[0] = 0xCD; } -void CMenu::_game(bool launch, bool gametdb) +void CMenu::_game(bool launch) { m_gcfg1.load(sfmt("%s/gameconfig1.ini", m_settingsDir.c_str()).c_str()); if (!launch) @@ -321,7 +321,7 @@ void CMenu::_game(bool launch, bool gametdb) m_gameSound.Stop(); break; } - else if (BTN_PLUS_PRESSED && gametdb) + else if (BTN_PLUS_PRESSED && m_GameTDBLoaded) { _hideGame(); m_gameSelected = true; diff --git a/source/menu/menu_main.cpp b/source/menu/menu_main.cpp index 3f87494d..b546d47f 100644 --- a/source/menu/menu_main.cpp +++ b/source/menu/menu_main.cpp @@ -74,31 +74,17 @@ void CMenu::_hideMain(bool instant) } static bool show_homebrew = true; -static bool show_channel = true; static bool parental_homebrew = false; +static bool show_channel = true; void CMenu::_showMain(void) { _hideWaitMessage(); #ifdef SHOWMEM m_btnMgr.show(m_mem2FreeSize); -#endif -#ifdef SHOWMEMGECKO - mem1 = SYS_GetArena1Size(); - mem2 = MEM2_freesize(); - if( mem1 != mem1old ) - { - mem1old = mem1; - gprintf("Mem1 Free: %u\n", mem1); - } - if( mem2 != mem2old ) - { - mem2old = mem2; - gprintf("Mem2 Free: %u\n", mem2); - } #endif m_vid.set2DViewport(m_cfg.getInt("GENERAL", "tv_width", 640), m_cfg.getInt("GENERAL", "tv_height", 480), - m_cfg.getInt("GENERAL", "tv_x", 0), m_cfg.getInt("GENERAL", "tv_y", 0)); + m_cfg.getInt("GENERAL", "tv_x", 0), m_cfg.getInt("GENERAL", "tv_y", 0)); _setBg(m_gameBg, m_gameBgLQ); m_btnMgr.show(m_mainBtnInfo); m_btnMgr.show(m_mainBtnConfig); @@ -169,7 +155,8 @@ void CMenu::LoadView(void) _loadCFLayout(m_cfg.getInt(_domainFromView(), "last_cf_mode", 1)); m_cf.applySettings(); - char *mode = (m_current_view == COVERFLOW_CHANNEL && m_cfg.getBool("NAND", "disable", true)) ? (char *)"NAND" : ((m_current_view == COVERFLOW_DML) ? (char *)"DML" : (char *)DeviceName[currentPartition]); + char *mode = (m_current_view == COVERFLOW_CHANNEL && m_cfg.getBool("NAND", "disable", true)) + ? (char *)"NAND" : ((m_current_view == COVERFLOW_DML) ? (char *)"DML" : (char *)DeviceName[currentPartition]); for(u8 i = 0; strncmp((const char *)&mode[i], "\0", 1) != 0; i++) mode[i] = toupper(mode[i]); @@ -184,8 +171,8 @@ int CMenu::main(void) wstringEx curLetter; string prevTheme = m_cfg.getString("GENERAL", "theme", "default"); bool use_grab = m_cfg.getBool("GENERAL", "use_grab", false); - show_channel = !m_cfg.getBool("GENERAL", "hidechannel", false); show_homebrew = !m_cfg.getBool("HOMEBREW", "disable", false); + show_channel = !m_cfg.getBool("GENERAL", "hidechannel", false); parental_homebrew = m_cfg.getBool("HOMEBREW", "parental", false); m_reload = false; @@ -197,12 +184,16 @@ int CMenu::main(void) SetupInput(); MusicPlayer::Instance()->Play(); - GameTDB m_gametdb; - m_gametdb.OpenFile(sfmt("%s/wiitdb.xml", m_settingsDir.c_str()).c_str()); - bool gametdbloaded=false; - if (m_gametdb.IsLoaded()) - gametdbloaded=true; - m_gametdb.CloseFile(); + + GameTDB m_gametdb; + m_gametdb.OpenFile(sfmt("%s/wiitdb.xml", m_settingsDir.c_str()).c_str()); + m_GameTDBLoaded=false; + if( m_gametdb.IsLoaded() ) + { + m_GameTDBLoaded=true; + m_gametdb.CloseFile(); + } + m_gameList.SetLanguage(m_loc.getString(m_curLanguage, "gametdb_code", "EN").c_str()); if (m_cfg.getBool("GENERAL", "update_cache", false)) { @@ -472,7 +463,7 @@ int CMenu::main(void) { m_gameList.SetLanguage(m_loc.getString(m_curLanguage, "gametdb_code", "EN").c_str()); - UpdateCache(m_current_view); + UpdateCache(m_current_view); LoadView(); } } @@ -592,7 +583,7 @@ int CMenu::main(void) if (m_cf.select()) { _hideMain(); - _game(BTN_B_HELD, gametdbloaded); + _game(BTN_B_HELD); if(m_exit) break; m_cf.cancel(); _showMain(); diff --git a/wiiflow.pnproj b/wiiflow.pnproj index b0da40c8..1d2aa7cf 100644 --- a/wiiflow.pnproj +++ b/wiiflow.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/wiiflow.pnps b/wiiflow.pnps index 4d93998d..994de9cb 100644 --- a/wiiflow.pnps +++ b/wiiflow.pnps @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file