The-Homebrew-Cloud/vbagx
2
0
Fork 0
mirror of https://github.com/dborth/vbagx.git synced 2024-11-25 12:06:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

if arguments are passed to the emu to autoboot a game, then the main

Browse Source 
menu button should be labelled Exit, and leave the emu instead of going
back to the main menu. cleanup autoboot code.
This commit is contained in:
Daryl Borth 2018-08-30 10:11:11 -06:00
parent eabe325fb0
commit c64e7a2f70
6 changed files with 118 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/filebrowser.cpp
View File

@ -31,6 +31,10 @@
#include "input.h"
#include "gcunzip.h"
extern "C" {
extern char* strcasestr(const char *, const char *);
}
BROWSERINFO browser;
BROWSERENTRY * browserList = NULL; // list of files/folders in browser
@ -654,3 +658,32 @@ OpenGameList ()
BrowserChangeFolder();
return browser.numEntries;
}
bool AutoloadGame(char* filepath, char* filename) {
ResetBrowser();
selectLoadedFile = 1;
std::string dir(filepath);
dir.assign(&dir[dir.find_last_of(":") + 2]);
strncpy(GCSettings.LoadFolder, dir.c_str(), sizeof(GCSettings.LoadFolder));
OpenGameList();
for(int i = 0; i < browser.numEntries; i++) {
// Skip it
if (strcmp(browserList[i].filename, ".") == 0 || strcmp(browserList[i].filename, "..") == 0) {
continue;
}
if(strcasestr(browserList[i].filename, filename) != NULL) {
browser.selIndex = i;
if(IsSz()) {
BrowserLoadSz();
browser.selIndex = 1;
}
break;
}
}
if(BrowserLoadFile() > 0) {
return true;
}
return false;
}

1
source/filebrowser.h
View File

@ -73,5 +73,6 @@ bool IsDeviceRoot(char * path);
int BrowserLoadSz();
int BrowserChangeFolder();
int BrowserLoadFile();
bool AutoloadGame(char* filepath, char* filename);
#endif

8
source/menu.cpp
View File

