ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Platform: Dirmode is dead

This commit is contained in:
Jeffrey Pfau 2016-01-24 01:04:09 -08:00
parent e5f2dcb5ab
commit bee854bb61
5 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/platform/commandline.c
View File

@ -36,7 +36,6 @@
static const struct option _options[] = { static const struct option _options[] = {
{ "bios", required_argument, 0, 'b' }, { "bios", required_argument, 0, 'b' },
{ "cheats", required_argument, 0, 'c' }, { "cheats", required_argument, 0, 'c' },
{ "dirmode", required_argument, 0, 'D' },
{ "frameskip", required_argument, 0, 's' }, { "frameskip", required_argument, 0, 's' },
#ifdef USE_CLI_DEBUGGER #ifdef USE_CLI_DEBUGGER
{ "debug", no_argument, 0, 'd' }, { "debug", no_argument, 0, 'd' },
@ -56,7 +55,7 @@ static bool _parseGraphicsArg(struct SubParser* parser, struct GBAConfig* config
bool parseArguments(struct GBAArguments* opts, struct GBAConfig* config, int argc, char* const* argv, struct SubParser* subparser) { bool parseArguments(struct GBAArguments* opts, struct GBAConfig* config, int argc, char* const* argv, struct SubParser* subparser) {
int ch; int ch;
char options[64] = char options[64] =
"b:c:Dhl:p:s:v:" "b:c:hl:p:s:v:"
#ifdef USE_CLI_DEBUGGER #ifdef USE_CLI_DEBUGGER
"d" "d"
#endif #endif
@ -86,9 +85,6 @@ bool parseArguments(struct GBAArguments* opts, struct GBAConfig* config, int arg
case 'c': case 'c':
opts->cheatsFile = strdup(optarg); opts->cheatsFile = strdup(optarg);
break; break;
case 'D':
opts->dirmode = true;
break;
#ifdef USE_CLI_DEBUGGER #ifdef USE_CLI_DEBUGGER
case 'd': case 'd':
if (opts->debuggerType != DEBUGGER_NONE) { if (opts->debuggerType != DEBUGGER_NONE) {

1
src/platform/commandline.h
View File

@ -25,7 +25,6 @@ struct GBAArguments {
char* fname; char* fname;
char* patch; char* patch;
char* cheatsFile; char* cheatsFile;
bool dirmode;
char* movie; char* movie;
enum DebuggerType debuggerType; enum DebuggerType debuggerType;

16
src/platform/qt/GameController.cpp
View File

@ -281,26 +281,22 @@ void GameController::setDebugger(ARMDebugger* debugger) {
} }
#endif #endif
void GameController::loadGame(const QString& path, bool dirmode) { void GameController::loadGame(const QString& path) {
closeGame(); closeGame();
if (!dirmode) { QFile file(path);
QFile file(path); if (!file.open(QIODevice::ReadOnly)) {
if (!file.open(QIODevice::ReadOnly)) { postLog(GBA_LOG_ERROR, tr("Failed to open game file: %1").arg(path));
postLog(GBA_LOG_ERROR, tr("Failed to open game file: %1").arg(path)); return;
return;
}
file.close();
} }
file.close();
m_fname = path; m_fname = path;
m_dirmode = dirmode;
openGame(); openGame();
} }
void GameController::bootBIOS() { void GameController::bootBIOS() {
closeGame(); closeGame();
m_fname = QString(); m_fname = QString();
m_dirmode = false;
openGame(true); openGame(true);
} }

3
src/platform/qt/GameController.h
View File

@ -97,7 +97,7 @@ signals:
void postLog(int level, const QString& log); void postLog(int level, const QString& log);
public slots: public slots:
void loadGame(const QString& path, bool dirmode = false); void loadGame(const QString& path);
void loadBIOS(const QString& path); void loadBIOS(const QString& path);
void yankPak(); void yankPak();
void replaceGame(const QString& path); void replaceGame(const QString& path);
@ -180,7 +180,6 @@ private:
int m_logLevels; int m_logLevels;
bool m_gameOpen; bool m_gameOpen;
bool m_dirmode;
QString m_fname; QString m_fname;
QString m_bios; QString m_bios;

2
src/platform/qt/Window.cpp
View File

@ -180,7 +180,7 @@ void Window::argumentsPassed(GBAArguments* args) {
} }
if (args->fname) { if (args->fname) {
m_controller->loadGame(args->fname, args->dirmode); m_controller->loadGame(args->fname);
} }
} }