mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-22 10:19:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into wiimote-netplay

Browse source
This commit is contained in:
Rachel Bryk 2013-08-15 09:00:04 -04:00
commit 6d67ea2fda
1553 changed files with 36548 additions and 17294 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -67,7 +67,6 @@ public:
Common::FifoQueue<std::string> chat_msgs;
void OnStart(wxCommandEvent& event);
void OnStop(wxCommandEvent& event);
// implementation of NetPlayUI methods
void BootGame(const std::string& filename);
@ -92,7 +91,7 @@ private:
void OnAdjustBuffer(wxCommandEvent& event);
void OnConfigPads(wxCommandEvent& event);
void GetNetSettings(NetSettings &settings);
const std::string& FindGame();
std::string FindGame();
wxListBox* m_player_lbox;
wxTextCtrl* m_chat_text;
@ -101,6 +100,7 @@ private:
std::string m_selected_game;
wxButton* m_game_btn;
wxButton* m_start_btn;
std::vector<int> m_playerids;
@ -134,5 +134,10 @@ private:
int* const m_wiimapping;
};
namespace NetPlay
{
void StopGame();
}
#endif // _NETWINDOW_H_