mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-30 21:30:04 +00:00 
			
		
		
		
	Merge pull request #116 from archshift/sdmc-dir
Use the citra user path for the sdmc directory
This commit is contained in:
		
						commit
						07af9a587c
					
				
					 4 changed files with 5 additions and 2 deletions
				
			
		|  | @ -52,6 +52,7 @@ | |||
| #define GAMECONFIG_DIR        "game_config" | ||||
| #define MAPS_DIR            "maps" | ||||
| #define CACHE_DIR            "cache" | ||||
| #define SDMC_DIR          "sdmc" | ||||
| #define SHADERCACHE_DIR        "shader_cache" | ||||
| #define STATESAVES_DIR        "state_saves" | ||||
| #define SCREENSHOTS_DIR        "screenShots" | ||||
|  |  | |||
|  | @ -672,6 +672,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new | |||
|         paths[D_GAMECONFIG_IDX]        = paths[D_USER_IDX] + GAMECONFIG_DIR DIR_SEP; | ||||
|         paths[D_MAPS_IDX]            = paths[D_USER_IDX] + MAPS_DIR DIR_SEP; | ||||
|         paths[D_CACHE_IDX]            = paths[D_USER_IDX] + CACHE_DIR DIR_SEP; | ||||
|         paths[D_SDMC_IDX]           = paths[D_USER_IDX] + SDMC_DIR DIR_SEP; | ||||
|         paths[D_SHADERCACHE_IDX]    = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP; | ||||
|         paths[D_SHADERS_IDX]        = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP; | ||||
|         paths[D_STATESAVES_IDX]        = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP; | ||||
|  | @ -712,6 +713,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new | |||
|             paths[D_GAMECONFIG_IDX]        = paths[D_USER_IDX] + GAMECONFIG_DIR DIR_SEP; | ||||
|             paths[D_MAPS_IDX]            = paths[D_USER_IDX] + MAPS_DIR DIR_SEP; | ||||
|             paths[D_CACHE_IDX]            = paths[D_USER_IDX] + CACHE_DIR DIR_SEP; | ||||
|             paths[D_SDMC_IDX]           = paths[D_USER_IDX] + SDMC_DIR DIR_SEP; | ||||
|             paths[D_SHADERCACHE_IDX]    = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP; | ||||
|             paths[D_SHADERS_IDX]        = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP; | ||||
|             paths[D_STATESAVES_IDX]        = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP; | ||||
|  |  | |||
|  | @ -25,6 +25,7 @@ enum { | |||
| 	D_SHADERS_IDX, | ||||
| 	D_STATESAVES_IDX, | ||||
| 	D_SCREENSHOTS_IDX, | ||||
| 	D_SDMC_IDX, | ||||
| 	D_HIRESTEXTURES_IDX, | ||||
| 	D_DUMP_IDX, | ||||
| 	D_DUMPFRAMES_IDX, | ||||
|  |  | |||
|  | @ -394,8 +394,7 @@ void ArchiveInit() { | |||
|     // http://3dbrew.org/wiki/FS:OpenArchive#Archive_idcodes).  Currently the only half-finished
 | ||||
|     // archive type is SDMC, so it is the only one getting exposed.
 | ||||
| 
 | ||||
|     // TODO(Link Mauve): don't assume the path separator is '/'.
 | ||||
|     std::string sdmc_directory = FileUtil::GetCurrentDir() + "/userdata/sdmc"; | ||||
|     std::string sdmc_directory = FileUtil::GetUserPath(D_SDMC_IDX); | ||||
|     auto archive = new FileSys::Archive_SDMC(sdmc_directory); | ||||
|     if (archive->Initialize()) | ||||
|         CreateArchive(archive, "SDMC"); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue