The-Homebrew-Cloud/vbagx
2
0
Fork 0
mirror of https://github.com/dborth/vbagx.git synced 2025-02-16 18:59:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert some unnecessary changes

Browse Source
This commit is contained in:
Daryl Borth 2016-06-25 14:08:01 -06:00
parent 82208a31d1
commit f2e2ce7314
2 changed files with 38 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
readme.txt
View File

@ -38,7 +38,7 @@ https://github.com/dborth/vbagx/releases
|0O×øo· UPDATE HISTORY ·oø×O0| |0O×øo· UPDATE HISTORY ·oø×O0|
`¨•¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨' `¨•¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨ ¨¨¨¨¨¨¨¨¨¨¨¨¨'
[2.3.3] - Zopenko [2.3.3]
* fixes the gc pad down on file browser * fixes the gc pad down on file browser
* added koston default green gb color screen * added koston default green gb color screen

85
source/menu.cpp
View File

@ -43,15 +43,15 @@
GuiImageData * pointer[4]; GuiImageData * pointer[4];
#endif #endif
//#ifdef HW_RVL #ifdef HW_RVL
// #include "mem2.h" #include "mem2.h"
//
// #define MEM_ALLOC(A) (u8*)mem2_malloc(A) #define MEM_ALLOC(A) (u8*)mem2_malloc(A)
// #define MEM_DEALLOC(A) mem2_free(A) #define MEM_DEALLOC(A) mem2_free(A)
//#else #else
#define MEM_ALLOC(A) (u8*)memalign(32, A) #define MEM_ALLOC(A) (u8*)memalign(32, A)
#define MEM_DEALLOC(A) free(A) #define MEM_DEALLOC(A) free(A)
//#endif #endif
static GuiTrigger * trigA = NULL; static GuiTrigger * trigA = NULL;
static GuiTrigger * trig2 = NULL; static GuiTrigger * trig2 = NULL;
@ -67,7 +67,7 @@ static GuiSound * exitSound = NULL;
static GuiWindow * mainWindow = NULL; static GuiWindow * mainWindow = NULL;
static GuiText * settingText = NULL; static GuiText * settingText = NULL;
static GuiText * settingText2 = NULL; static GuiText * settingText2 = NULL;
//static int lastMenu = MENU_NONE; static int lastMenu = MENU_NONE;
static int mapMenuCtrl = 0; static int mapMenuCtrl = 0;
static int wiiuproCtrl = 0; static int wiiuproCtrl = 0;
@ -1110,7 +1110,7 @@ extern char DebugStr[50];
* *
* Menu displayed when returning to the menu from in-game. * Menu displayed when returning to the menu from in-game.
***************************************************************************/ ***************************************************************************/
static int MenuGame(int lastMenu) static int MenuGame()
{ {
int menu = MENU_NONE; int menu = MENU_NONE;
@ -1929,7 +1929,7 @@ static int MenuGameSettings()
wiiControlsBtn.SetTrigger(trig2); wiiControlsBtn.SetTrigger(trig2);
wiiControlsBtn.SetEffectGrow(); wiiControlsBtn.SetEffectGrow();
GuiText screenshotBtnTxt("ScreenShot", 22, (GXColor){0, 0, 0, 255}); GuiText screenshotBtnTxt("Screenshot", 22, (GXColor){0, 0, 0, 255});
GuiImage screenshotBtnImg(&btnLargeOutline); GuiImage screenshotBtnImg(&btnLargeOutline);
GuiImage screenshotBtnImgOver(&btnLargeOutlineOver); GuiImage screenshotBtnImgOver(&btnLargeOutlineOver);
GuiImage screenshotBtnIcon(&iconScreenshot); GuiImage screenshotBtnIcon(&iconScreenshot);
@ -3181,7 +3181,7 @@ static int MenuSettingsEmulation()
/**************************************************************************** /****************************************************************************
* MenuSettings * MenuSettings
***************************************************************************/ ***************************************************************************/
static int MenuSettings(GuiTrigger *trigAptr,GuiTrigger *trig2ptr) static int MenuSettings()
{ {
int menu = MENU_NONE; int menu = MENU_NONE;
@ -3219,8 +3219,8 @@ static int MenuSettings(GuiTrigger *trigAptr,GuiTrigger *trig2ptr)
savingBtn.SetIcon(&fileBtnIcon); savingBtn.SetIcon(&fileBtnIcon);
savingBtn.SetSoundOver(&btnSoundOver); savingBtn.SetSoundOver(&btnSoundOver);
savingBtn.SetSoundClick(&btnSoundClick); savingBtn.SetSoundClick(&btnSoundClick);
savingBtn.SetTrigger(trigAptr); savingBtn.SetTrigger(trigA);
savingBtn.SetTrigger(trig2ptr); savingBtn.SetTrigger(trig2);
savingBtn.SetEffectGrow(); savingBtn.SetEffectGrow();
GuiText menuBtnTxt("Menu", 22, (GXColor){0, 0, 0, 255}); GuiText menuBtnTxt("Menu", 22, (GXColor){0, 0, 0, 255});
@ -3237,8 +3237,8 @@ static int MenuSettings(GuiTrigger *trigAptr,GuiTrigger *trig2ptr)
menuBtn.SetIcon(&menuBtnIcon); menuBtn.SetIcon(&menuBtnIcon);
menuBtn.SetSoundOver(&btnSoundOver); menuBtn.SetSoundOver(&btnSoundOver);
menuBtn.SetSoundClick(&btnSoundClick); menuBtn.SetSoundClick(&btnSoundClick);
menuBtn.SetTrigger(trigAptr); menuBtn.SetTrigger(trigA);
menuBtn.SetTrigger(trig2ptr); menuBtn.SetTrigger(trig2);
menuBtn.SetEffectGrow(); menuBtn.SetEffectGrow();
GuiText networkBtnTxt("Network", 22, (GXColor){0, 0, 0, 255}); GuiText networkBtnTxt("Network", 22, (GXColor){0, 0, 0, 255});
@ -3255,8 +3255,8 @@ static int MenuSettings(GuiTrigger *trigAptr,GuiTrigger *trig2ptr)
networkBtn.SetIcon(&networkBtnIcon); networkBtn.SetIcon(&networkBtnIcon);
networkBtn.SetSoundOver(&btnSoundOver); networkBtn.SetSoundOver(&btnSoundOver);
networkBtn.SetSoundClick(&btnSoundClick); networkBtn.SetSoundClick(&btnSoundClick);
networkBtn.SetTrigger(trigAptr); networkBtn.SetTrigger(trigA);
networkBtn.SetTrigger(trig2ptr); networkBtn.SetTrigger(trig2);
networkBtn.SetEffectGrow(); networkBtn.SetEffectGrow();
GuiText emulationBtnTxt("Emulation", 22, (GXColor){0, 0, 0, 255}); GuiText emulationBtnTxt("Emulation", 22, (GXColor){0, 0, 0, 255});
@ -3286,8 +3286,8 @@ static int MenuSettings(GuiTrigger *trigAptr,GuiTrigger *trig2ptr)
backBtn.SetImageOver(&backBtnImgOver); backBtn.SetImageOver(&backBtnImgOver);
backBtn.SetSoundOver(&btnSoundOver); backBtn.SetSoundOver(&btnSoundOver);
backBtn.SetSoundClick(&btnSoundClick); backBtn.SetSoundClick(&btnSoundClick);
backBtn.SetTrigger(trigAptr); backBtn.SetTrigger(trigA);
backBtn.SetTrigger(trig2ptr);; backBtn.SetTrigger(trig2);
backBtn.SetEffectGrow(); backBtn.SetEffectGrow();
GuiText resetBtnTxt("Reset Settings", 22, (GXColor){0, 0, 0, 255}); GuiText resetBtnTxt("Reset Settings", 22, (GXColor){0, 0, 0, 255});
@ -3301,8 +3301,8 @@ static int MenuSettings(GuiTrigger *trigAptr,GuiTrigger *trig2ptr)
resetBtn.SetImageOver(&resetBtnImgOver); resetBtn.SetImageOver(&resetBtnImgOver);
resetBtn.SetSoundOver(&btnSoundOver); resetBtn.SetSoundOver(&btnSoundOver);
resetBtn.SetSoundClick(&btnSoundClick); resetBtn.SetSoundClick(&btnSoundClick);
resetBtn.SetTrigger(trigAptr); resetBtn.SetTrigger(trigA);
resetBtn.SetTrigger(trig2ptr); resetBtn.SetTrigger(trig2);
resetBtn.SetEffectGrow(); resetBtn.SetEffectGrow();
HaltGui(); HaltGui();
@ -3449,26 +3449,22 @@ static int MenuSettingsFile()
break; break;
case 4: case 4:
OnScreenKeyboard(GCSettings.CheatFolder, MAXPATHLEN);
break;
case 5:
OnScreenKeyboard(GCSettings.ScreenshotsFolder, MAXPATHLEN); OnScreenKeyboard(GCSettings.ScreenshotsFolder, MAXPATHLEN);
break; break;
case 6: case 5:
GCSettings.AutoLoad++; GCSettings.AutoLoad++;
if (GCSettings.AutoLoad > 2) if (GCSettings.AutoLoad > 2)
GCSettings.AutoLoad = 0; GCSettings.AutoLoad = 0;
break; break;
case 7: case 6:
GCSettings.AutoSave++; GCSettings.AutoSave++;
if (GCSettings.AutoSave > 3) if (GCSettings.AutoSave > 3)
GCSettings.AutoSave = 0; GCSettings.AutoSave = 0;
break; break;
case 8: case 7:
GCSettings.AppendAuto++; GCSettings.AppendAuto++;
if (GCSettings.AppendAuto > 1) if (GCSettings.AppendAuto > 1)
GCSettings.AppendAuto = 0; GCSettings.AppendAuto = 0;
@ -3533,20 +3529,19 @@ static int MenuSettingsFile()
snprintf (options.value[2], 35, "%s", GCSettings.LoadFolder); snprintf (options.value[2], 35, "%s", GCSettings.LoadFolder);
snprintf (options.value[3], 35, "%s", GCSettings.SaveFolder); snprintf (options.value[3], 35, "%s", GCSettings.SaveFolder);
//snprintf (options.value[4], 30, "%s", GCSettings.CheatFolder); snprintf (options.value[4], 35, "%s", GCSettings.ScreenshotsFolder);
snprintf (options.value[5], 35, "%s", GCSettings.ScreenshotsFolder);
if (GCSettings.AutoLoad == 0) sprintf (options.value[6],"Off"); if (GCSettings.AutoLoad == 0) sprintf (options.value[5],"Off");
else if (GCSettings.AutoLoad == 1) sprintf (options.value[6],"SRAM"); else if (GCSettings.AutoLoad == 1) sprintf (options.value[5],"SRAM");
else if (GCSettings.AutoLoad == 2) sprintf (options.value[6],"Snapshot"); else if (GCSettings.AutoLoad == 2) sprintf (options.value[5],"Snapshot");
if (GCSettings.AutoSave == 0) sprintf (options.value[7],"Off"); if (GCSettings.AutoSave == 0) sprintf (options.value[6],"Off");
else if (GCSettings.AutoSave == 1) sprintf (options.value[7],"SRAM"); else if (GCSettings.AutoSave == 1) sprintf (options.value[6],"SRAM");
else if (GCSettings.AutoSave == 2) sprintf (options.value[7],"Snapshot"); else if (GCSettings.AutoSave == 2) sprintf (options.value[6],"Snapshot");
else if (GCSettings.AutoSave == 3) sprintf (options.value[7],"Both"); else if (GCSettings.AutoSave == 3) sprintf (options.value[6],"Both");
if (GCSettings.AppendAuto == 0) sprintf (options.value[8],"Off"); if (GCSettings.AppendAuto == 0) sprintf (options.value[7],"Off");
else if (GCSettings.AppendAuto == 1) sprintf (options.value[8],"On"); else if (GCSettings.AppendAuto == 1) sprintf (options.value[7],"On");
optionBrowser.TriggerUpdate(); optionBrowser.TriggerUpdate();
} }
@ -4556,10 +4551,8 @@ MainMenu (int menu)
{ {
static bool init = false; static bool init = false;
int currentMenu = menu; int currentMenu = menu;
//lastMenu = MENU_NONE; lastMenu = MENU_NONE;
int lastMenu = MENU_NONE; /* local variable here fixes devkitppc r27 crash */
GuiTrigger *trigAptr, *trig2ptr; /* local variable here fixes devkitppc r27 crash */
if(!init) if(!init)
{ {
init = true; init = true;
@ -4584,7 +4577,6 @@ MainMenu (int menu)
gameScreenImg = new GuiImage(gameScreen); gameScreenImg = new GuiImage(gameScreen);
gameScreenImg->SetAlpha(192); gameScreenImg->SetAlpha(192);
gameScreenImg->ColorStripe(30); gameScreenImg->ColorStripe(30);
gameScreenImg->SetScaleX(screenwidth/(float)vmode->fbWidth); gameScreenImg->SetScaleX(screenwidth/(float)vmode->fbWidth);
gameScreenImg->SetScaleY(screenheight/(float)vmode->efbHeight); gameScreenImg->SetScaleY(screenheight/(float)vmode->efbHeight);
} }
@ -4626,9 +4618,6 @@ MainMenu (int menu)
mainWindow->Append(bgBottomImg); mainWindow->Append(bgBottomImg);
mainWindow->Append(btnLogo); mainWindow->Append(btnLogo);
trigAptr = trigA;
trig2ptr = trig2;
if(currentMenu == MENU_GAMESELECTION) if(currentMenu == MENU_GAMESELECTION)
ResumeGui(); ResumeGui();
@ -4674,7 +4663,7 @@ MainMenu (int menu)
currentMenu = MenuGameSelection(); currentMenu = MenuGameSelection();
break; break;
case MENU_GAME: case MENU_GAME:
currentMenu = MenuGame(lastMenu); currentMenu = MenuGame();
break; break;
case MENU_GAME_LOAD: case MENU_GAME_LOAD:
currentMenu = MenuGameSaves(0); currentMenu = MenuGameSaves(0);
@ -4698,7 +4687,7 @@ MainMenu (int menu)
currentMenu = MenuPalette(); currentMenu = MenuPalette();
break; break;
case MENU_SETTINGS: case MENU_SETTINGS:
currentMenu = MenuSettings(trigAptr,trig2ptr); currentMenu = MenuSettings();
break; break;
case MENU_SETTINGS_FILE: case MENU_SETTINGS_FILE:
currentMenu = MenuSettingsFile(); currentMenu = MenuSettingsFile();