diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2010-05-02 04:24:49 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2010-05-02 04:24:49 +0000 |
| commit | 533162b41ffaf7efc5c2907b9c940752f7f53d06 (patch) | |
| tree | 3aecea061ec912e06c858ab24511306f9518f5d0 /Source/Core/DolphinWX/Src/NetWindow.cpp | |
| parent | b2e0dc25193352ba5b3585f0e5efe57151c5ffa7 (diff) | |
NetPlay: Fixed a problem with client game start code. Other minor fixes.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5427 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DolphinWX/Src/NetWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/NetWindow.cpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index 242b49f323..1470a90ec1 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -67,8 +67,11 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* parent, const CGameListCtrl* const _connect_macro_(connect_btn, NetPlaySetupDiag::OnJoin, wxEVT_COMMAND_BUTTON_CLICKED, this); wxStaticText* const alert_lbl = new wxStaticText(connect_tab, wxID_ANY - , wxT("ALERT:\n\nNetPlay will currently only work properly when using the following settings:\n") - wxT(" - Dual Core [OFF]\n - DSP LLE Plugin\n - DSPLLE on thread [OFF]\n - Manually set the exact number of controller that will be used to [Standard Controller]") + , wxT("ALERT:\n\nNetPlay will currently only work properly when using the following settings:") + wxT("\n - Dual Core [OFF]") + wxT("\n - Audio Throttle [OFF] (if using DSP HLE)") + wxT("\n - DSP LLE Plugin (may not be needed)\n - DSPLLE on thread [OFF]") + wxT("\n - Manually set the exact number of controller that will be used to [Standard Controller]") wxT("\n\nAll players should try to use the same Dolphin version and settings.") wxT("\nDisable all memory cards or send them to all players before starting.") wxT("\nWiimote support has not been implemented.\nWii games will likely desync for other reasons as well.") @@ -101,6 +104,8 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* parent, const CGameListCtrl* const _connect_macro_(host_btn, NetPlaySetupDiag::OnHost, wxEVT_COMMAND_BUTTON_CLICKED, this); m_game_lbox = new wxListBox(host_tab, wxID_ANY); + _connect_macro_(m_game_lbox, NetPlaySetupDiag::OnHost, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, this); + std::istringstream ss(game_list->GetGameNames()); std::string game; while (std::getline(ss,game)) @@ -369,11 +374,18 @@ void NetPlayDiag::OnThread(wxCommandEvent& event) while (std::getline(ss, tmps)) m_player_lbox->Append(wxString(tmps.c_str(), *wxConvCurrent)); - // update selected game :/ - if (45 == event.GetId()) + switch (event.GetId()) { + case 45 : + // update selected game :/ m_selected_game.assign(event.GetString().mb_str()); m_game_btn->SetLabel(event.GetString().Prepend(wxT(" Game : "))); + break; + case 46 : + // client start game :/ + wxCommandEvent evt; + OnStart(evt); + break; } // chat messages |