From 53936427f7d1e3f0ad45c13b2271bd2702868176 Mon Sep 17 00:00:00 2001 From: dborth Date: Mon, 15 Mar 2010 07:43:20 +0000 Subject: [PATCH] changes for multi-language support --- source/ngc/FreeTypeGX.cpp | 14 +- source/ngc/filebrowser.cpp | 1 - source/ngc/filelist.h | 6 + source/ngc/gui/gui_button.cpp | 2 + source/ngc/gui/gui_optionbrowser.cpp | 4 +- source/ngc/gui/gui_savebrowser.cpp | 14 +- source/ngc/images/button_long.png | Bin 0 -> 1808 bytes source/ngc/images/button_long_over.png | Bin 0 -> 1896 bytes source/ngc/images/button_short.png | Bin 1760 -> 1810 bytes source/ngc/images/button_short_over.png | Bin 1875 -> 1907 bytes source/ngc/menu.cpp | 213 ++++++++++++------------ source/ngc/networkop.cpp | 4 +- 12 files changed, 136 insertions(+), 122 deletions(-) create mode 100644 source/ngc/images/button_long.png create mode 100644 source/ngc/images/button_long_over.png diff --git a/source/ngc/FreeTypeGX.cpp b/source/ngc/FreeTypeGX.cpp index ca9740e..dffbf36 100644 --- a/source/ngc/FreeTypeGX.cpp +++ b/source/ngc/FreeTypeGX.cpp @@ -65,12 +65,18 @@ void ClearFontData() wchar_t* charToWideChar(const char* strChar) { - wchar_t *strWChar; - strWChar = new wchar_t[strlen(strChar) + 1]; + wchar_t *strWChar = new(std::nothrow) wchar_t[strlen(strChar) + 1]; + if(!strWChar) + return NULL; - char *tempSrc = (char *)strChar; + int bt = mbstowcs(strWChar, strChar, strlen(strChar)); + if (bt > 0) + { + strWChar[bt] = (wchar_t)'\0'; + return strWChar; + } wchar_t *tempDest = strWChar; - while((*tempDest++ = *tempSrc++)); + while ((*tempDest++ = *strChar++)); return strWChar; } diff --git a/source/ngc/filebrowser.cpp b/source/ngc/filebrowser.cpp index 1636de8..2367c9b 100644 --- a/source/ngc/filebrowser.cpp +++ b/source/ngc/filebrowser.cpp @@ -548,7 +548,6 @@ int BrowserChangeFolder() if(browser.dir[0] != 0) ParseDirectory(); - if(browser.numEntries == 0) { browser.dir[0] = 0; diff --git a/source/ngc/filelist.h b/source/ngc/filelist.h index 4fc0362..a1e733d 100644 --- a/source/ngc/filelist.h +++ b/source/ngc/filelist.h @@ -120,6 +120,12 @@ extern const u32 button_png_size; extern const u8 button_over_png[]; extern const u32 button_over_png_size; +extern const u8 button_long_png[]; +extern const u32 button_long_png_size; + +extern const u8 button_long_over_png[]; +extern const u32 button_long_over_png_size; + extern const u8 button_short_png[]; extern const u32 button_short_png_size; diff --git a/source/ngc/gui/gui_button.cpp b/source/ngc/gui/gui_button.cpp index 3b4dd5e..3ae6023 100644 --- a/source/ngc/gui/gui_button.cpp +++ b/source/ngc/gui/gui_button.cpp @@ -199,6 +199,8 @@ void GuiButton::ResetText() if(labelOver[i]) labelOver[i]->ResetText(); } + if(tooltip) + tooltip->ResetText(); } void GuiButton::Update(GuiTrigger * t) diff --git a/source/ngc/gui/gui_optionbrowser.cpp b/source/ngc/gui/gui_optionbrowser.cpp index 616a529..7dbeb2e 100644 --- a/source/ngc/gui/gui_optionbrowser.cpp +++ b/source/ngc/gui/gui_optionbrowser.cpp @@ -77,11 +77,11 @@ GuiOptionBrowser::GuiOptionBrowser(int w, int h, OptionList * l) for(int i=0; iSetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); optionTxt[i]->SetPosition(8,0); - optionVal[i] = new GuiText(NULL, 22, (GXColor){0, 0, 0, 0xff}); + optionVal[i] = new GuiText(NULL, 20, (GXColor){0, 0, 0, 0xff}); optionVal[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); optionVal[i]->SetPosition(250,0); diff --git a/source/ngc/gui/gui_savebrowser.cpp b/source/ngc/gui/gui_savebrowser.cpp index af7a540..b877684 100644 --- a/source/ngc/gui/gui_savebrowser.cpp +++ b/source/ngc/gui/gui_savebrowser.cpp @@ -81,14 +81,14 @@ GuiSaveBrowser::GuiSaveBrowser(int w, int h, SaveList * s, int a) for(int i=0; iSetAlignment(ALIGN_LEFT, ALIGN_TOP); saveDate[i]->SetPosition(80,5); - saveTime[i] = new GuiText(NULL, 22, (GXColor){0, 0, 0, 0xff}); + saveTime[i] = new GuiText(NULL, 18, (GXColor){0, 0, 0, 0xff}); saveTime[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP); saveTime[i]->SetPosition(80,27); - saveType[i] = new GuiText(NULL, 22, (GXColor){0, 0, 0, 0xff}); + saveType[i] = new GuiText(NULL, 18, (GXColor){0, 0, 0, 0xff}); saveType[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP); saveType[i]->SetPosition(80,50); @@ -321,10 +321,10 @@ void GuiSaveBrowser::Update(GuiTrigger * t) { saveDate[0]->SetText(NULL); saveDate[1]->SetText(NULL); - saveTime[0]->SetText("New RAM"); - saveTime[1]->SetText("New State"); - saveType[0]->SetText(NULL); - saveType[1]->SetText(NULL); + saveTime[0]->SetText("New"); + saveTime[1]->SetText("New"); + saveType[0]->SetText("RAM"); + saveType[1]->SetText("State"); savePreviewImg[0]->SetImage(gameSaveBlank); savePreviewImg[1]->SetImage(gameSaveBlank); savePreviewImg[0]->SetScale(1); diff --git a/source/ngc/images/button_long.png b/source/ngc/images/button_long.png new file mode 100644 index 0000000000000000000000000000000000000000..11b4afd7d1384ae20b65a999d50ab90aa78dd430 GIT binary patch literal 1808 zcmV+r2k-caP)}NW)&@b47HJ$Y)>ot}y?ipxnJN0<^t`Ma8@SkB5S@oKfu)%QChz*ShJe?P}knQ z$=A=1`i>ZZTLfA?l_nEaT)u3U0|v9cv6yTwtN3XcY$9uiqw&>{@NgP4WeNpPn?^kc z55`>sZEpZ}?;f4b&Zf)x`E+9YcB-$l=?X(wCs-e`Qd@Ei_91JXy$g|vi4+(ULn9|m z!W{zbhFfK2W|JLBPpAK?s_cCvhc%nWVbxD+FlhBZyPVH@n@v{fuED-!E!KmRSFNJxl`D~b&|x^fbt~;nPNw@eZ|awdq>*z}$(k~l zOZf->Xd>G!-m{n7zTC9@f{Ihv-I2gYmFz@V@&TEGK9 zms4=5&^n*+QvY2{}2`Z`3Gc831NObhKW{qXP0Q!Sz_e+oDLAye@Qd-o!n065@4N($w!wVJMwhh_tfse848jaSWO zE@$)SBZB}mK~!=w^|5XheMot3tQySfc~``uMdk_y0C0?_mlwSnAFqcO8e=hIEuy^7 z6{CJ4aPnk&{P;042tYGLE?!IpnVIzWg$qW=*W#xfqk_rHl8v(;1H;1TN{n9 zcpMfW6|5gA50<<2?Mp8V8ib4i;3EBlgY{65R4_j^(vw|?>IH!7^z!%DL&K$lS-pOY z>IHy%NQ!BW4Fv!05=ftX!v*{EdaC(k7{c4 zP>ocudul{>)rjsX;EdX5Pda=!p+NX@Qh_X>f+DrbrV+XPZ zfD_!la)k;uZ`Q+drdZ?aDl&op18bpiwQ$Q83Y|3z*#n>%PVU^PKLab{_OM8;U_u%x zr}+I*R76GFwjp}}G{Ilz&r{y|^?LX-<1ebg%BbO7+D49~rrLWt4FIrkEInNhnT+;O z@Cvow7g6RJ6UcHT?7w&KnopA$iQT0Du%RF$!(4vzn-)+Xb+{Nm?u2|07N%SN@!0~k{*@?8#a!! zcSf_UxtBetWI0DSBe-YTGOB;{h{n#FhYW)b%Z)Q<%;u8G4UGj{y~_2V-Xf~4qExYW zjPaOInwMuj7}{^#IAj`hI8J9}(T|CVRB`d5P1ncfO0)MJM+OsQec~0?G&NXWP+Ec(xu2gXxCNi zmy8U$cIuS9%V}(`_nZ2@GX@i6=ignV9n2@Z7!*XKFdHTKN;6by=93T&pXH&zJJhi033}n6HI#OmB9novpFnXqQXWTu|s*!2;y4u?2 zJ|#sln0000&>^%|=pmt%LX~)CU>Xt>I;v`Ku7;Dz zo8e!g?0+9fw{mm#-b*PEkc)sjtg-AU8>n$ z$mIsvb`d!{eJJ$wgf}(W$ZV;i!lG(CA~5BNggq1v_EIG1PIXG1+CyWLJ;zfPx58kn zg!ZKB0v6d8P-(?7Dy?iLQ(*<38kly(qCxWYouMJ$B^u~CLGk#g{*-2+lR}$?wqas!ag@7S$>z9|N*s-NLSV)a9==9iVY0sNpJ_A}PIk&Zq4h$+$<88jm+%#R z(B^2O^6J(b#!`(6z)ZkwnM2On)#Pxl5GMOc=&=42p3wVIXthv(t{LoOp-uYWoSH|e z>b6Jl6u_*(+w&`3ySk5}5x@S>DWUsB77J!;uyNhO0<(i$_3K2|T7nh_vySMILh_Vx3QMbO*sKB;Qy}wT+vo^TJN@d(O#+ zxI6c*&|8^gFfMcAt1EA0E<4pUY^1_s7g`wr!PP%Lp}~QRa)`6n!y=0vN@p;hiXXGi zysR-#++<#M70J0Szs=5 zk;z=Hyj!N?6hp5Dqxj(>scOSmP(lUfQjEU<$kt@Vb7g}uO`O5%Kfh2Pa*Q*WAcyE|ory{H`-^8HC= zmH5aF0GSdR>eh$8;~$#A4pQRtzYc9278qzFYuRG78~|yEMtl_Tp4W%J;2-iQ13s0r znAzeaXWipyJpj@$;66n@_h~uQF1m+{6l+EmKS2#_$Id`BPG+MBma+{r?^# z$J`dQBmg=FMGucB1a)kl=*zzR>EHJ$@gaK!zJam8MkVEUp+x~ui3EGd+w+S)d`y_@ zOF59N@3&RWVoSAvukSSF<(sG&<1qk~lBgu+;+o!P^}%EYxKg8t zNe?i)&E-)x<4aO^xKU)Uj!X=ubrshM?I-Dbi37bSC>9+iTlq4yG?;Y^2QHJ}eTHJO zahq9g73TUn*){35kma3L_UMDW8DD8dv$7!>0J8zV=XVP9pHFsZhcMSmsjf>m|IPz8 z-dOB&IgvRG?GR;v>ktq4y9Onc(-n36<7LtV*g3`tEouM2HUcdtxWkdF%S!0RhY zY|6PhRVG9_MjiQzeb8N?Y%>{7WjBRW+R9T3{54v8ks%`B5=v+Y%-!E^W)JUcMO i;RUY9t+?@j0t^6Va#cIYY8m(d00000000q2nGNE01Y@Zc#$C}f3!(N zK~#9!?45l~RdpE0A1+3kOecyj`GyLbyqHL6xDwKpfkuX!EgkuXQxu(>Z7z3RD%x^u zxgZLgPNrd_6tR3kWjdS;6<>y$7Z4S@Y9T0wVHha(Jm;Rne*Esea4+{BSC{9reNmrt z&gJ@?XU}tfFX#93TIA&gI?x{#e~1bO{dgT1XE@=)wPw^+RSvVcxw+kQy13~-=ZBhw zdK>i`%AfD|e~x)>_>2bBaaFsW4M5lF6_t$I9q}#yM2ZFu&tAN^y>%yfq^h!fAna+MIJz{ z*$g$;t|_v^Ftq|w5H3KK=n;T#qITLVvBRUHVC;+;5I%Dz^cgmc@0thFP*(@%b8_HX zVIiE(%7W%6Pvlb~P^VF=P@5e2OfLsp!Jnvg--?*zWC)!$4ML_)~Y45`kETZOiYB*{CxS)0W}j^Jv7?uhM~Tm4Wc0+G7=Wy11JX{e`60{e}7n(mj`3w zT+vMaYP{uY8IUHEwzN)$Mn=L*Q>L)z7`NcQw-RDKfH7HY1y_U6_qV3340;Cyu-6#3vOXk4o>Le?8E~K&d_4yY;NW9)VNiIu zYzm`BNT6uxGhzfcJ{Vo-8x$m)Mo|WAHGP@0AEOuknA{`+DFA&%%k#dz>?uYUUg*_J zHu-gt1JI{?e|Ijyj4n`YN%$JrEzGmxabu%wYNQNUCtB#uC(eM39yB#r&B|{u$N~81 z!2|XbqYL$S@5-hc3cyOya_`0s_7tNFHe#!iO0Y?^+$k&L63plV#g>FgE5TRA5^O$u zmc7Neom(YVD|VdIreo2IA}u2#^fJldhzRx=<2Eksf7=K5Z{8G5=FQE`W`hubEtKTs zu*Vp;QhD;EZ2EEk&#%WGuWI#nhfoLkn^1DjRfJ7=-ULIEXt+*J9ckE#AF)s1P<;#%2aieVh zLi>vte}Ls+S@*YvW1BYF>b+(dhdG{>CY#J!`4vlWOZx+r1nQEzf8W2atacQ_Z^tnm zplHh$C5cHa!SY*TF92)RtoVjz`2FHV<)xD06DP7q8Hc%X>J;p-ZbKAe@U0LHwr0a@ z1Zj=mLn$e6a@#icD&r7UCKK#gu|hV}fQMB?f65sU)P~4W)JLeUnz8ioVd&nwHw+#( zjy=rS<@SXOuzUG(u7YG*%WBDZhY*>SzTdh9UCsF>Sxm2#pUP%7-%K=RQXR ze~`FDi4UaBXsSv};Y?PRvhGK~gbD2ZPM-Cs1pngOd!Lm1)-4}_4 z<+vEn<_FYgAkD6KgpR(JN!>IbqXwbqA@dLj6B(FJ!8z0#RFGP7O&$3VS2wJ#R#Ve% zx>}NHL&G_!QK&G!M;?V)4KmtvhW3HG?T!!a;>IsX!MGb*&!`Co%O=NqzXV9$)HT0R{k7An{BI=!bCt0000d3&(CRvlM{3U!_d6Ye|(_(coiI*pF8ngBib#KwV9objjevBUl;x7+|lNv zy@B=$ng=kQWpNk$Mm5@5lO1ZWfNbH^$qW;U7LOK*=FIoF*OQO-4cfP84IRlax=sis z5A6(E6pN+L5R8_Fb`x!RM}DBaC5cMS=V&o4eaLO-Q1I~bg5eV<@-6BCe=3besJMMw zF*}Sw``RR$rD%oSA()wH`|XWS#s&w&)H!p&f8IP8JZ22vwO&B=qepNlGZSv-=EC`X z`=GJGstN_5ok#l+ZCh84VLm|HYU@H+TpajDM#7|7v-l46V(t|eE224_nhO6`RoVJT z7TO{l$5eM#FjRuxm7Ts3e-VmUd{`)biU$S*{FIUcXSQ#*bvYO9Efh^v`q z;&@ULWN)z;zEaa>f0R1a7BkFrQ7lTjS-zYjs4>EEsy)oIG`WJ%hZ6;3(QgS|wMxk_ zjJD7@JHyL3)s|SPj%CzmN$#eplo{XIv!SV}i6f{%!d9<_ytFj<>&6Y$?=0HIMgaQJX|ZuDr57y~2y{biRQWf(8fGZFhpIo)hf+uoh+D|$B#Kuj6&7@`?9No1Y;0A5ANLI zNHO-bV4#wu7d`iiint^(W-UnQ)sl2eEJ?--7dToBloeX-puMO*OQMCo=8i8d27VzR zfFq`1t{y!K4@*l$mvLufqfsXa#!O*mCPz%;81nOFf7g%nhbowpXq95^`gQ+)j+#cf zUs3{jyLZcOI#b5Hyn!a%-=nQmujcRB1A#Fy96b$k;lKg82UCpYs6fmxL<$I}68&CK z00rsk96gQk=e28)lbkHOKUM!C3Z@vE&p|VDdfPTz-9E;FIh&d)yNqf%BAf#)_a)Ih zDi%yfe~|t2@S(E1e-iH=&;)tAb}30hVilI7LVJR#G-aLFRL37zt|*Iw$A*M(L>-tr z=gvX8_4bln6idA5u=TV$8Kg7MP9`NOgJ8xnDc9@aaD2S%riQMSf^3~}N6)lrj{&uN z2dd7)>()VIeLaLMTgDM~AnsnitcZmMyAmrff4dlDr(BZ6(nMM2Z4i!BEy~GJ4%YLU zHjN|g09?w*fFI)GpyK9Dt15$HNwM`Edx9b8`BDkmJke>$%TxXVdUQZL{+Yf>HV!k6 zB_u%YlPB_}ujFxyNLvm?T!=;u8H;m5NGvnfuZPgJYdQLTEUWy2v!T+97j0cmL9x8o zf718cdh9Cgj64W7&ggyK&kv?VM}z;uh02~LruR`-Qv-zu55jN9jzQ6>Q?@=r4ciSU zmR8T|ZO^*~Xv13uG#@%-6WWvQ6A=O4VPP<0>Quf{J;>i>WuVW_R;J7P6DJhW*nt{z zi%e5!=t{w;(DSCP;ta|jL&lGXr~3Ejf4kQM)8vM_y4F5MS%nVkrSo%@lb*XvFa#YB zk^s$T)$>NCzQ=cHpMbR5vOC{qLeuW|(MF=Jf#&5A4SXMZH8jfo7|q*Mg7h8v5vMME zBO8^dnWkCQ1T;UsM?H$sBnmpDncgFCx3w?)pKoL%sFi#OET4GOEBv}^5aa0YB-Xj! kiSJ&8=8k=r^Pd0%0R08?&|Oj^j{pDw07*qoM6N<$f)VjSmH+?% diff --git a/source/ngc/images/button_short_over.png b/source/ngc/images/button_short_over.png index aa4a938c3772985167698cd65ae38739619a5bb2..9fc69f0f9cb94a435b9d29ce93eeeff07c095821 100644 GIT binary patch delta 1891 zcmV-p2b}oR4)YEniBL{Q4GJ0x0000DNk~Le0001>0000q2nGNE01Y@Zc#$C|e+Lyw zL_t(|+U%WwY*SSf$4|GeUAOK>yB`z^Y{&?*F&$a_1HsIpBp9QF1S9cRFj0vKMiUbw z(P&IGkQj+Z4B;<`1|yM3G@77jz=#NhDH%GP2qVJ@``Pu!)*oy8Jm>uwx3BH?y0#L= z`6OqMb6-2S@0)Y(x%a;NOp+u4e{uHcX2>Bfv<9?BxG~%VOeXv^O?xle->PLyOZ&dG zZRQ;P2b^dd(bl1@Myug_dQ zXf6h)Yn5!Z3)X=LML5*=e*?s0Vev8x+Iwm-`nX!SWFEqV1Frh@vKWW@zDGN%zk~|X@6gtxjimb?(=_vdAEIs5JLl9r1hoqvtyuZeD2f4XZz5k}Ib;MIEZQL#~3(~4DYoO_iqOhJJKs@?ZN--Z36n>MJt zA*Nz|1f=D)m0F|S(FhBdJ-Q@jDjQj2)ITRAK{#HH%C4uD{9>L zgKy|8goFK)aSfDtx96FHlN0VW>tJn zwN##@%t3oeIr=f#8N5Ea$NwlT+-KOZ5U=BNicR6E1c%@oEQ?Q>-O!uvn|)y@e_+9Qrky@rN6P zRS$Df85CJ7e|Y@IMf9# zi5HFFD3ArnS`~Z* zgcXr-e-Bt}wcKM&&KUPygy@7{boFBJ>lFp~yw)=2{R=8<_#q@FcZA0J^scYyhbF+o zpd6pzf7Hf-{?RV5SKiJ&$7D@3;sw9woZkHj{gBTGRF6$KAhrfZ{!q?)VPnhE==oqN zo-hgBjhZ_xMnK{NP|kOg51R}Juc2x=3NqPFy^Mf&@QmL5uJ#vEfZd>+`}?To@D2Y8 zr4_e<$zCV1xU~X!}KVee?`gNJ{Y-r9Gr98xF?y6319}Lf>y`2 zsZK_q`M`HTIY?%*A~qM5Ls`|G+@p+PXwJ{m|FhnG9L4vk=tz}Ycc@XYMRRzE&Okw- z1xk55$QT;;c~Xgw_8dH=ccu~`g~vzGXyjO-IX(R+p|H!L4knPS~{3r4>l ze8G-T^ZCyzuD2Nr*+qp}cAZ_cW8lxc?&f20I`YOF9g72a4}Ns?SVS-qPgs z)1VyJHi>_v6QUD7sHkq04swsfDHZhnOZjC8Qz$6_Q5`Y%Ix ztPkvtX88my=GGBzSjZE-S=%iByKL_FY;dp#Po+k_jdcbC{ z16$c5jEE(CM{WTmDJBP@(Abq!YrLQatyjRnyF!f4Fw@KFXyEr5D2G@kR6Jxf;Ycs2 zv6jvUtIZ`JXwJ+YXg4#7Z6Y*?fBqwjFby=(Oz#IdZsdD2S>hn6(`!&^*UWaYe?p!t zpF=~kX`627m0czizeet+uWTb;Badm2B6oqZm=Q4g-7{HZ+pVVM*Faf2wx_!=#XBRI z*$LGOw1Cl-=?7=}woKZ(^)lLgv=`KhImY+lmZAfcQ%;wtDYt7TUy|)E1Fsr(cd03v zPT8W(3`^0P`5w(GdR39pOJ@$LIYY9n$>lZ|65~PDG-!^-b^|(V8S5n@&QH@$6MT_; d{Nn!v7y#2=cgKpUf>Qth002ovPDHLkV1ir>hCu)T delta 1859 zcmV-J2fX<64$}@HiBL{Q4GJ0x0000DNk~Le0001t0000q2nGNE09aYjCXpd0e+KnQ zL_t(|+U#9>Y*S?vKkfQhw{Bg#2ZI6wfdCuR5#k>RW)3C67$qhciLYp)5)zCiCPt#s zm}np|5{($bUl0vOA_>vN1bhUIh(MT7EH7H%YQ~bHkp3_s08ug^Me{!%pYM{7e z4&S0_KrGr1(eMq3g?n=yvQUi(B$^j#3VSOAvmSXMSI8+TUj(kImEfvg1-9ZUzH2i8 ziFg?NeXTI$zW{?hCqa^u`a@PBPa(G>cTJ^W-c;jY1}eQRQ0}=K$~+B%RpPrf15jis z22br8nKkn^fDc8}*ZmVDe-lyhFdOnCHCcIDohVOAFcgAb)f>w_jZitK<)%<17RgM8 z-7yPl7i^Tp)7SkY@|gY*N?5)}ZbS~`I*)0LI?SiYZF=LZx<{dA{v&)B?qK+OeuwK< z4nsT^&<~wPKG4*%KRjN+WP~BB-2>jmo6)PR;45ALh>wKeYR5hZfBDYqhrT0EgQ7{~ z8ehOrcQwj?jwn5kVy%6Yc6Ne~#yoY={9}h!i{WdWh zvfABHSHA^{OTB!R3lvxW`V2yY|D+{Z$cNF({4kba4(RJF-X+gMMa{i@RSOu&Lq2@NQke^{=Nv{o+`n%q`YW4fN1!!rs9X0r{dybnV6g#)6Q7LeZ&LzCXa zP`Q7#Ht2NM!~Eqh@zpdCdaoWq9u-X?WF2~$0lkM=CyIsOnROp~7K5SM`w#^B&O$WY zlkyv&)ZyNhJ&|y1TD`?xy9P=tmdP0r(?A3hxT-Vet6MPwf7wzV2LIwwQ>hfn+_d+J zy^9gynY{)Edrygrm({914r?KaHb2?4(PHO3c`;GqaAZ)JC za~FfdS+P_vn04Z$cYWHy?gp;r8XWc#FWBsr^4=O1wK#RDx8RExgsQH^S_W3Ti{~#4 zu$Rsj1w&}Gf2hTo6s*M_p1Uw)kcZJ>DG6p_nqX`dEEt9oZR~EnX|Y8u%%os8TY19E zkWo}roRM*72*zZ#fy7%Z8L}3v8Oc+Y{V)=H7>1$*DXurgNHBiUl1M~&4#SXD$PN40Y>G-_naFm?NM(9_i8MF~Pxha8@kiD`!B&V}1zw z&gsoxf6$A(MN@q&@}M{x8u**zxIszJCrQb)qFo1SqB{rD(_&Yj&z$rb#pS`_6#5$RB0db|l`Hv57XXHX zf0rQ8+X{(9Mzg7%D3*iS-ZNVIL&dxoKxzMxLU5oB;v)fYRjra6(lGASZ0JwCm*=t# z?Lo0@&-K2s@@1OvP-B_TMNbnBUV-RPH#psma)$@Tor7@jGA1$|*;b+nREv9UwD;#z zU?JB;U1q)p;rXRxazw7vghQR+aMppNe{3OooD#kxGZ2!LkU!*+p{v=}h(L7;Z$KWs zdh@Nw(U%+0#N{hcnhvGSu!&Ugp@z=((z#%F)XEJM8Pf;aEl1)QiS**n|76kR02St_ zKkxB;&O4qGE=iNVR)$u!cZeBOD!q#I$j+cTe-Kc8*3q@dlPe-vv& z`JQ_sHUB+on0gD8wI^q;1GDsiWy}oF+>{Em?c;spM8D01wnDs)oQr%#&8QN5A7(UK zLFpp3L=8dh6FJFbR~7xLTidOMDCz=1iSetAlignment(ALIGN_CENTRE, ALIGN_TOP); txt[i]->SetPosition(0,y); i++; y+=40; - txt[i]->SetPresets(22, (GXColor){0, 0, 0, 255}, 0, + txt[i]->SetPresets(20, (GXColor){0, 0, 0, 255}, 0, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_TOP, ALIGN_LEFT, ALIGN_TOP); txt[i] = new GuiText("Coding & menu design"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("Tantric"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("Menu artwork"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("the3seashells"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("Menu sound"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("Peter de Man"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("Logo"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("mvit"); - txt[i]->SetPosition(320,y); i++; y+=48; + txt[i]->SetPosition(335,y); i++; y+=48; txt[i] = new GuiText("FCE Ultra GX GameCube"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("SoftDev, askot,"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("dsbomb, others"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("FCE Ultra"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("Xodnizel"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("Original FCE"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("BERO"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("libogc / devkitPPC"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("shagkur & wintermute"); - txt[i]->SetPosition(320,y); i++; y+=24; + txt[i]->SetPosition(335,y); i++; y+=24; txt[i] = new GuiText("FreeTypeGX"); - txt[i]->SetPosition(50,y); i++; + txt[i]->SetPosition(40,y); i++; txt[i] = new GuiText("Armin Tamzarian"); - txt[i]->SetPosition(320,y); i++; y+=48; + txt[i]->SetPosition(335,y); i++; y+=48; txt[i]->SetPresets(18, (GXColor){0, 0, 0, 255}, 0, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_TOP, ALIGN_CENTRE, ALIGN_TOP); @@ -913,7 +913,7 @@ static int MenuGameSelection() int i; bool res; - GuiText titleTxt("Choose Game", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Choose Game", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -921,8 +921,8 @@ static int MenuGameSelection() GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); GuiImageData iconHome(icon_home_png); GuiImageData iconSettings(icon_settings_png); - GuiImageData btnOutline(button_png); - GuiImageData btnOutlineOver(button_over_png); + GuiImageData btnOutline(button_long_png); + GuiImageData btnOutlineOver(button_long_over_png); GuiTrigger trigA; if(GCSettings.WiimoteOrientation) trigA.SetSimpleTrigger(-1, WPAD_BUTTON_2 | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); @@ -931,15 +931,15 @@ static int MenuGameSelection() GuiTrigger trigHome; trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); - GuiText settingsBtnTxt("Settings", 24, (GXColor){0, 0, 0, 255}); + GuiText settingsBtnTxt("Settings", 22, (GXColor){0, 0, 0, 255}); GuiImage settingsBtnIcon(&iconSettings); settingsBtnIcon.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); - settingsBtnIcon.SetPosition(20,0); + settingsBtnIcon.SetPosition(14,0); GuiImage settingsBtnImg(&btnOutline); GuiImage settingsBtnImgOver(&btnOutlineOver); GuiButton settingsBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); settingsBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); - settingsBtn.SetPosition(100, -35); + settingsBtn.SetPosition(90, -35); settingsBtn.SetLabel(&settingsBtnTxt); settingsBtn.SetIcon(&settingsBtnIcon); settingsBtn.SetImage(&settingsBtnImg); @@ -949,15 +949,15 @@ static int MenuGameSelection() settingsBtn.SetTrigger(&trigA); settingsBtn.SetEffectGrow(); - GuiText exitBtnTxt("Exit", 24, (GXColor){0, 0, 0, 255}); + GuiText exitBtnTxt("Exit", 22, (GXColor){0, 0, 0, 255}); GuiImage exitBtnIcon(&iconHome); exitBtnIcon.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); - exitBtnIcon.SetPosition(20,0); + exitBtnIcon.SetPosition(14,0); GuiImage exitBtnImg(&btnOutline); GuiImage exitBtnImgOver(&btnOutlineOver); GuiButton exitBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); exitBtn.SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); - exitBtn.SetPosition(-100, -35); + exitBtn.SetPosition(-90, -35); exitBtn.SetLabel(&exitBtnTxt); exitBtn.SetIcon(&exitBtnIcon); exitBtn.SetImage(&exitBtnImg); @@ -1141,7 +1141,7 @@ static void ControllerWindow() arrowRightBtn.SetSelectable(false); arrowRightBtn.SetUpdateCallback(ControllerWindowRightClick); - settingText = new GuiText(ctrlName[GCSettings.Controller], 24, (GXColor){0, 0, 0, 255}); + settingText = new GuiText(ctrlName[GCSettings.Controller], 22, (GXColor){0, 0, 0, 255}); int currentController = GCSettings.Controller; @@ -1165,7 +1165,7 @@ static int MenuGame() { int menu = MENU_NONE; - GuiText titleTxt((char *)romFilename, 24, (GXColor){255, 255, 255, 255}); + GuiText titleTxt((char *)romFilename, 22, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -1195,7 +1195,7 @@ static int MenuGame() GuiTrigger trigHome; trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); - GuiText saveBtnTxt("Save", 24, (GXColor){0, 0, 0, 255}); + GuiText saveBtnTxt("Save", 22, (GXColor){0, 0, 0, 255}); GuiImage saveBtnImg(&btnLargeOutline); GuiImage saveBtnImgOver(&btnLargeOutlineOver); GuiImage saveBtnIcon(&iconSave); @@ -1211,7 +1211,7 @@ static int MenuGame() saveBtn.SetTrigger(&trigA); saveBtn.SetEffectGrow(); - GuiText loadBtnTxt("Load", 24, (GXColor){0, 0, 0, 255}); + GuiText loadBtnTxt("Load", 22, (GXColor){0, 0, 0, 255}); GuiImage loadBtnImg(&btnLargeOutline); GuiImage loadBtnImgOver(&btnLargeOutlineOver); GuiImage loadBtnIcon(&iconLoad); @@ -1227,7 +1227,7 @@ static int MenuGame() loadBtn.SetTrigger(&trigA); loadBtn.SetEffectGrow(); - GuiText resetBtnTxt("Reset", 24, (GXColor){0, 0, 0, 255}); + GuiText resetBtnTxt("Reset", 22, (GXColor){0, 0, 0, 255}); GuiImage resetBtnImg(&btnLargeOutline); GuiImage resetBtnImgOver(&btnLargeOutlineOver); GuiImage resetBtnIcon(&iconReset); @@ -1243,7 +1243,7 @@ static int MenuGame() resetBtn.SetTrigger(&trigA); resetBtn.SetEffectGrow(); - GuiText gameSettingsBtnTxt("Game Settings", 24, (GXColor){0, 0, 0, 255}); + GuiText gameSettingsBtnTxt("Game Settings", 22, (GXColor){0, 0, 0, 255}); gameSettingsBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); GuiImage gameSettingsBtnImg(&btnLargeOutline); GuiImage gameSettingsBtnImgOver(&btnLargeOutlineOver); @@ -1260,7 +1260,7 @@ static int MenuGame() gameSettingsBtn.SetTrigger(&trigA); gameSettingsBtn.SetEffectGrow(); - GuiText mainmenuBtnTxt("Main Menu", 24, (GXColor){0, 0, 0, 255}); + GuiText mainmenuBtnTxt("Main Menu", 22, (GXColor){0, 0, 0, 255}); GuiImage mainmenuBtnImg(&btnOutline); GuiImage mainmenuBtnImgOver(&btnOutlineOver); GuiButton mainmenuBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -1274,7 +1274,7 @@ static int MenuGame() mainmenuBtn.SetTrigger(&trigA); mainmenuBtn.SetEffectGrow(); - GuiText closeBtnTxt("Close", 22, (GXColor){0, 0, 0, 255}); + GuiText closeBtnTxt("Close", 20, (GXColor){0, 0, 0, 255}); GuiImage closeBtnImg(&btnCloseOutline); GuiImage closeBtnImgOver(&btnCloseOutlineOver); GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight()); @@ -1308,7 +1308,7 @@ static int MenuGame() else sprintf(txt, "P%d", i+1); - batteryTxt[i] = new GuiText(txt, 22, (GXColor){255, 255, 255, 255}); + batteryTxt[i] = new GuiText(txt, 20, (GXColor){255, 255, 255, 255}); batteryTxt[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); batteryImg[i] = new GuiImage(&battery); batteryImg[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); @@ -1559,7 +1559,7 @@ static int MenuGameSaves(int action) if(!ChangeInterface(method, NOTSILENT)) return MENU_GAME; - GuiText titleTxt(NULL, 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt(NULL, 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -1584,7 +1584,7 @@ static int MenuGameSaves(int action) GuiTrigger trigHome; trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -1598,7 +1598,7 @@ static int MenuGameSaves(int action) backBtn.SetTrigger(&trigA); backBtn.SetEffectGrow(); - GuiText closeBtnTxt("Close", 22, (GXColor){0, 0, 0, 255}); + GuiText closeBtnTxt("Close", 20, (GXColor){0, 0, 0, 255}); GuiImage closeBtnImg(&btnCloseOutline); GuiImage closeBtnImgOver(&btnCloseOutlineOver); GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight()); @@ -1806,7 +1806,7 @@ static int MenuGameSettings() { int menu = MENU_NONE; - GuiText titleTxt("Game Settings", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Game Settings", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -1832,7 +1832,7 @@ static int MenuGameSettings() GuiTrigger trigHome; trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); - GuiText mappingBtnTxt("Button Mappings", 24, (GXColor){0, 0, 0, 255}); + GuiText mappingBtnTxt("Button Mappings", 22, (GXColor){0, 0, 0, 255}); mappingBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); GuiImage mappingBtnImg(&btnLargeOutline); GuiImage mappingBtnImgOver(&btnLargeOutlineOver); @@ -1849,7 +1849,7 @@ static int MenuGameSettings() mappingBtn.SetTrigger(&trigA); mappingBtn.SetEffectGrow(); - GuiText videoBtnTxt("Video", 24, (GXColor){0, 0, 0, 255}); + GuiText videoBtnTxt("Video", 22, (GXColor){0, 0, 0, 255}); videoBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); GuiImage videoBtnImg(&btnLargeOutline); GuiImage videoBtnImgOver(&btnLargeOutlineOver); @@ -1866,7 +1866,7 @@ static int MenuGameSettings() videoBtn.SetTrigger(&trigA); videoBtn.SetEffectGrow(); - GuiText controllerBtnTxt("Controller", 24, (GXColor){0, 0, 0, 255}); + GuiText controllerBtnTxt("Controller", 22, (GXColor){0, 0, 0, 255}); GuiImage controllerBtnImg(&btnLargeOutline); GuiImage controllerBtnImgOver(&btnLargeOutlineOver); GuiImage controllerBtnIcon(&iconController); @@ -1882,7 +1882,7 @@ static int MenuGameSettings() controllerBtn.SetTrigger(&trigA); controllerBtn.SetEffectGrow(); - GuiText cheatsBtnTxt("Cheats", 24, (GXColor){0, 0, 0, 255}); + GuiText cheatsBtnTxt("Cheats", 22, (GXColor){0, 0, 0, 255}); GuiImage cheatsBtnImg(&btnLargeOutline); GuiImage cheatsBtnImgOver(&btnLargeOutlineOver); GuiImage cheatsBtnIcon(&iconCheats); @@ -1898,7 +1898,7 @@ static int MenuGameSettings() cheatsBtn.SetTrigger(&trigA); cheatsBtn.SetEffectGrow(); - GuiText closeBtnTxt("Close", 22, (GXColor){0, 0, 0, 255}); + GuiText closeBtnTxt("Close", 20, (GXColor){0, 0, 0, 255}); GuiImage closeBtnImg(&btnCloseOutline); GuiImage closeBtnImgOver(&btnCloseOutlineOver); GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight()); @@ -1913,7 +1913,7 @@ static int MenuGameSettings() closeBtn.SetTrigger(&trigHome); closeBtn.SetEffectGrow(); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -2018,7 +2018,7 @@ static int MenuGameCheats() options.length = i; - GuiText titleTxt("Game Settings - Cheats", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Game Settings - Cheats", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -2038,7 +2038,7 @@ static int MenuGameCheats() GuiTrigger trigHome; trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -2097,7 +2097,7 @@ static int MenuSettingsMappings() { int menu = MENU_NONE; - GuiText titleTxt("Game Settings - Button Mappings", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Game Settings - Button Mappings", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -2116,7 +2116,7 @@ static int MenuSettingsMappings() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText nesBtnTxt("NES Controller", 24, (GXColor){0, 0, 0, 255}); + GuiText nesBtnTxt("NES Controller", 22, (GXColor){0, 0, 0, 255}); nesBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); GuiImage nesBtnImg(&btnLargeOutline); GuiImage nesBtnImgOver(&btnLargeOutlineOver); @@ -2133,7 +2133,7 @@ static int MenuSettingsMappings() nesBtn.SetTrigger(&trigA); nesBtn.SetEffectGrow(); - GuiText zapperBtnTxt("Zapper", 24, (GXColor){0, 0, 0, 255}); + GuiText zapperBtnTxt("Zapper", 22, (GXColor){0, 0, 0, 255}); zapperBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); GuiImage zapperBtnImg(&btnLargeOutline); GuiImage zapperBtnImgOver(&btnLargeOutlineOver); @@ -2150,7 +2150,7 @@ static int MenuSettingsMappings() zapperBtn.SetTrigger(&trigA); zapperBtn.SetEffectGrow(); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -2207,12 +2207,12 @@ static int MenuSettingsMappingsController() char menuSubtitle[100]; sprintf(menuTitle, "Game Settings - Button Mappings"); - GuiText titleTxt(menuTitle, 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt(menuTitle, 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,30); sprintf(menuSubtitle, "%s", ctrlName[mapMenuCtrlNES]); - GuiText subtitleTxt(menuSubtitle, 22, (GXColor){255, 255, 255, 255}); + GuiText subtitleTxt(menuSubtitle, 20, (GXColor){255, 255, 255, 255}); subtitleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); subtitleTxt.SetPosition(50,60); @@ -2233,7 +2233,7 @@ static int MenuSettingsMappingsController() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText gamecubeBtnTxt("GameCube Controller", 24, (GXColor){0, 0, 0, 255}); + GuiText gamecubeBtnTxt("GameCube Controller", 22, (GXColor){0, 0, 0, 255}); gamecubeBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); GuiImage gamecubeBtnImg(&btnLargeOutline); GuiImage gamecubeBtnImgOver(&btnLargeOutlineOver); @@ -2250,7 +2250,7 @@ static int MenuSettingsMappingsController() gamecubeBtn.SetTrigger(&trigA); gamecubeBtn.SetEffectGrow(); - GuiText wiimoteBtnTxt("Wiimote", 24, (GXColor){0, 0, 0, 255}); + GuiText wiimoteBtnTxt("Wiimote", 22, (GXColor){0, 0, 0, 255}); GuiImage wiimoteBtnImg(&btnLargeOutline); GuiImage wiimoteBtnImgOver(&btnLargeOutlineOver); GuiImage wiimoteBtnIcon(&iconWiimote); @@ -2266,7 +2266,7 @@ static int MenuSettingsMappingsController() wiimoteBtn.SetTrigger(&trigA); wiimoteBtn.SetEffectGrow(); - GuiText classicBtnTxt("Classic Controller", 24, (GXColor){0, 0, 0, 255}); + GuiText classicBtnTxt("Classic Controller", 22, (GXColor){0, 0, 0, 255}); classicBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); GuiImage classicBtnImg(&btnLargeOutline); GuiImage classicBtnImgOver(&btnLargeOutlineOver); @@ -2283,9 +2283,9 @@ static int MenuSettingsMappingsController() classicBtn.SetTrigger(&trigA); classicBtn.SetEffectGrow(); - GuiText nunchukBtnTxt1("Wiimote", 24, (GXColor){0, 0, 0, 255}); + GuiText nunchukBtnTxt1("Wiimote", 22, (GXColor){0, 0, 0, 255}); GuiText nunchukBtnTxt2("&", 18, (GXColor){0, 0, 0, 255}); - GuiText nunchukBtnTxt3("Nunchuk", 24, (GXColor){0, 0, 0, 255}); + GuiText nunchukBtnTxt3("Nunchuk", 22, (GXColor){0, 0, 0, 255}); nunchukBtnTxt1.SetPosition(0, -20); nunchukBtnTxt3.SetPosition(0, +20); GuiImage nunchukBtnImg(&btnLargeOutline); @@ -2305,7 +2305,7 @@ static int MenuSettingsMappingsController() nunchukBtn.SetTrigger(&trigA); nunchukBtn.SetEffectGrow(); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -2510,12 +2510,12 @@ static int MenuSettingsMappingsMap() char menuSubtitle[100]; sprintf(menuTitle, "Game Settings - Button Mappings"); - GuiText titleTxt(menuTitle, 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt(menuTitle, 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,30); sprintf(menuSubtitle, "%s - %s", ctrlName[mapMenuCtrlNES], ctrlrName[mapMenuCtrl]); - GuiText subtitleTxt(menuSubtitle, 22, (GXColor){255, 255, 255, 255}); + GuiText subtitleTxt(menuSubtitle, 20, (GXColor){255, 255, 255, 255}); subtitleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); subtitleTxt.SetPosition(50,60); @@ -2532,7 +2532,7 @@ static int MenuSettingsMappingsMap() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -2546,7 +2546,7 @@ static int MenuSettingsMappingsMap() backBtn.SetTrigger(&trigA); backBtn.SetEffectGrow(); - GuiText resetBtnTxt("Reset", 24, (GXColor){0, 0, 0, 255}); + GuiText resetBtnTxt("Reset", 22, (GXColor){0, 0, 0, 255}); GuiImage resetBtnImg(&btnShortOutline); GuiImage resetBtnImgOver(&btnShortOutlineOver); GuiButton resetBtn(btnShortOutline.GetWidth(), btnShortOutline.GetHeight()); @@ -2777,8 +2777,8 @@ static void ScreenZoomWindow() screenPositionImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); screenPositionImg.SetPosition(0, 0); - settingText = new GuiText(NULL, 22, (GXColor){0, 0, 0, 255}); - settingText2 = new GuiText(NULL, 22, (GXColor){0, 0, 0, 255}); + settingText = new GuiText(NULL, 20, (GXColor){0, 0, 0, 255}); + settingText2 = new GuiText(NULL, 20, (GXColor){0, 0, 0, 255}); char zoom[10]; sprintf(zoom, "%.2f%%", GCSettings.zoomHor*100); settingText->SetText(zoom); @@ -2910,7 +2910,7 @@ static void ScreenPositionWindow() GuiImage screenPositionImg(&screenPosition); screenPositionImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); - settingText = new GuiText(NULL, 22, (GXColor){0, 0, 0, 255}); + settingText = new GuiText(NULL, 20, (GXColor){0, 0, 0, 255}); char shift[10]; sprintf(shift, "%i, %i", GCSettings.xshift, GCSettings.yshift); settingText->SetText(shift); @@ -2962,7 +2962,7 @@ static int MenuSettingsVideo() for(i=0; i < options.length; i++) options.value[i][0] = 0; - GuiText titleTxt("Game Settings - Video", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Game Settings - Video", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); @@ -2977,7 +2977,7 @@ static int MenuSettingsVideo() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); @@ -3141,14 +3141,14 @@ static int MenuSettings() int menu = MENU_NONE; char s[10]; - GuiText titleTxt("Settings", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Settings", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM); GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); - GuiImageData btnOutline(button_png); - GuiImageData btnOutlineOver(button_over_png); + GuiImageData btnOutline(button_long_png); + GuiImageData btnOutlineOver(button_long_over_png); GuiImageData btnLargeOutline(button_large_png); GuiImageData btnLargeOutlineOver(button_large_over_png); GuiImageData iconFile(icon_settings_file_png); @@ -3162,9 +3162,9 @@ static int MenuSettings() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText savingBtnTxt1("Saving", 24, (GXColor){0, 0, 0, 255}); + GuiText savingBtnTxt1("Saving", 22, (GXColor){0, 0, 0, 255}); GuiText savingBtnTxt2("&", 18, (GXColor){0, 0, 0, 255}); - GuiText savingBtnTxt3("Loading", 24, (GXColor){0, 0, 0, 255}); + GuiText savingBtnTxt3("Loading", 22, (GXColor){0, 0, 0, 255}); savingBtnTxt1.SetPosition(0, -20); savingBtnTxt3.SetPosition(0, +20); GuiImage savingBtnImg(&btnLargeOutline); @@ -3184,7 +3184,7 @@ static int MenuSettings() savingBtn.SetTrigger(&trigA); savingBtn.SetEffectGrow(); - GuiText menuBtnTxt("Menu", 24, (GXColor){0, 0, 0, 255}); + GuiText menuBtnTxt("Menu", 22, (GXColor){0, 0, 0, 255}); menuBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); GuiImage menuBtnImg(&btnLargeOutline); GuiImage menuBtnImgOver(&btnLargeOutlineOver); @@ -3201,7 +3201,7 @@ static int MenuSettings() menuBtn.SetTrigger(&trigA); menuBtn.SetEffectGrow(); - GuiText networkBtnTxt("Network", 24, (GXColor){0, 0, 0, 255}); + GuiText networkBtnTxt("Network", 22, (GXColor){0, 0, 0, 255}); networkBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30); GuiImage networkBtnImg(&btnLargeOutline); GuiImage networkBtnImgOver(&btnLargeOutlineOver); @@ -3221,7 +3221,7 @@ static int MenuSettings() if(!FindGameGenie()) sprintf(s, "DISABLED"); else if(GCSettings.gamegenie) sprintf(s, "ON"); else sprintf(s, "OFF"); - GuiText cheatsBtnTxt("Game Genie", 24, (GXColor){0, 0, 0, 255}); + GuiText cheatsBtnTxt("Game Genie", 22, (GXColor){0, 0, 0, 255}); GuiText cheatsBtnTxt2(s, 18, (GXColor){0, 0, 0, 255}); cheatsBtnTxt.SetPosition(0, -16); cheatsBtnTxt2.SetPosition(0, +8); @@ -3241,12 +3241,12 @@ static int MenuSettings() cheatsBtn.SetTrigger(&trigA); cheatsBtn.SetEffectGrow(); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); - backBtn.SetPosition(100, -35); + backBtn.SetPosition(90, -35); backBtn.SetLabel(&backBtnTxt); backBtn.SetImage(&backBtnImg); backBtn.SetImageOver(&backBtnImgOver); @@ -3255,12 +3255,12 @@ static int MenuSettings() backBtn.SetTrigger(&trigA); backBtn.SetEffectGrow(); - GuiText resetBtnTxt("Reset Settings", 24, (GXColor){0, 0, 0, 255}); + GuiText resetBtnTxt("Reset Settings", 22, (GXColor){0, 0, 0, 255}); GuiImage resetBtnImg(&btnOutline); GuiImage resetBtnImgOver(&btnOutlineOver); GuiButton resetBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); resetBtn.SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); - resetBtn.SetPosition(-100, -35); + resetBtn.SetPosition(-90, -35); resetBtn.SetLabel(&resetBtnTxt); resetBtn.SetImage(&resetBtnImg); resetBtn.SetImageOver(&resetBtnImgOver); @@ -3366,14 +3366,14 @@ static int MenuSettingsFile() for(i=0; i < options.length; i++) options.value[i][0] = 0; - GuiText titleTxt("Settings - Saving & Loading", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Settings - Saving & Loading", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM); GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); - GuiImageData btnOutline(button_png); - GuiImageData btnOutlineOver(button_over_png); + GuiImageData btnOutline(button_long_png); + GuiImageData btnOutlineOver(button_long_over_png); GuiTrigger trigA; if(GCSettings.WiimoteOrientation) @@ -3381,12 +3381,12 @@ static int MenuSettingsFile() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); - backBtn.SetPosition(100, -35); + backBtn.SetPosition(90, -35); backBtn.SetLabel(&backBtnTxt); backBtn.SetImage(&backBtnImg); backBtn.SetImageOver(&backBtnImgOver); @@ -3398,7 +3398,7 @@ static int MenuSettingsFile() GuiOptionBrowser optionBrowser(552, 248, &options); optionBrowser.SetPosition(0, 108); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); - optionBrowser.SetCol2Position(185); + optionBrowser.SetCol2Position(215); HaltGui(); GuiWindow w(screenwidth, screenheight); @@ -3544,14 +3544,14 @@ static int MenuSettingsMenu() for(i=0; i < options.length; i++) options.value[i][0] = 0; - GuiText titleTxt("Settings - Menu", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Settings - Menu", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM); GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); - GuiImageData btnOutline(button_png); - GuiImageData btnOutlineOver(button_over_png); + GuiImageData btnOutline(button_long_png); + GuiImageData btnOutlineOver(button_long_over_png); GuiTrigger trigA; if(GCSettings.WiimoteOrientation) @@ -3559,12 +3559,12 @@ static int MenuSettingsMenu() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); - backBtn.SetPosition(100, -35); + backBtn.SetPosition(90, -35); backBtn.SetLabel(&backBtnTxt); backBtn.SetImage(&backBtnImg); backBtn.SetImageOver(&backBtnImgOver); @@ -3576,6 +3576,7 @@ static int MenuSettingsMenu() GuiOptionBrowser optionBrowser(552, 248, &options); optionBrowser.SetPosition(0, 108); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + optionBrowser.SetCol2Position(275); HaltGui(); GuiWindow w(screenwidth, screenheight); @@ -3720,14 +3721,14 @@ static int MenuSettingsNetwork() for(i=0; i < options.length; i++) options.value[i][0] = 0; - GuiText titleTxt("Settings - Network", 28, (GXColor){255, 255, 255, 255}); + GuiText titleTxt("Settings - Network", 26, (GXColor){255, 255, 255, 255}); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetPosition(50,50); GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM); GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); - GuiImageData btnOutline(button_png); - GuiImageData btnOutlineOver(button_over_png); + GuiImageData btnOutline(button_long_png); + GuiImageData btnOutlineOver(button_long_over_png); GuiTrigger trigA; if(GCSettings.WiimoteOrientation) @@ -3735,12 +3736,12 @@ static int MenuSettingsNetwork() else trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); - GuiText backBtnTxt("Go Back", 24, (GXColor){0, 0, 0, 255}); + GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255}); GuiImage backBtnImg(&btnOutline); GuiImage backBtnImgOver(&btnOutlineOver); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); - backBtn.SetPosition(100, -35); + backBtn.SetPosition(90, -35); backBtn.SetLabel(&backBtnTxt); backBtn.SetImage(&backBtnImg); backBtn.SetImageOver(&backBtnImgOver); @@ -3752,6 +3753,7 @@ static int MenuSettingsNetwork() GuiOptionBrowser optionBrowser(552, 248, &options); optionBrowser.SetPosition(0, 108); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); + optionBrowser.SetCol2Position(275); HaltGui(); GuiWindow w(screenwidth, screenheight); @@ -3808,6 +3810,7 @@ static int MenuSettingsNetwork() mainWindow->Remove(&optionBrowser); mainWindow->Remove(&w); mainWindow->Remove(&titleTxt); + CloseShare(); #endif return menu; } diff --git a/source/ngc/networkop.cpp b/source/ngc/networkop.cpp index 66fc095..759f936 100644 --- a/source/ngc/networkop.cpp +++ b/source/ngc/networkop.cpp @@ -235,6 +235,7 @@ void CloseShare() if(networkShareInit) smbClose("smb"); networkShareInit = false; + isMounted[DEVICE_SMB] = false; } /**************************************************************************** @@ -273,9 +274,6 @@ ConnectShare (bool silent) return false; } - if(unmountRequired[DEVICE_SMB]) - CloseShare(); - if(!networkInit) InitializeNetwork(silent);