citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #415 from Dante38490/master 

Loader: Add support for loading NCCH ROMs with the .3DS extension
This commit is contained in:
bunnei 2015-01-04 23:10:04 -05:00
parent 96e6b2aa50 e674aa31af
commit 81e255a411
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra_qt/main.cpp
View File

@ -179,7 +179,7 @@ void GMainWindow::BootGame(std::string filename)
void GMainWindow::OnMenuLoadFile() void GMainWindow::OnMenuLoadFile()
{ {
QString filename = QFileDialog::getOpenFileName(this, tr("Load File"), QString(), tr("3DS executable (*.3dsx *.elf *.axf *.bin *.cci *.cxi)")); QString filename = QFileDialog::getOpenFileName(this, tr("Load File"), QString(), tr("3DS executable (*.3ds *.3dsx *.elf *.axf *.bin *.cci *.cxi)"));
if (filename.size()) if (filename.size())
BootGame(filename.toLatin1().data()); BootGame(filename.toLatin1().data());
} }

2
src/core/loader/loader.cpp
View File

@ -45,6 +45,8 @@ FileType IdentifyFile(const std::string &filename) {
return FileType::CCI; return FileType::CCI;
} else if (extension == ".bin") { } else if (extension == ".bin") {
return FileType::BIN; return FileType::BIN;
} else if (extension == ".3ds") {
return FileType::CCI;
} else if (extension == ".3dsx") { } else if (extension == ".3dsx") {
return FileType::THREEDSX; return FileType::THREEDSX;
} }