piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 23:29:44 -06:00
Code Issues Packages Projects Releases 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
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(); DoRecordingSave();
if(Movie::IsPlayingInput() || Movie::IsRecordingInput()) if(Movie::IsPlayingInput() || Movie::IsRecordingInput())
Movie::EndPlayInput(false); Movie::EndPlayInput(false);
NetPlay::StopGame();
wxBeginBusyCursor(); wxBeginBusyCursor();
BootManager::Stop(); BootManager::Stop();

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

@ -432,7 +432,7 @@ void NetPlayDiag::OnStart(wxCommandEvent&)
void NetPlayDiag::OnStop(wxCommandEvent&) void NetPlayDiag::OnStop(wxCommandEvent&)
{ {
netplay_server->StopGame(); NetPlay::StopGame();
} }
void NetPlayDiag::BootGame(const std::string& filename) void NetPlayDiag::BootGame(const std::string& filename)
@ -661,3 +661,11 @@ void PadMapDiag::OnAdjust(wxCommandEvent& event)
for (unsigned int i=0; i<4; ++i) for (unsigned int i=0; i<4; ++i)
m_mapping[i] = m_map_cbox[i]->GetSelection() - 1; 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; int* const m_mapping;
}; };
namespace NetPlay
{
void StopGame();
}
#endif // _NETWINDOW_H_ #endif // _NETWINDOW_H_