archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 11:51:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

NetPlay: Allow hosts to stop the game by closing the game window

Browse source
This commit is contained in:
Jasper St. Pierre 2013-08-14 17:50:21 -04:00
parent 92f8d79574
commit 5241deaebe
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Source/Core/DolphinWX/Src/FrameTools.cpp
View file

@ -1049,6 +1049,7 @@ void CFrame::DoStop()
DoRecordingSave();
if(Movie::IsPlayingInput() || Movie::IsRecordingInput())
Movie::EndPlayInput(false);
NetPlay::StopGame();
wxBeginBusyCursor();
BootManager::Stop();

10
Source/Core/DolphinWX/Src/NetWindow.cpp
View file

@ -432,7 +432,7 @@ void NetPlayDiag::OnStart(wxCommandEvent&)
void NetPlayDiag::OnStop(wxCommandEvent&)
{
netplay_server->StopGame();
NetPlay::StopGame();
}
void NetPlayDiag::BootGame(const std::string& filename)
@ -661,3 +661,11 @@ void PadMapDiag::OnAdjust(wxCommandEvent& event)
for (unsigned int i=0; i<4; ++i)
m_mapping[i] = m_map_cbox[i]->GetSelection() - 1;
}
void NetPlay::StopGame()
{
if (netplay_server != NULL)
netplay_server->StopGame();
// TODO: allow non-hosting clients to close the window
}

5
Source/Core/DolphinWX/Src/NetWindow.h
View file

@ -133,5 +133,10 @@ private:
int* const m_mapping;
};
namespace NetPlay
{
void StopGame();
}
#endif // _NETWINDOW_H_