diff options
| author | 2015-01-05 04:39:42 +0100 | |
|---|---|---|
| committer | 2015-01-05 04:39:42 +0100 | |
| commit | 35a085d567d3c64163b1d3316c2a481a0fb0b9dd (patch) | |
| tree | 7833f622204dad4f7c0aef1705e7bbadea521d72 /src | |
| parent | Merge pull request #386 from archshift/y2ru (diff) | |
| download | yuzu-35a085d567d3c64163b1d3316c2a481a0fb0b9dd.tar.gz yuzu-35a085d567d3c64163b1d3316c2a481a0fb0b9dd.tar.xz yuzu-35a085d567d3c64163b1d3316c2a481a0fb0b9dd.zip | |
Add support load 3DS room
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/main.cpp | 2 | ||||
| -rw-r--r-- | src/core/loader/loader.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
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) | |||
| 179 | 179 | ||
| 180 | void GMainWindow::OnMenuLoadFile() | 180 | void GMainWindow::OnMenuLoadFile() |
| 181 | { | 181 | { |
| 182 | QString filename = QFileDialog::getOpenFileName(this, tr("Load File"), QString(), tr("3DS executable (*.3dsx *.elf *.axf *.bin *.cci *.cxi)")); | 182 | QString filename = QFileDialog::getOpenFileName(this, tr("Load File"), QString(), tr("3DS executable (*.3ds *.3dsx *.elf *.axf *.bin *.cci *.cxi)")); |
| 183 | if (filename.size()) | 183 | if (filename.size()) |
| 184 | BootGame(filename.toLatin1().data()); | 184 | BootGame(filename.toLatin1().data()); |
| 185 | } | 185 | } |
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) { | |||
| 45 | return FileType::CCI; | 45 | return FileType::CCI; |
| 46 | } else if (extension == ".bin") { | 46 | } else if (extension == ".bin") { |
| 47 | return FileType::BIN; | 47 | return FileType::BIN; |
| 48 | } else if (extension == ".3ds") { | ||
| 49 | return FileType::CCI; | ||
| 48 | } else if (extension == ".3dsx") { | 50 | } else if (extension == ".3dsx") { |
| 49 | return FileType::THREEDSX; | 51 | return FileType::THREEDSX; |
| 50 | } | 52 | } |