diff options
author | David Marcec <dmarcecguzman@gmail.com> | 2018-08-11 10:35:47 +1000 |
---|---|---|
committer | David Marcec <dmarcecguzman@gmail.com> | 2018-08-11 10:35:47 +1000 |
commit | b76ddb7647cbb390cce4143d91a1db171b0fa503 (patch) | |
tree | a6e2e334e82b035923c41458150604dd5fb31d65 /src/core/loader/loader.cpp | |
parent | 2a3b335b156552515e28f62df2617d06c241a29a (diff) | |
parent | 0a003efde4b86c235355d11c93f5d315bdb4728d (diff) |
Merge remote-tracking branch 'origin/master' into better-account
Diffstat (limited to 'src/core/loader/loader.cpp')
-rw-r--r-- | src/core/loader/loader.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 57e6c0365..a288654df 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp @@ -43,10 +43,6 @@ FileType IdentifyFile(FileSys::VirtualFile file) { return FileType::Unknown; } -FileType IdentifyFile(const std::string& file_name) { - return IdentifyFile(std::make_shared<FileSys::RealVfsFile>(file_name)); -} - FileType GuessFromFilename(const std::string& name) { if (name == "main") return FileType::DeconstructedRomDirectory; @@ -68,7 +64,7 @@ FileType GuessFromFilename(const std::string& name) { return FileType::Unknown; } -const char* GetFileTypeString(FileType type) { +std::string GetFileTypeString(FileType type) { switch (type) { case FileType::ELF: return "ELF"; |