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 #721 from lioncash/netplay-unused-param 

Core: Kill off an unused parameter for NetPlayServer::StartGame
This commit is contained in:
Lioncash 2014-08-02 18:31:38 -04:00
parent a77d397312 44a157fc09
commit 0bcebd81f6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -535,7 +535,7 @@ void NetPlayServer::SetNetSettings(const NetSettings &settings)
} }
// called from ---GUI--- thread // called from ---GUI--- thread
bool NetPlayServer::StartGame(const std::string &path) bool NetPlayServer::StartGame()
{ {
std::lock_guard<std::recursive_mutex> lkg(m_crit.game); std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
m_current_game = Common::Timer::GetTimeMs(); m_current_game = Common::Timer::GetTimeMs();

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

@ -31,7 +31,7 @@ public:
void SetNetSettings(const NetSettings &settings); void SetNetSettings(const NetSettings &settings);
bool StartGame(const std::string &path); bool StartGame();
void GetPadMapping(PadMapping map[]); void GetPadMapping(PadMapping map[]);
void SetPadMapping(const PadMapping map[]); void SetPadMapping(const PadMapping map[]);

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

@ -468,7 +468,7 @@ void NetPlayDiag::OnStart(wxCommandEvent&)
NetSettings settings; NetSettings settings;
GetNetSettings(settings); GetNetSettings(settings);
netplay_server->SetNetSettings(settings); netplay_server->SetNetSettings(settings);
netplay_server->StartGame(FindGame()); netplay_server->StartGame();
} }
void NetPlayDiag::BootGame(const std::string& filename) void NetPlayDiag::BootGame(const std::string& filename)