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

Merge pull request #2922 from aserna3/SDBlock 

Implemented ability to block writes to the SD card
This commit is contained in:
Scott Mansell 2015-08-31 04:51:50 +12:00
parent fe1c6cba36 db7fe9507e
commit 368867dba0
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/BootManager.cpp
View File

@ -242,7 +242,7 @@ bool BootCore(const std::string& _rFilename)
{
StartUp.bCPUThread = g_NetPlaySettings.m_CPUthread;
StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE;
StartUp.bEnableMemcardSaving = g_NetPlaySettings.m_WriteToMemcard;
StartUp.bEnableMemcardSdWriting = g_NetPlaySettings.m_WriteToMemcard;
StartUp.iCPUCore = g_NetPlaySettings.m_CPUcore;
StartUp.SelectedLanguage = g_NetPlaySettings.m_SelectedLanguage;
StartUp.bOverrideGCLanguage = g_NetPlaySettings.m_OverrideGCLanguage;

4
Source/Core/Core/ConfigManager.cpp
View File

@ -39,7 +39,7 @@ SConfig::SConfig()
bCPUThread(true), bDSPThread(false), bDSPHLE(true),
bSkipIdle(true), bSyncGPUOnSkipIdleHack(true), bNTSC(false), bForceNTSCJ(false),
bHLE_BS2(true), bEnableCheats(false),
bEnableMemcardSaving(true),
bEnableMemcardSdWriting(true),
bDPL2Decoder(false), iLatency(14),
bRunCompareServer(false), bRunCompareClient(false),
bMMU(false), bDCBZOFF(false),
@ -605,7 +605,7 @@ void SConfig::LoadDefaults()
iBBDumpPort = -1;
bSyncGPU = false;
bFastDiscSpeed = false;
bEnableMemcardSaving = true;
bEnableMemcardSdWriting = true;
SelectedLanguage = 0;
bOverrideGCLanguage = false;
bWii = false;

2
Source/Core/Core/ConfigManager.h
View File

@ -87,7 +87,7 @@ struct SConfig : NonCopyable
bool bForceNTSCJ;
bool bHLE_BS2;
bool bEnableCheats;
bool bEnableMemcardSaving;
bool bEnableMemcardSdWriting;
bool bDPL2Decoder;
int iLatency;

2
Source/Core/Core/HW/GCMemcardDirectory.cpp
View File

@ -186,7 +186,7 @@ GCMemcardDirectory::GCMemcardDirectory(const std::string& directory, int slot, u
void GCMemcardDirectory::FlushThread()
{
if (!SConfig::GetInstance().bEnableMemcardSaving)
if (!SConfig::GetInstance().bEnableMemcardSdWriting)
{
return;
}

2
Source/Core/Core/HW/GCMemcardRaw.cpp
View File

@ -63,7 +63,7 @@ MemoryCard::~MemoryCard()
void MemoryCard::FlushThread()
{
if (!SConfig::GetInstance().bEnableMemcardSaving)
if (!SConfig::GetInstance().bEnableMemcardSdWriting)
{
return;
}

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

@ -423,7 +423,7 @@ u32 CWII_IPC_HLE_Device_sdio_slot0::ExecuteCommand(u32 _BufferIn, u32 _BufferInS
DEBUG_LOG(WII_IPC_SD, "%sWrite %i Block(s) from 0x%08x bsize %i to offset 0x%08x!",
req.isDMA ? "DMA " : "", req.blocks, req.addr, req.bsize, req.arg);
if (m_Card)
if (m_Card && SConfig::GetInstance().bEnableMemcardSdWriting)
{
u32 size = req.bsize * req.blocks;

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

@ -202,7 +202,7 @@ NetPlayDialog::NetPlayDialog(wxWindow* const parent, const CGameListCtrl* const
padbuf_spin->Bind(wxEVT_SPINCTRL, &NetPlayDialog::OnAdjustBuffer, this);
bottom_szr->Add(padbuf_spin, 0, wxCENTER);
m_memcard_write = new wxCheckBox(panel, wxID_ANY, _("Write memcards (GC)"));
m_memcard_write = new wxCheckBox(panel, wxID_ANY, _("Write memcards/SD"));
bottom_szr->Add(m_memcard_write, 0, wxCENTER);
}