The-Homebrew-Cloud/vbagx
2
0
Fork 0
mirror of https://github.com/dborth/vbagx.git synced 2024-12-27 19:21:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

changes for multi-language support

Browse Source
This commit is contained in:
dborth 2010-03-15 07:46:11 +00:00
parent f17ec495fd
commit 276e68e92f
11 changed files with 139 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/ngc/FreeTypeGX.cpp
View File

@ -65,12 +65,18 @@ void ClearFontData()
wchar_t* charToWideChar(const char* strChar) wchar_t* charToWideChar(const char* strChar)
{ {
wchar_t *strWChar; wchar_t *strWChar = new(std::nothrow) wchar_t[strlen(strChar) + 1];
strWChar = new 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; wchar_t *tempDest = strWChar;
while((*tempDest++ = *tempSrc++)); while ((*tempDest++ = *strChar++));
return strWChar; return strWChar;
} }

6
source/ngc/filelist.h
View File

@ -114,6 +114,12 @@ extern const u32 button_png_size;
extern const u8 button_over_png[]; extern const u8 button_over_png[];
extern const u32 button_over_png_size; 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 u8 button_short_png[];
extern const u32 button_short_png_size; extern const u32 button_short_png_size;

2
source/ngc/gui/gui_button.cpp
View File

@ -199,6 +199,8 @@ void GuiButton::ResetText()
if(labelOver[i]) if(labelOver[i])
labelOver[i]->ResetText(); labelOver[i]->ResetText();
} }
if(tooltip)
tooltip->ResetText();
} }
void GuiButton::Update(GuiTrigger * t) void GuiButton::Update(GuiTrigger * t)

4
source/ngc/gui/gui_optionbrowser.cpp
View File

