ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add Wii sdcard to CommonPaths

This commit is contained in:
Aestek 2016-07-16 21:40:19 +02:00
parent 51c77e8eea
commit 9c5b546e2e
6 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/CommonPaths.h
View File

@ -118,6 +118,8 @@
#define WII_STATE "state.dat"
#define WII_SDCARD "sd.raw"
#define WII_SETTING "setting.txt"
#define GECKO_CODE_HANDLER "codehandler.bin"

1
Source/Core/Common/FileUtil.cpp
View File

@ -798,6 +798,7 @@ static void RebuildUserDirectories(unsigned int dir_index)
s_user_paths[F_ARAMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + ARAM_DUMP;
s_user_paths[F_FAKEVMEMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
s_user_paths[F_GCSRAM_IDX] = s_user_paths[D_GCUSER_IDX] + GC_SRAM;
s_user_paths[F_WIISDCARD_IDX] = s_user_paths[D_WIIROOT_IDX] + DIR_SEP WII_SDCARD;
s_user_paths[D_MEMORYWATCHER_IDX] = s_user_paths[D_USER_IDX] + MEMORYWATCHER_DIR DIR_SEP;
s_user_paths[F_MEMORYWATCHERLOCATIONS_IDX] =

1
Source/Core/Common/FileUtil.h
View File

@ -55,6 +55,7 @@ enum
F_GCSRAM_IDX,
F_MEMORYWATCHERLOCATIONS_IDX,
F_MEMORYWATCHERSOCKET_IDX,
F_WIISDCARD_IDX,
NUM_PATH_INDICES
};

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
View File

@ -62,7 +62,7 @@ void CWII_IPC_HLE_Device_sdio_slot0::EventNotify()
void CWII_IPC_HLE_Device_sdio_slot0::OpenInternal()
{
const std::string filename = File::GetUserPath(D_WIIROOT_IDX) + "/sd.raw";
const std::string filename = File::GetUserPath(F_WIISDCARD_IDX);
m_Card.Open(filename, "r+b");
if (!m_Card)
{

5
Source/Core/Core/NetPlayClient.cpp
View File

@ -9,6 +9,7 @@
#include <memory>
#include <thread>
#include "Common/Common.h"
#include "Common/CommonPaths.h"
#include "Common/CommonTypes.h"
#include "Common/ENetUtil.h"
#include "Common/MD5.h"
@ -1261,8 +1262,8 @@ void NetPlayClient::ComputeMD5(const std::string& file_identifier)
m_should_compute_MD5 = true;
std::string file;
if (file_identifier == "sd.raw")
file = File::GetUserPath(D_WIIROOT_IDX) + "/sd.raw";
if (file_identifier == WII_SDCARD)
file = File::GetUserPath(F_WIISDCARD_IDX);
else
file = m_dialog->FindGame(file_identifier);

3
Source/Core/DolphinWX/NetPlay/NetWindow.cpp
View File

@ -24,6 +24,7 @@
#include <wx/string.h>
#include <wx/textctrl.h>
#include "Common/CommonPaths.h"
#include "Common/CommonTypes.h"
#include "Common/FifoQueue.h"
#include "Common/FileUtil.h"
@ -563,7 +564,7 @@ void NetPlayDialog::OnMD5ComputeRequested(wxCommandEvent&)
break;
case MD5Target::SdCard:
file_identifier = "sd.raw";
file_identifier = WII_SDCARD;
break;
default: