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 #3417 from aserna3/remove_salt_button 

[Netplay] Disabled loading savestates
This commit is contained in:
Ryan Houdek 2016-01-01 04:02:43 -05:00
parent 552ea58bf5 42c38cbbd3
commit 454ebb7150
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/Core/State.cpp
View File

@ -20,6 +20,7 @@
#include "Core/CoreTiming.h"
#include "Core/Host.h"
#include "Core/Movie.h"
#include "Core/NetPlayClient.h"
#include "Core/State.h"
#include "Core/HW/CPU.h"
#include "Core/HW/DSP.h"
@ -31,6 +32,7 @@
#include "Core/PowerPC/JitCommon/JitBase.h"
#include "VideoCommon/AVIDump.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/VideoBackendBase.h"
namespace State
@ -198,6 +200,12 @@ static std::string DoState(PointerWrap& p)
void LoadFromBuffer(std::vector<u8>& buffer)
{
if (NetPlay::IsNetPlayRunning())
{
OSD::AddMessage("Loading savestates is disabled in Netplay to prevent desyncs");
return;
}
bool wasUnpaused = Core::PauseAndLock(true);
u8* ptr = &buffer[0];
@ -531,7 +539,14 @@ static void LoadFileStateData(const std::string& filename, std::vector<u8>& ret_
void LoadAs(const std::string& filename)
{
if (!Core::IsRunning())
{
return;
}
else if (NetPlay::IsNetPlayRunning())
{
OSD::AddMessage("Loading savestates is disabled in Netplay to prevent desyncs");
return;
}
// Stop the core while we load the state
bool wasUnpaused = Core::PauseAndLock(true);