@ -77,11 +77,11 @@ GuiOptionBrowser::GuiOptionBrowser(int w, int h, OptionList * l)
for(int i=0; i<PAGESIZE; i++) for(int i=0; i<PAGESIZE; i++)
{ {
optionTxt[i] = new GuiText(NULL, 22, (GXColor){0, 0, 0, 0xff}); optionTxt[i] = new GuiText(NULL, 20, (GXColor){0, 0, 0, 0xff});
optionTxt[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); optionTxt[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
optionTxt[i]->SetPosition(8,0); 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]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
optionVal[i]->SetPosition(250,0); optionVal[i]->SetPosition(250,0);

14
source/ngc/gui/gui_savebrowser.cpp
View File

@ -81,14 +81,14 @@ GuiSaveBrowser::GuiSaveBrowser(int w, int h, SaveList * s, int a)
for(int i=0; i<SAVELISTSIZE; i++) for(int i=0; i<SAVELISTSIZE; i++)
{ {
saveDate[i] = new GuiText(NULL, 22, (GXColor){0, 0, 0, 0xff}); saveDate[i] = new GuiText(NULL, 18, (GXColor){0, 0, 0, 0xff});
saveDate[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP); saveDate[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP);
saveDate[i]->SetPosition(80,5); 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]->SetAlignment(ALIGN_LEFT, ALIGN_TOP);
saveTime[i]->SetPosition(80,27); 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]->SetAlignment(ALIGN_LEFT, ALIGN_TOP);
saveType[i]->SetPosition(80,50); saveType[i]->SetPosition(80,50);
@ -321,10 +321,10 @@ void GuiSaveBrowser::Update(GuiTrigger * t)
{ {
saveDate[0]->SetText(NULL); saveDate[0]->SetText(NULL);
saveDate[1]->SetText(NULL); saveDate[1]->SetText(NULL);
saveTime[0]->SetText("New SRAM"); saveTime[0]->SetText("New");
saveTime[1]->SetText("New Snapshot"); saveTime[1]->SetText("New");
saveType[0]->SetText(NULL); saveType[0]->SetText("SRAM");
saveType[1]->SetText(NULL); saveType[1]->SetText("Snapshot");
savePreviewImg[0]->SetImage(gameSaveBlank); savePreviewImg[0]->SetImage(gameSaveBlank);
savePreviewImg[1]->SetImage(gameSaveBlank); savePreviewImg[1]->SetImage(gameSaveBlank);
savePreviewImg[0]->SetScale(1); savePreviewImg[0]->SetScale(1);

BIN
source/ngc/images/button_long.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
source/ngc/images/button_long_over.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
source/ngc/images/button_short.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
source/ngc/images/button_short_over.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

217
source/ngc/menu.cpp
View File

@ -144,7 +144,7 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label, const ch
msgTxt.SetPosition(0,-20); msgTxt.SetPosition(0,-20);
msgTxt.SetWrap(true, 430); msgTxt.SetWrap(true, 430);
GuiText btn1Txt(btn1Label, 24, (GXColor){0, 0, 0, 255}); GuiText btn1Txt(btn1Label, 22, (GXColor){0, 0, 0, 255});
GuiImage btn1Img(&btnOutline); GuiImage btn1Img(&btnOutline);
GuiImage btn1ImgOver(&btnOutlineOver); GuiImage btn1ImgOver(&btnOutlineOver);
GuiButton btn1(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton btn1(btnOutline.GetWidth(), btnOutline.GetHeight());
@ -169,7 +169,7 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label, const ch
btn1.SetState(STATE_SELECTED); btn1.SetState(STATE_SELECTED);
btn1.SetEffectGrow(); btn1.SetEffectGrow();
GuiText btn2Txt(btn2Label, 24, (GXColor){0, 0, 0, 255}); GuiText btn2Txt(btn2Label, 22, (GXColor){0, 0, 0, 255});
GuiImage btn2Img(&btnOutline); GuiImage btn2Img(&btnOutline);
GuiImage btn2ImgOver(&btnOutlineOver); GuiImage btn2ImgOver(&btnOutlineOver);
GuiButton btn2(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton btn2(btnOutline.GetWidth(), btnOutline.GetHeight());
@ -568,7 +568,7 @@ static void OnScreenKeyboard(char * var, u32 maxlen)
else else
trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
GuiText okBtnTxt("OK", 24, (GXColor){0, 0, 0, 255}); GuiText okBtnTxt("OK", 22, (GXColor){0, 0, 0, 255});
GuiImage okBtnImg(&btnOutline); GuiImage okBtnImg(&btnOutline);
GuiImage okBtnImgOver(&btnOutlineOver); GuiImage okBtnImgOver(&btnOutlineOver);
GuiButton okBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton okBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
@ -584,7 +584,7 @@ static void OnScreenKeyboard(char * var, u32 maxlen)
okBtn.SetTrigger(&trigA); okBtn.SetTrigger(&trigA);
okBtn.SetEffectGrow(); okBtn.SetEffectGrow();
GuiText cancelBtnTxt("Cancel", 24, (GXColor){0, 0, 0, 255}); GuiText cancelBtnTxt("Cancel", 22, (GXColor){0, 0, 0, 255});
GuiImage cancelBtnImg(&btnOutline); GuiImage cancelBtnImg(&btnOutline);
GuiImage cancelBtnImgOver(&btnOutlineOver); GuiImage cancelBtnImgOver(&btnOutlineOver);
GuiButton cancelBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton cancelBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
@ -658,7 +658,7 @@ SettingWindow(const char * title, GuiWindow * w)
titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
titleTxt.SetPosition(0,14); titleTxt.SetPosition(0,14);
GuiText okBtnTxt("OK", 24, (GXColor){0, 0, 0, 255}); GuiText okBtnTxt("OK", 22, (GXColor){0, 0, 0, 255});
GuiImage okBtnImg(&btnOutline); GuiImage okBtnImg(&btnOutline);
GuiImage okBtnImgOver(&btnOutlineOver); GuiImage okBtnImgOver(&btnOutlineOver);
GuiButton okBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton okBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
@ -674,7 +674,7 @@ SettingWindow(const char * title, GuiWindow * w)
okBtn.SetTrigger(&trigA); okBtn.SetTrigger(&trigA);
okBtn.SetEffectGrow(); okBtn.SetEffectGrow();
GuiText cancelBtnTxt("Cancel", 24, (GXColor){0, 0, 0, 255}); GuiText cancelBtnTxt("Cancel", 22, (GXColor){0, 0, 0, 255});
GuiImage cancelBtnImg(&btnOutline); GuiImage cancelBtnImg(&btnOutline);
GuiImage cancelBtnImgOver(&btnOutlineOver); GuiImage cancelBtnImgOver(&btnOutlineOver);
GuiButton cancelBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton cancelBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
@ -752,47 +752,47 @@ static void WindowCredits(void * ptr)
txt[i] = new GuiText("Official Site: http://code.google.com/p/vba-wii/", 20, (GXColor){0, 0, 0, 255}); txt[i] = new GuiText("Official Site: http://code.google.com/p/vba-wii/", 20, (GXColor){0, 0, 0, 255});
txt[i]->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); txt[i]->SetPosition(0,y); i++; y+=40; txt[i]->SetAlignment(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); FTGX_JUSTIFY_LEFT | FTGX_ALIGN_TOP, ALIGN_LEFT, ALIGN_TOP);
txt[i] = new GuiText("Coding & menu design"); 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] = new GuiText("Tantric");
txt[i]->SetPosition(320,y); i++; y+=24; txt[i]->SetPosition(335,y); i++; y+=24;
txt[i] = new GuiText("Additional coding"); txt[i] = new GuiText("Additional coding");
txt[i]->SetPosition(50,y); i++; txt[i]->SetPosition(40,y); i++;
txt[i] = new GuiText("Carl Kenner, dancinninjac"); txt[i] = new GuiText("Carl Kenner, dancinninjac");
txt[i]->SetPosition(320,y); i++; y+=24; txt[i]->SetPosition(335,y); i++; y+=24;
txt[i] = new GuiText("Menu artwork"); 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] = 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] = 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] = new GuiText("Peter de Man");
txt[i]->SetPosition(320,y); i++; y+=48; txt[i]->SetPosition(335,y); i++; y+=48;
txt[i] = new GuiText("VBA GameCube"); txt[i] = new GuiText("VBA GameCube");
txt[i]->SetPosition(50,y); i++; txt[i]->SetPosition(40,y); i++;
txt[i] = new GuiText("SoftDev, emukidid"); txt[i] = new GuiText("SoftDev, emukidid");
txt[i]->SetPosition(320,y); i++; y+=24; txt[i]->SetPosition(335,y); i++; y+=24;
txt[i] = new GuiText("Visual Boy Advance - M"); txt[i] = new GuiText("Visual Boy Advance - M");
txt[i]->SetPosition(50,y); i++; txt[i]->SetPosition(40,y); i++;
txt[i] = new GuiText("VBA-M Team"); txt[i] = new GuiText("VBA-M Team");
txt[i]->SetPosition(320,y); i++; y+=24; txt[i]->SetPosition(335,y); i++; y+=24;
txt[i] = new GuiText("Visual Boy Advance"); txt[i] = new GuiText("Visual Boy Advance");
txt[i]->SetPosition(50,y); i++; txt[i]->SetPosition(40,y); i++;
txt[i] = new GuiText("Forgotten"); txt[i] = new GuiText("Forgotten");
txt[i]->SetPosition(320,y); i++; y+=24; txt[i]->SetPosition(335,y); i++; y+=24;
txt[i] = new GuiText("libogc / devkitPPC"); 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] = 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] = new GuiText("FreeTypeGX");
txt[i]->SetPosition(50,y); i++; txt[i]->SetPosition(40,y); i++;
txt[i] = new GuiText("Armin Tamzarian"); 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, txt[i]->SetPresets(18, (GXColor){0, 0, 0, 255}, 0,
FTGX_JUSTIFY_CENTER | FTGX_ALIGN_TOP, ALIGN_CENTRE, ALIGN_TOP); FTGX_JUSTIFY_CENTER | FTGX_ALIGN_TOP, ALIGN_CENTRE, ALIGN_TOP);
@ -867,7 +867,7 @@ static int MenuGameSelection()
bool res; bool res;
int i; int i;
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.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
titleTxt.SetPosition(50,50); titleTxt.SetPosition(50,50);
@ -875,8 +875,8 @@ static int MenuGameSelection()
GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM);
GuiImageData iconHome(icon_home_png); GuiImageData iconHome(icon_home_png);
GuiImageData iconSettings(icon_settings_png); GuiImageData iconSettings(icon_settings_png);
GuiImageData btnOutline(button_png); GuiImageData btnOutline(button_long_png);
GuiImageData btnOutlineOver(button_over_png); GuiImageData btnOutlineOver(button_long_over_png);
GuiTrigger trigA; GuiTrigger trigA;
if(GCSettings.WiimoteOrientation) if(GCSettings.WiimoteOrientation)
trigA.SetSimpleTrigger(-1, WPAD_BUTTON_2 | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); trigA.SetSimpleTrigger(-1, WPAD_BUTTON_2 | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A);
@ -885,15 +885,15 @@ static int MenuGameSelection()
GuiTrigger trigHome; GuiTrigger trigHome;
trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); 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); GuiImage settingsBtnIcon(&iconSettings);
settingsBtnIcon.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); settingsBtnIcon.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
settingsBtnIcon.SetPosition(20,0); settingsBtnIcon.SetPosition(14,0);
GuiImage settingsBtnImg(&btnOutline); GuiImage settingsBtnImg(&btnOutline);
GuiImage settingsBtnImgOver(&btnOutlineOver); GuiImage settingsBtnImgOver(&btnOutlineOver);
GuiButton settingsBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton settingsBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
settingsBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); settingsBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
settingsBtn.SetPosition(100, -35); settingsBtn.SetPosition(90, -35);
settingsBtn.SetLabel(&settingsBtnTxt); settingsBtn.SetLabel(&settingsBtnTxt);
settingsBtn.SetIcon(&settingsBtnIcon); settingsBtn.SetIcon(&settingsBtnIcon);
settingsBtn.SetImage(&settingsBtnImg); settingsBtn.SetImage(&settingsBtnImg);
@ -903,15 +903,15 @@ static int MenuGameSelection()
settingsBtn.SetTrigger(&trigA); settingsBtn.SetTrigger(&trigA);
settingsBtn.SetEffectGrow(); settingsBtn.SetEffectGrow();
GuiText exitBtnTxt("Exit", 24, (GXColor){0, 0, 0, 255}); GuiText exitBtnTxt("Exit", 22, (GXColor){0, 0, 0, 255});
GuiImage exitBtnIcon(&iconHome); GuiImage exitBtnIcon(&iconHome);
exitBtnIcon.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); exitBtnIcon.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
exitBtnIcon.SetPosition(20,0); exitBtnIcon.SetPosition(14,0);
GuiImage exitBtnImg(&btnOutline); GuiImage exitBtnImg(&btnOutline);
GuiImage exitBtnImgOver(&btnOutlineOver); GuiImage exitBtnImgOver(&btnOutlineOver);
GuiButton exitBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton exitBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
exitBtn.SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); exitBtn.SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM);
exitBtn.SetPosition(-100, -35); exitBtn.SetPosition(-90, -35);
exitBtn.SetLabel(&exitBtnTxt); exitBtn.SetLabel(&exitBtnTxt);
exitBtn.SetIcon(&exitBtnIcon); exitBtn.SetIcon(&exitBtnIcon);
exitBtn.SetImage(&exitBtnImg); exitBtn.SetImage(&exitBtnImg);
@ -1032,7 +1032,7 @@ static int MenuGame()
bool isBoktai = ((RomIdCode & 0xFF)=='U'); bool isBoktai = ((RomIdCode & 0xFF)=='U');
char s[64]; char s[64];
GuiText titleTxt(ROMFilename, 24, (GXColor){255, 255, 255, 255}); GuiText titleTxt(ROMFilename, 22, (GXColor){255, 255, 255, 255});
if (DebugStr[0]) titleTxt.SetText(DebugStr); if (DebugStr[0]) titleTxt.SetText(DebugStr);
titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
titleTxt.SetPosition(50,50); titleTxt.SetPosition(50,50);
@ -1068,7 +1068,7 @@ static int MenuGame()
xOffset=170; yOffset=70; xOffset=170; yOffset=70;
} }
GuiText saveBtnTxt("Save", 24, (GXColor){0, 0, 0, 255}); GuiText saveBtnTxt("Save", 22, (GXColor){0, 0, 0, 255});
GuiImage saveBtnImg(&btnLargeOutline); GuiImage saveBtnImg(&btnLargeOutline);
GuiImage saveBtnImgOver(&btnLargeOutlineOver); GuiImage saveBtnImgOver(&btnLargeOutlineOver);
GuiImage saveBtnIcon(&iconSave); GuiImage saveBtnIcon(&iconSave);
@ -1084,7 +1084,7 @@ static int MenuGame()
saveBtn.SetTrigger(&trigA); saveBtn.SetTrigger(&trigA);
saveBtn.SetEffectGrow(); saveBtn.SetEffectGrow();
GuiText loadBtnTxt("Load", 24, (GXColor){0, 0, 0, 255}); GuiText loadBtnTxt("Load", 22, (GXColor){0, 0, 0, 255});
GuiImage loadBtnImg(&btnLargeOutline); GuiImage loadBtnImg(&btnLargeOutline);
GuiImage loadBtnImgOver(&btnLargeOutlineOver); GuiImage loadBtnImgOver(&btnLargeOutlineOver);
GuiImage loadBtnIcon(&iconLoad); GuiImage loadBtnIcon(&iconLoad);
@ -1116,7 +1116,7 @@ static int MenuGame()
{ {
sprintf(s, "Weather: Night Time"); sprintf(s, "Weather: Night Time");
} else sprintf(s, "Weather: %d%% sun", SunBars*10); } else sprintf(s, "Weather: %d%% sun", SunBars*10);
sunBtnTxt = new GuiText(s, 24, (GXColor){0, 0, 0, 255}); sunBtnTxt = new GuiText(s, 22, (GXColor){0, 0, 0, 255});
sunBtnTxt->SetWrap(true, btnLargeOutline.GetWidth()-30); sunBtnTxt->SetWrap(true, btnLargeOutline.GetWidth()-30);
sunBtnImg = new GuiImage(&btnLargeOutline); sunBtnImg = new GuiImage(&btnLargeOutline);
sunBtnImgOver = new GuiImage(&btnLargeOutlineOver); sunBtnImgOver = new GuiImage(&btnLargeOutlineOver);
@ -1132,7 +1132,7 @@ static int MenuGame()
sunBtn->SetEffectGrow(); sunBtn->SetEffectGrow();
} }
GuiText resetBtnTxt("Reset", 24, (GXColor){0, 0, 0, 255}); GuiText resetBtnTxt("Reset", 22, (GXColor){0, 0, 0, 255});
GuiImage resetBtnImg(&btnLargeOutline); GuiImage resetBtnImg(&btnLargeOutline);
GuiImage resetBtnImgOver(&btnLargeOutlineOver); GuiImage resetBtnImgOver(&btnLargeOutlineOver);
GuiImage resetBtnIcon(&iconReset); GuiImage resetBtnIcon(&iconReset);
@ -1148,7 +1148,7 @@ static int MenuGame()
resetBtn.SetTrigger(&trigA); resetBtn.SetTrigger(&trigA);
resetBtn.SetEffectGrow(); 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); gameSettingsBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30);
GuiImage gameSettingsBtnImg(&btnLargeOutline); GuiImage gameSettingsBtnImg(&btnLargeOutline);
GuiImage gameSettingsBtnImgOver(&btnLargeOutlineOver); GuiImage gameSettingsBtnImgOver(&btnLargeOutlineOver);
@ -1165,7 +1165,7 @@ static int MenuGame()
gameSettingsBtn.SetTrigger(&trigA); gameSettingsBtn.SetTrigger(&trigA);
gameSettingsBtn.SetEffectGrow(); 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 mainmenuBtnImg(&btnOutline);
GuiImage mainmenuBtnImgOver(&btnOutlineOver); GuiImage mainmenuBtnImgOver(&btnOutlineOver);
GuiButton mainmenuBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton mainmenuBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
@ -1179,7 +1179,7 @@ static int MenuGame()
mainmenuBtn.SetTrigger(&trigA); mainmenuBtn.SetTrigger(&trigA);
mainmenuBtn.SetEffectGrow(); mainmenuBtn.SetEffectGrow();
GuiText closeBtnTxt("Close", 22, (GXColor){0, 0, 0, 255}); GuiText closeBtnTxt("Close", 20, (GXColor){0, 0, 0, 255});
GuiImage closeBtnImg(&btnCloseOutline); GuiImage closeBtnImg(&btnCloseOutline);
GuiImage closeBtnImgOver(&btnCloseOutlineOver); GuiImage closeBtnImgOver(&btnCloseOutlineOver);
GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight()); GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight());
@ -1213,7 +1213,7 @@ static int MenuGame()
else else
sprintf(txt, "P%d", i+1); 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); batteryTxt[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
batteryImg[i] = new GuiImage(&battery); batteryImg[i] = new GuiImage(&battery);
batteryImg[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); batteryImg[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
@ -1500,7 +1500,7 @@ static int MenuGameSaves(int action)
if(!ChangeInterface(method, NOTSILENT)) if(!ChangeInterface(method, NOTSILENT))
return MENU_GAME; 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.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
titleTxt.SetPosition(50,50); titleTxt.SetPosition(50,50);
@ -1525,7 +1525,7 @@ static int MenuGameSaves(int action)
GuiTrigger trigHome; GuiTrigger trigHome;
trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); 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 backBtnImg(&btnOutline);
GuiImage backBtnImgOver(&btnOutlineOver); GuiImage backBtnImgOver(&btnOutlineOver);
GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
@ -1539,7 +1539,7 @@ static int MenuGameSaves(int action)
backBtn.SetTrigger(&trigA); backBtn.SetTrigger(&trigA);
backBtn.SetEffectGrow(); backBtn.SetEffectGrow();
GuiText closeBtnTxt("Close", 22, (GXColor){0, 0, 0, 255}); GuiText closeBtnTxt("Close", 20, (GXColor){0, 0, 0, 255});
GuiImage closeBtnImg(&btnCloseOutline); GuiImage closeBtnImg(&btnCloseOutline);
GuiImage closeBtnImgOver(&btnCloseOutlineOver); GuiImage closeBtnImgOver(&btnCloseOutlineOver);
GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight()); GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight());
@ -1749,7 +1749,7 @@ static int MenuGameSettings()
int menu = MENU_NONE; int menu = MENU_NONE;
char s[4]; char s[4];
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.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
titleTxt.SetPosition(50,50); titleTxt.SetPosition(50,50);
@ -1779,7 +1779,7 @@ static int MenuGameSettings()
GuiTrigger trigHome; GuiTrigger trigHome;
trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0); 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); mappingBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30);
GuiImage mappingBtnImg(&btnLargeOutline); GuiImage mappingBtnImg(&btnLargeOutline);
GuiImage mappingBtnImgOver(&btnLargeOutlineOver); GuiImage mappingBtnImgOver(&btnLargeOutlineOver);
@ -1796,7 +1796,7 @@ static int MenuGameSettings()
mappingBtn.SetTrigger(&trigA); mappingBtn.SetTrigger(&trigA);
mappingBtn.SetEffectGrow(); 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); videoBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30);
GuiImage videoBtnImg(&btnLargeOutline); GuiImage videoBtnImg(&btnLargeOutline);
GuiImage videoBtnImgOver(&btnLargeOutlineOver); GuiImage videoBtnImgOver(&btnLargeOutlineOver);
@ -1814,11 +1814,11 @@ static int MenuGameSettings()
videoBtn.SetEffectGrow(); videoBtn.SetEffectGrow();
#ifdef HW_RVL #ifdef HW_RVL
GuiText wiiControlsBtnTxt1("Match Wii", 24, (GXColor){0, 0, 0, 255}); GuiText wiiControlsBtnTxt1("Match Wii", 22, (GXColor){0, 0, 0, 255});
#else #else
GuiText wiiControlsBtnTxt1("Match GC", 24, (GXColor){0, 0, 0, 255}); GuiText wiiControlsBtnTxt1("Match GC", 22, (GXColor){0, 0, 0, 255});
#endif #endif
GuiText wiiControlsBtnTxt2("Controls", 24, (GXColor){0, 0, 0, 255}); GuiText wiiControlsBtnTxt2("Controls", 22, (GXColor){0, 0, 0, 255});
if (GCSettings.WiiControls) sprintf(s, "ON"); if (GCSettings.WiiControls) sprintf(s, "ON");
else sprintf(s, "OFF"); else sprintf(s, "OFF");
GuiText wiiControlsBtnTxt3(s, 18, (GXColor){0, 0, 0, 255}); GuiText wiiControlsBtnTxt3(s, 18, (GXColor){0, 0, 0, 255});
@ -1842,7 +1842,7 @@ static int MenuGameSettings()
wiiControlsBtn.SetTrigger(&trigA); wiiControlsBtn.SetTrigger(&trigA);
wiiControlsBtn.SetEffectGrow(); wiiControlsBtn.SetEffectGrow();
/*GuiText cheatsBtnTxt("Cheats", 24, (GXColor){0, 0, 0, 255}); /*GuiText cheatsBtnTxt("Cheats", 22, (GXColor){0, 0, 0, 255});
GuiImage cheatsBtnImg(&btnLargeOutline); GuiImage cheatsBtnImg(&btnLargeOutline);
GuiImage cheatsBtnImgOver(&btnLargeOutlineOver); GuiImage cheatsBtnImgOver(&btnLargeOutlineOver);
GuiImage cheatsBtnIcon(&iconCheats); GuiImage cheatsBtnIcon(&iconCheats);
@ -1858,7 +1858,7 @@ static int MenuGameSettings()
cheatsBtn.SetTrigger(&trigA); cheatsBtn.SetTrigger(&trigA);
cheatsBtn.SetEffectGrow();*/ cheatsBtn.SetEffectGrow();*/
GuiText closeBtnTxt("Close", 22, (GXColor){0, 0, 0, 255}); GuiText closeBtnTxt("Close", 20, (GXColor){0, 0, 0, 255});
GuiImage closeBtnImg(&btnCloseOutline); GuiImage closeBtnImg(&btnCloseOutline);
GuiImage closeBtnImgOver(&btnCloseOutlineOver); GuiImage closeBtnImgOver(&btnCloseOutlineOver);
GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight()); GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight());
@ -1873,7 +1873,7 @@ static int MenuGameSettings()
closeBtn.SetTrigger(&trigHome); closeBtn.SetTrigger(&trigHome);
closeBtn.SetEffectGrow(); 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 backBtnImg(&btnOutline);
GuiImage backBtnImgOver(&btnOutlineOver); GuiImage backBtnImgOver(&btnOutlineOver);
GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
@ -1963,7 +1963,7 @@ static int MenuSettingsMappings()
{ {
int menu = MENU_NONE; 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.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
titleTxt.SetPosition(50,50); titleTxt.SetPosition(50,50);
@ -1984,7 +1984,7 @@ static int MenuSettingsMappings()
else else
trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); 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); gamecubeBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30);
GuiImage gamecubeBtnImg(&btnLargeOutline); GuiImage gamecubeBtnImg(&btnLargeOutline);
GuiImage gamecubeBtnImgOver(&btnLargeOutlineOver); GuiImage gamecubeBtnImgOver(&btnLargeOutlineOver);
@ -2001,7 +2001,7 @@ static int MenuSettingsMappings()
gamecubeBtn.SetTrigger(&trigA); gamecubeBtn.SetTrigger(&trigA);
gamecubeBtn.SetEffectGrow(); gamecubeBtn.SetEffectGrow();
GuiText wiimoteBtnTxt("Wiimote", 24, (GXColor){0, 0, 0, 255}); GuiText wiimoteBtnTxt("Wiimote", 22, (GXColor){0, 0, 0, 255});
GuiImage wiimoteBtnImg(&btnLargeOutline); GuiImage wiimoteBtnImg(&btnLargeOutline);
GuiImage wiimoteBtnImgOver(&btnLargeOutlineOver); GuiImage wiimoteBtnImgOver(&btnLargeOutlineOver);
GuiImage wiimoteBtnIcon(&iconWiimote); GuiImage wiimoteBtnIcon(&iconWiimote);
@ -2017,7 +2017,7 @@ static int MenuSettingsMappings()
wiimoteBtn.SetTrigger(&trigA); wiimoteBtn.SetTrigger(&trigA);
wiimoteBtn.SetEffectGrow(); 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); classicBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30);
GuiImage classicBtnImg(&btnLargeOutline); GuiImage classicBtnImg(&btnLargeOutline);
GuiImage classicBtnImgOver(&btnLargeOutlineOver); GuiImage classicBtnImgOver(&btnLargeOutlineOver);
@ -2034,9 +2034,9 @@ static int MenuSettingsMappings()
classicBtn.SetTrigger(&trigA); classicBtn.SetTrigger(&trigA);
classicBtn.SetEffectGrow(); 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 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); nunchukBtnTxt1.SetPosition(0, -20);
nunchukBtnTxt3.SetPosition(0, +20); nunchukBtnTxt3.SetPosition(0, +20);
GuiImage nunchukBtnImg(&btnLargeOutline); GuiImage nunchukBtnImg(&btnLargeOutline);
@ -2056,7 +2056,7 @@ static int MenuSettingsMappings()
nunchukBtn.SetTrigger(&trigA); nunchukBtn.SetTrigger(&trigA);
nunchukBtn.SetEffectGrow(); 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 backBtnImg(&btnOutline);
GuiImage backBtnImgOver(&btnOutlineOver); GuiImage backBtnImgOver(&btnOutlineOver);
GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
@ -2255,12 +2255,12 @@ static int MenuSettingsMappingsMap()
char menuSubtitle[100]; char menuSubtitle[100];
sprintf(menuTitle, "Game Settings - Button Mappings"); 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.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
titleTxt.SetPosition(50,30); titleTxt.SetPosition(50,30);
sprintf(menuSubtitle, "%s", ctrlrName[mapMenuCtrl]); sprintf(menuSubtitle, "%s", 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.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
subtitleTxt.SetPosition(50,60); subtitleTxt.SetPosition(50,60);
@ -2277,7 +2277,7 @@ static int MenuSettingsMappingsMap()
else else
trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); 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 backBtnImg(&btnOutline);
GuiImage backBtnImgOver(&btnOutlineOver); GuiImage backBtnImgOver(&btnOutlineOver);
GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
@ -2291,7 +2291,7 @@ static int MenuSettingsMappingsMap()
backBtn.SetTrigger(&trigA); backBtn.SetTrigger(&trigA);
backBtn.SetEffectGrow(); backBtn.SetEffectGrow();
GuiText resetBtnTxt("Reset", 24, (GXColor){0, 0, 0, 255}); GuiText resetBtnTxt("Reset", 22, (GXColor){0, 0, 0, 255});
GuiImage resetBtnImg(&btnShortOutline); GuiImage resetBtnImg(&btnShortOutline);
GuiImage resetBtnImgOver(&btnShortOutlineOver); GuiImage resetBtnImgOver(&btnShortOutlineOver);
GuiButton resetBtn(btnShortOutline.GetWidth(), btnShortOutline.GetHeight()); GuiButton resetBtn(btnShortOutline.GetWidth(), btnShortOutline.GetHeight());
@ -2324,7 +2324,7 @@ static int MenuSettingsMappingsMap()
GuiOptionBrowser optionBrowser(552, 248, &options); GuiOptionBrowser optionBrowser(552, 248, &options);
optionBrowser.SetPosition(0, 108); optionBrowser.SetPosition(0, 108);
optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
optionBrowser.SetCol2Position(180); optionBrowser.SetCol2Position(215);
HaltGui(); HaltGui();
GuiWindow w(screenwidth, screenheight); GuiWindow w(screenwidth, screenheight);
@ -2522,8 +2522,8 @@ static void ScreenZoomWindow()
screenPositionImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); screenPositionImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
screenPositionImg.SetPosition(0, 0); screenPositionImg.SetPosition(0, 0);
settingText = new GuiText(NULL, 22, (GXColor){0, 0, 0, 255}); settingText = new GuiText(NULL, 20, (GXColor){0, 0, 0, 255});
settingText2 = new GuiText(NULL, 22, (GXColor){0, 0, 0, 255}); settingText2 = new GuiText(NULL, 20, (GXColor){0, 0, 0, 255});
char zoom[10], zoom2[10]; char zoom[10], zoom2[10];
float currentZoomHor, currentZoomVert; float currentZoomHor, currentZoomVert;
@ -2681,7 +2681,7 @@ static void ScreenPositionWindow()
GuiImage screenPositionImg(&screenPosition); GuiImage screenPositionImg(&screenPosition);
screenPositionImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); 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]; char shift[10];
sprintf(shift, "%i, %i", GCSettings.xshift, GCSettings.yshift); sprintf(shift, "%i, %i", GCSettings.xshift, GCSettings.yshift);
settingText->SetText(shift); settingText->SetText(shift);
@ -2736,7 +2736,7 @@ static int MenuSettingsVideo()
if(!IsGameboyGame()) if(!IsGameboyGame())
options.name[6][0] = 0; // disable palette option for GBA/GBC options.name[6][0] = 0; // disable palette option for GBA/GBC
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.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
titleTxt.SetPosition(50,50); titleTxt.SetPosition(50,50);
@ -2751,7 +2751,7 @@ static int MenuSettingsVideo()
else else
trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); 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 backBtnImg(&btnOutline);
GuiImage backBtnImgOver(&btnOutlineOver); GuiImage backBtnImgOver(&btnOutlineOver);
GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
@ -2898,14 +2898,14 @@ static int MenuSettings()
{ {
int menu = MENU_NONE; int menu = MENU_NONE;
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.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
titleTxt.SetPosition(50,50); titleTxt.SetPosition(50,50);
GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM); GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM);
GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM);
GuiImageData btnOutline(button_png); GuiImageData btnOutline(button_long_png);
GuiImageData btnOutlineOver(button_over_png); GuiImageData btnOutlineOver(button_long_over_png);
GuiImageData btnLargeOutline(button_large_png); GuiImageData btnLargeOutline(button_large_png);
GuiImageData btnLargeOutlineOver(button_large_over_png); GuiImageData btnLargeOutlineOver(button_large_over_png);
GuiImageData iconFile(icon_settings_file_png); GuiImageData iconFile(icon_settings_file_png);
@ -2918,9 +2918,9 @@ static int MenuSettings()
else else
trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); 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 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); savingBtnTxt1.SetPosition(0, -20);
savingBtnTxt3.SetPosition(0, +20); savingBtnTxt3.SetPosition(0, +20);
GuiImage savingBtnImg(&btnLargeOutline); GuiImage savingBtnImg(&btnLargeOutline);
@ -2940,7 +2940,7 @@ static int MenuSettings()
savingBtn.SetTrigger(&trigA); savingBtn.SetTrigger(&trigA);
savingBtn.SetEffectGrow(); 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); menuBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30);
GuiImage menuBtnImg(&btnLargeOutline); GuiImage menuBtnImg(&btnLargeOutline);
GuiImage menuBtnImgOver(&btnLargeOutlineOver); GuiImage menuBtnImgOver(&btnLargeOutlineOver);
@ -2957,7 +2957,7 @@ static int MenuSettings()
menuBtn.SetTrigger(&trigA); menuBtn.SetTrigger(&trigA);
menuBtn.SetEffectGrow(); 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); networkBtnTxt.SetWrap(true, btnLargeOutline.GetWidth()-30);
GuiImage networkBtnImg(&btnLargeOutline); GuiImage networkBtnImg(&btnLargeOutline);
GuiImage networkBtnImgOver(&btnLargeOutlineOver); GuiImage networkBtnImgOver(&btnLargeOutlineOver);
@ -2974,12 +2974,12 @@ static int MenuSettings()
networkBtn.SetTrigger(&trigA); networkBtn.SetTrigger(&trigA);
networkBtn.SetEffectGrow(); networkBtn.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 backBtnImg(&btnOutline);
GuiImage backBtnImgOver(&btnOutlineOver); GuiImage backBtnImgOver(&btnOutlineOver);
GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
backBtn.SetPosition(100, -35); backBtn.SetPosition(90, -35);
backBtn.SetLabel(&backBtnTxt); backBtn.SetLabel(&backBtnTxt);
backBtn.SetImage(&backBtnImg); backBtn.SetImage(&backBtnImg);
backBtn.SetImageOver(&backBtnImgOver); backBtn.SetImageOver(&backBtnImgOver);
@ -2988,12 +2988,12 @@ static int MenuSettings()
backBtn.SetTrigger(&trigA); backBtn.SetTrigger(&trigA);
backBtn.SetEffectGrow(); 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 resetBtnImg(&btnOutline);
GuiImage resetBtnImgOver(&btnOutlineOver); GuiImage resetBtnImgOver(&btnOutlineOver);
GuiButton resetBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton resetBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
resetBtn.SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM); resetBtn.SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM);
resetBtn.SetPosition(-100, -35); resetBtn.SetPosition(-90, -35);
resetBtn.SetLabel(&resetBtnTxt); resetBtn.SetLabel(&resetBtnTxt);
resetBtn.SetImage(&resetBtnImg); resetBtn.SetImage(&resetBtnImg);
resetBtn.SetImageOver(&resetBtnImgOver); resetBtn.SetImageOver(&resetBtnImgOver);
@ -3083,14 +3083,14 @@ static int MenuSettingsFile()
for(i=0; i < options.length; i++) for(i=0; i < options.length; i++)
options.value[i][0] = 0; 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.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
titleTxt.SetPosition(50,50); titleTxt.SetPosition(50,50);
GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM); GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM);
GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM);
GuiImageData btnOutline(button_png); GuiImageData btnOutline(button_long_png);
GuiImageData btnOutlineOver(button_over_png); GuiImageData btnOutlineOver(button_long_over_png);
GuiTrigger trigA; GuiTrigger trigA;
if(GCSettings.WiimoteOrientation) if(GCSettings.WiimoteOrientation)
@ -3098,12 +3098,12 @@ static int MenuSettingsFile()
else else
trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); 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 backBtnImg(&btnOutline);
GuiImage backBtnImgOver(&btnOutlineOver); GuiImage backBtnImgOver(&btnOutlineOver);
GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
backBtn.SetPosition(100, -35); backBtn.SetPosition(90, -35);
backBtn.SetLabel(&backBtnTxt); backBtn.SetLabel(&backBtnTxt);
backBtn.SetImage(&backBtnImg); backBtn.SetImage(&backBtnImg);
backBtn.SetImageOver(&backBtnImgOver); backBtn.SetImageOver(&backBtnImgOver);
@ -3115,7 +3115,7 @@ static int MenuSettingsFile()
GuiOptionBrowser optionBrowser(552, 248, &options); GuiOptionBrowser optionBrowser(552, 248, &options);
optionBrowser.SetPosition(0, 108); optionBrowser.SetPosition(0, 108);
optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
optionBrowser.SetCol2Position(185); optionBrowser.SetCol2Position(215);
HaltGui(); HaltGui();
GuiWindow w(screenwidth, screenheight); GuiWindow w(screenwidth, screenheight);
@ -3260,14 +3260,14 @@ static int MenuSettingsMenu()
for(i=0; i < options.length; i++) for(i=0; i < options.length; i++)
options.value[i][0] = 0; 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.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
titleTxt.SetPosition(50,50); titleTxt.SetPosition(50,50);
GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM); GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM);
GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM);
GuiImageData btnOutline(button_png); GuiImageData btnOutline(button_long_png);
GuiImageData btnOutlineOver(button_over_png); GuiImageData btnOutlineOver(button_long_over_png);
GuiTrigger trigA; GuiTrigger trigA;
if(GCSettings.WiimoteOrientation) if(GCSettings.WiimoteOrientation)
@ -3275,12 +3275,12 @@ static int MenuSettingsMenu()
else else
trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); 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 backBtnImg(&btnOutline);
GuiImage backBtnImgOver(&btnOutlineOver); GuiImage backBtnImgOver(&btnOutlineOver);
GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
backBtn.SetPosition(100, -35); backBtn.SetPosition(90, -35);
backBtn.SetLabel(&backBtnTxt); backBtn.SetLabel(&backBtnTxt);
backBtn.SetImage(&backBtnImg); backBtn.SetImage(&backBtnImg);
backBtn.SetImageOver(&backBtnImgOver); backBtn.SetImageOver(&backBtnImgOver);
@ -3292,6 +3292,7 @@ static int MenuSettingsMenu()
GuiOptionBrowser optionBrowser(552, 248, &options); GuiOptionBrowser optionBrowser(552, 248, &options);
optionBrowser.SetPosition(0, 108); optionBrowser.SetPosition(0, 108);
optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
optionBrowser.SetCol2Position(275);
HaltGui(); HaltGui();
GuiWindow w(screenwidth, screenheight); GuiWindow w(screenwidth, screenheight);
@ -3435,14 +3436,14 @@ static int MenuSettingsNetwork()
for(i=0; i < options.length; i++) for(i=0; i < options.length; i++)
options.value[i][0] = 0; 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.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
titleTxt.SetPosition(50,50); titleTxt.SetPosition(50,50);
GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM); GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM);
GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM); GuiSound btnSoundClick(button_click_pcm, button_click_pcm_size, SOUND_PCM);
GuiImageData btnOutline(button_png); GuiImageData btnOutline(button_long_png);
GuiImageData btnOutlineOver(button_over_png); GuiImageData btnOutlineOver(button_long_over_png);
GuiTrigger trigA; GuiTrigger trigA;
if(GCSettings.WiimoteOrientation) if(GCSettings.WiimoteOrientation)
@ -3450,12 +3451,12 @@ static int MenuSettingsNetwork()
else else
trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); 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 backBtnImg(&btnOutline);
GuiImage backBtnImgOver(&btnOutlineOver); GuiImage backBtnImgOver(&btnOutlineOver);
GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
backBtn.SetPosition(100, -35); backBtn.SetPosition(90, -35);
backBtn.SetLabel(&backBtnTxt); backBtn.SetLabel(&backBtnTxt);
backBtn.SetImage(&backBtnImg); backBtn.SetImage(&backBtnImg);
backBtn.SetImageOver(&backBtnImgOver); backBtn.SetImageOver(&backBtnImgOver);
@ -3467,6 +3468,7 @@ static int MenuSettingsNetwork()
GuiOptionBrowser optionBrowser(552, 248, &options); GuiOptionBrowser optionBrowser(552, 248, &options);
optionBrowser.SetPosition(0, 108); optionBrowser.SetPosition(0, 108);
optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); optionBrowser.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
optionBrowser.SetCol2Position(275);
HaltGui(); HaltGui();
GuiWindow w(screenwidth, screenheight); GuiWindow w(screenwidth, screenheight);
@ -3521,6 +3523,7 @@ static int MenuSettingsNetwork()
mainWindow->Remove(&optionBrowser); mainWindow->Remove(&optionBrowser);
mainWindow->Remove(&w); mainWindow->Remove(&w);
mainWindow->Remove(&titleTxt); mainWindow->Remove(&titleTxt);
CloseShare();
#endif #endif
return menu; return menu;
} }
@ -3669,22 +3672,22 @@ static void PaletteWindow(const char *name)
blueBoxImg.SetPosition(+50, 0); blueBoxImg.SetPosition(+50, 0);
char shift[10]; char shift[10];
redText = new GuiText(NULL, 22, (GXColor){128, 0, 0, 255}); redText = new GuiText(NULL, 20, (GXColor){128, 0, 0, 255});
redText->SetPosition(-150,0); redText->SetPosition(-150,0);
sprintf(shift, "%2x", redAmount); sprintf(shift, "%2x", redAmount);
redText->SetText(shift); redText->SetText(shift);
greenText = new GuiText(NULL, 22, (GXColor){0, 128, 0, 255}); greenText = new GuiText(NULL, 20, (GXColor){0, 128, 0, 255});
greenText->SetPosition(-50, 0); greenText->SetPosition(-50, 0);
sprintf(shift, "%2x", greenAmount); sprintf(shift, "%2x", greenAmount);
greenText->SetText(shift); greenText->SetText(shift);
blueText = new GuiText(NULL, 22, (GXColor){0, 0, 128, 255}); blueText = new GuiText(NULL, 20, (GXColor){0, 0, 128, 255});
blueText->SetPosition(+50,0); blueText->SetPosition(+50,0);
sprintf(shift, "%2x", blueAmount); sprintf(shift, "%2x", blueAmount);
blueText->SetText(shift); blueText->SetText(shift);
sampleText = new GuiText(NULL, 22, (GXColor){redAmount, greenAmount, blueAmount, 255}); sampleText = new GuiText(NULL, 20, (GXColor){redAmount, greenAmount, blueAmount, 255});
sampleText->SetPosition(+150,0); sampleText->SetPosition(+150,0);
sampleText->SetText(name); sampleText->SetText(name);
@ -3747,7 +3750,7 @@ static int MenuPalette()
int menu = MENU_NONE; int menu = MENU_NONE;
GuiText titleTxt("Palette", 28, (GXColor){255, 255, 255, 255}); GuiText titleTxt("Palette", 26, (GXColor){255, 255, 255, 255});
titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
titleTxt.SetPosition(50,50); titleTxt.SetPosition(50,50);
@ -3965,7 +3968,7 @@ static int MenuPalette()
spr2Btn.SetTrigger(&trigA); spr2Btn.SetTrigger(&trigA);
spr2Btn.SetEffectGrow(); spr2Btn.SetEffectGrow();
GuiText importBtnTxt("Load / Save", 24, (GXColor){0, 0, 0, 255}); GuiText importBtnTxt("Load / Save", 22, (GXColor){0, 0, 0, 255});
importBtnTxt.SetWrap(true, btnOutline.GetWidth()-30); importBtnTxt.SetWrap(true, btnOutline.GetWidth()-30);
GuiImage importBtnImg(&btnOutline); GuiImage importBtnImg(&btnOutline);
GuiImage importBtnImgOver(&btnOutlineOver); GuiImage importBtnImgOver(&btnOutlineOver);
@ -3980,7 +3983,7 @@ static int MenuPalette()
importBtn.SetTrigger(&trigA); importBtn.SetTrigger(&trigA);
importBtn.SetEffectGrow(); importBtn.SetEffectGrow();
GuiText closeBtnTxt("Close", 22, (GXColor){0, 0, 0, 255}); GuiText closeBtnTxt("Close", 20, (GXColor){0, 0, 0, 255});
GuiImage closeBtnImg(&btnCloseOutline); GuiImage closeBtnImg(&btnCloseOutline);
GuiImage closeBtnImgOver(&btnCloseOutlineOver); GuiImage closeBtnImgOver(&btnCloseOutlineOver);
GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight()); GuiButton closeBtn(btnCloseOutline.GetWidth(), btnCloseOutline.GetHeight());
@ -3995,7 +3998,7 @@ static int MenuPalette()
closeBtn.SetTrigger(&trigHome); closeBtn.SetTrigger(&trigHome);
closeBtn.SetEffectGrow(); 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 backBtnImg(&btnOutline);
GuiImage backBtnImgOver(&btnOutlineOver); GuiImage backBtnImgOver(&btnOutlineOver);
GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight()); GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight());

4
source/ngc/networkop.cpp
View File

@ -234,6 +234,7 @@ void CloseShare()
if(networkShareInit) if(networkShareInit)
smbClose("smb"); smbClose("smb");
networkShareInit = false; networkShareInit = false;
isMounted[DEVICE_SMB] = false;
} }
/**************************************************************************** /****************************************************************************
@ -272,9 +273,6 @@ ConnectShare (bool silent)
return false; return false;
} }
if(unmountRequired[DEVICE_SMB])
CloseShare();
if(!networkInit) if(!networkInit)
InitializeNetwork(silent); InitializeNetwork(silent);