From 35a085d567d3c64163b1d3316c2a481a0fb0b9dd Mon Sep 17 00:00:00 2001
From: Dante38490 <dante38@free.fr>
Date: Mon, 5 Jan 2015 04:39:42 +0100
Subject: [PATCH 1/2] Add support load 3DS room
---
src/citra_qt/main.cpp | 2 +-
src/core/loader/loader.cpp | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 88f959d9a..64e389f25 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -179,7 +179,7 @@ void GMainWindow::BootGame(std::string filename)
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())
BootGame(filename.toLatin1().data());
}
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index 87580cb2a..ab4374307 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -45,6 +45,8 @@ FileType IdentifyFile(const std::string &filename) {
return FileType::CCI;
} else if (extension == ".bin") {
return FileType::BIN;
+ } else if (extension == ".3ds") {
+ return FileType::CCI;
} else if (extension == ".3dsx") {
return FileType::THREEDSX;
}
From e674aa31af37800bee12fa00f853895085a6c201 Mon Sep 17 00:00:00 2001
From: Dante38490 <dante38@free.fr>
Date: Mon, 5 Jan 2015 04:45:09 +0100
Subject: [PATCH 2/2] Fix correct espace
---
src/core/loader/loader.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index ab4374307..45cf425df 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -45,8 +45,8 @@ FileType IdentifyFile(const std::string &filename) {
return FileType::CCI;
} else if (extension == ".bin") {
return FileType::BIN;
- } else if (extension == ".3ds") {
- return FileType::CCI;
+ } else if (extension == ".3ds") {
+ return FileType::CCI;
} else if (extension == ".3dsx") {
return FileType::THREEDSX;
}