Merge pull request #721 from lioncash/netplay-unused-param

Core: Kill off an unused parameter for NetPlayServer::StartGame
dolphin-emu · Aug 2, 2014 · 0bcebd8 · 0bcebd8
2 parents a77d397 + 44a157f
commit 0bcebd8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
@@ -535,7 +535,7 @@ void NetPlayServer::SetNetSettings(const NetSettings &settings)
 }
 
 // called from ---GUI--- thread
-bool NetPlayServer::StartGame(const std::string &path)
+bool NetPlayServer::StartGame()
 {
 	std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
 	m_current_game = Common::Timer::GetTimeMs();

diff --git a/Source/Core/Core/NetPlayServer.h b/Source/Core/Core/NetPlayServer.h
@@ -31,7 +31,7 @@ class NetPlayServer
 
 	void SetNetSettings(const NetSettings &settings);
 
-	bool StartGame(const std::string &path);
+	bool StartGame();
 
 	void GetPadMapping(PadMapping map[]);
 	void SetPadMapping(const PadMapping map[]);

diff --git a/Source/Core/DolphinWX/NetWindow.cpp b/Source/Core/DolphinWX/NetWindow.cpp
@@ -468,7 +468,7 @@ void NetPlayDiag::OnStart(wxCommandEvent&)
 	NetSettings settings;
 	GetNetSettings(settings);
 	netplay_server->SetNetSettings(settings);
-	netplay_server->StartGame(FindGame());
+	netplay_server->StartGame();
 }
 
 void NetPlayDiag::BootGame(const std::string& filename)