@ -1227,6 +1227,9 @@ static int MenuGame()
gameSettingsBtn.SetEffectGrow();
GuiText mainmenuBtnTxt("Main Menu", 22, (GXColor){0, 0, 0, 255});
if(GCSettings.AutoloadGame) {
mainmenuBtnTxt.SetText("Exit");
}
GuiImage mainmenuBtnImg(&btnOutline);
GuiImage mainmenuBtnImgOver(&btnOutlineOver);
GuiButton mainmenuBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
@ -1454,6 +1457,10 @@ static int MenuGame()
gameScreen = NULL;
free(gameScreenPng);
gameScreenPng = NULL;
if(GCSettings.AutoloadGame) {
ExitApp();
}
else {
gameScreenImg = new GuiImage(screenwidth, screenheight, (GXColor){236, 226, 238, 255});
gameScreenImg->ColorStripe(10);
mainWindow->Insert(gameScreenImg, 0);
@ -1464,6 +1471,7 @@ static int MenuGame()
menu = MENU_GAMESELECTION;
}
}
}
else if(closeBtn.GetState() == STATE_CLICKED)
{
menu = MENU_EXIT;

1
source/preferences.cpp
View File

@ -665,6 +665,7 @@ DefaultSettings ()
GCSettings.WiimoteOrientation = 0;
GCSettings.ExitAction = 0;
GCSettings.AutoloadGame = 0;
GCSettings.MusicVolume = 20;
GCSettings.SFXVolume = 40;
GCSettings.Rumble = 1;

95
source/vbagx.cpp
View File

@ -78,26 +78,6 @@ static void ExitCleanup()
void (*PSOReload) () = (void (*)()) 0x80001800;
#endif
void ExitToWiiflow()
{
ShutoffRumble();
SavePrefs(SILENT);
if (ROMLoaded && !ConfigRequested && GCSettings.AutoSave == 1)
SaveBatteryOrStateAuto(FILE_SRAM, SILENT);
ExitCleanup();
if( !!*(u32*)0x80001800 )
{
// Were we launched via HBC? (or via wiiflows stub replacement? :P)
exit(1);
}
else
{
// Wii channel support
SYS_ResetSystem( SYS_RETURNTOMENU, 0, 0 );
}
}
void ExitApp()
{
#ifdef HW_RVL
@ -111,9 +91,22 @@ void ExitApp()
ExitCleanup();
if(ShutdownRequested)
if(ShutdownRequested) {
SYS_ResetSystem(SYS_POWEROFF_STANDBY, 0, 0);
}
else if(GCSettings.AutoloadGame) {
if( !!*(u32*)0x80001800 )
{
// Were we launched via HBC? (or via wiiflows stub replacement? :P)
exit(1);
}
else
{
// Wii channel support
SYS_ResetSystem( SYS_RETURNTOMENU, 0, 0 );
}
}
else {
#ifdef HW_RVL
if(GCSettings.ExitAction == 0) // Auto
{
@ -156,6 +149,7 @@ void ExitApp()
#endif
}
}
}
#ifdef HW_RVL
void ShutdownCB()
@ -399,10 +393,7 @@ int main(int argc, char *argv[])
InitGUIThreads();
bool autoboot = false;
if(argc > 2 && argv[1] != NULL && argv[2] != NULL)
{
autoboot = true;
ResetBrowser();
if(argc > 2 && argv[1] != NULL && argv[2] != NULL) {
LoadPrefs();
if(strcasestr(argv[1], "sd:/") != NULL)
{
@ -415,69 +406,29 @@ int main(int argc, char *argv[])
GCSettings.LoadMethod = DEVICE_USB;
}
SavePrefs(SILENT);
selectLoadedFile = 1;
std::string dir(argv[1]);
dir.assign(&dir[dir.find_last_of(":") + 2]);
char arg_filename[1024];
strncpy(arg_filename, argv[2], sizeof(arg_filename));
strncpy(GCSettings.LoadFolder, dir.c_str(), sizeof(GCSettings.LoadFolder));
OpenGameList();
strncpy(GCSettings.Exit_Dol_File, argc > 3 && argv[3] != NULL ? argv[3] : "", sizeof(GCSettings.Exit_Dol_File));
if(argc > 5 && argv[4] != NULL && argv[5] != NULL)
{
sscanf(argv[4], "%08x", &GCSettings.Exit_Channel[0]);
sscanf(argv[5], "%08x", &GCSettings.Exit_Channel[1]);
}
else
{
GCSettings.Exit_Channel[0] = 0x00010008;
GCSettings.Exit_Channel[1] = 0x57494948;
}
if(argc > 6 && argv[6] != NULL)
strncpy(GCSettings.LoaderName, argv[6], sizeof(GCSettings.LoaderName));
else
snprintf(GCSettings.LoaderName, sizeof(GCSettings.LoaderName), "WiiFlow");
for(int i = 0; i < browser.numEntries; i++)
{
// Skip it
if (strcmp(browserList[i].filename, ".") == 0 || strcmp(browserList[i].filename, "..") == 0)
continue;
if(strcasestr(browserList[i].filename, arg_filename) != NULL)
{
browser.selIndex = i;
if(IsSz())
{
BrowserLoadSz();
browser.selIndex = 1;
}
break;
}
}
BrowserLoadFile();
GCSettings.AutoloadGame = AutoloadGame(argv[1], argv[2]);
autoboot = GCSettings.AutoloadGame;
}
while(1) // main loop
{
if(!autoboot) {
// go back to checking if devices were inserted/removed
// since we're entering the menu
ResumeDeviceThread();
SwitchAudioMode(1);
if(!autoboot)
{
if(!ROMLoaded)
MainMenu(MENU_GAMESELECTION);
else
MainMenu(MENU_GAME);
}
autoboot = false;
ConfigRequested = 0;
ScreenshotRequested = 0;
}
else if(ROMLoaded && autoboot)
autoboot = false;
else
ExitApp();
SwitchAudioMode(0);

5
source/vbagx.h
View File

@ -94,6 +94,7 @@ struct SGCSettings
int Rumble;
int language;
int PreviewImage;
int AutoloadGame;
int OffsetMinutesUTC; // Used for clock on MBC3 and TAMA5
int GBHardware; // Mapped to gbEmulatorType in VBA
@ -109,10 +110,6 @@ struct SGCSettings
char ImageFolder[MAXPATHLEN]; //Saved image folder path
char BorderFolder[MAXPATHLEN]; // Path to Super Game Boy border files
char Exit_Dol_File[MAXPATHLEN]; // Exit Path
char LoaderName[20]; // Menu Loader Name
u32 Exit_Channel[2]; // Exit Channel
char smbip[80];
char smbuser[20];
char smbpwd[20];