mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 14:19:46 -06:00
Reformat all the things. Have fun with merge conflicts.
This commit is contained in:
@ -24,83 +24,83 @@ class wxTextCtrl;
|
||||
|
||||
enum
|
||||
{
|
||||
NP_GUI_EVT_CHANGE_GAME = 45,
|
||||
NP_GUI_EVT_START_GAME,
|
||||
NP_GUI_EVT_STOP_GAME,
|
||||
NP_GUI_EVT_CHANGE_GAME = 45,
|
||||
NP_GUI_EVT_START_GAME,
|
||||
NP_GUI_EVT_STOP_GAME,
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
INITIAL_PAD_BUFFER_SIZE = 5
|
||||
INITIAL_PAD_BUFFER_SIZE = 5
|
||||
};
|
||||
|
||||
class NetPlayDialog : public wxFrame, public NetPlayUI
|
||||
{
|
||||
public:
|
||||
NetPlayDialog(wxWindow* parent, const CGameListCtrl* const game_list
|
||||
, const std::string& game, const bool is_hosting = false);
|
||||
~NetPlayDialog();
|
||||
NetPlayDialog(wxWindow* parent, const CGameListCtrl* const game_list, const std::string& game,
|
||||
const bool is_hosting = false);
|
||||
~NetPlayDialog();
|
||||
|
||||
Common::FifoQueue<std::string> chat_msgs;
|
||||
Common::FifoQueue<std::string> chat_msgs;
|
||||
|
||||
void OnStart(wxCommandEvent& event);
|
||||
void OnStart(wxCommandEvent& event);
|
||||
|
||||
// implementation of NetPlayUI methods
|
||||
void BootGame(const std::string& filename) override;
|
||||
void StopGame() override;
|
||||
// implementation of NetPlayUI methods
|
||||
void BootGame(const std::string& filename) override;
|
||||
void StopGame() override;
|
||||
|
||||
void Update() override;
|
||||
void AppendChat(const std::string& msg) override;
|
||||
void Update() override;
|
||||
void AppendChat(const std::string& msg) override;
|
||||
|
||||
void OnMsgChangeGame(const std::string& filename) override;
|
||||
void OnMsgStartGame() override;
|
||||
void OnMsgStopGame() override;
|
||||
void OnMsgChangeGame(const std::string& filename) override;
|
||||
void OnMsgStartGame() override;
|
||||
void OnMsgStopGame() override;
|
||||
|
||||
static NetPlayDialog*& GetInstance() { return npd; }
|
||||
static NetPlayClient*& GetNetPlayClient() { return netplay_client; }
|
||||
static NetPlayServer*& GetNetPlayServer() { return netplay_server; }
|
||||
static void FillWithGameNames(wxListBox* game_lbox, const CGameListCtrl& game_list);
|
||||
static NetPlayDialog*& GetInstance() { return npd; }
|
||||
static NetPlayClient*& GetNetPlayClient() { return netplay_client; }
|
||||
static NetPlayServer*& GetNetPlayServer() { return netplay_server; }
|
||||
static void FillWithGameNames(wxListBox* game_lbox, const CGameListCtrl& game_list);
|
||||
|
||||
bool IsRecording() override;
|
||||
bool IsRecording() override;
|
||||
|
||||
private:
|
||||
void OnChat(wxCommandEvent& event);
|
||||
void OnQuit(wxCommandEvent& event);
|
||||
void OnThread(wxThreadEvent& event);
|
||||
void OnChangeGame(wxCommandEvent& event);
|
||||
void OnAdjustBuffer(wxCommandEvent& event);
|
||||
void OnAssignPads(wxCommandEvent& event);
|
||||
void OnKick(wxCommandEvent& event);
|
||||
void OnPlayerSelect(wxCommandEvent& event);
|
||||
void GetNetSettings(NetSettings& settings);
|
||||
std::string FindGame();
|
||||
void OnChat(wxCommandEvent& event);
|
||||
void OnQuit(wxCommandEvent& event);
|
||||
void OnThread(wxThreadEvent& event);
|
||||
void OnChangeGame(wxCommandEvent& event);
|
||||
void OnAdjustBuffer(wxCommandEvent& event);
|
||||
void OnAssignPads(wxCommandEvent& event);
|
||||
void OnKick(wxCommandEvent& event);
|
||||
void OnPlayerSelect(wxCommandEvent& event);
|
||||
void GetNetSettings(NetSettings& settings);
|
||||
std::string FindGame();
|
||||
|
||||
void OnCopyIP(wxCommandEvent&);
|
||||
void OnChoice(wxCommandEvent& event);
|
||||
void UpdateHostLabel();
|
||||
void OnCopyIP(wxCommandEvent&);
|
||||
void OnChoice(wxCommandEvent& event);
|
||||
void UpdateHostLabel();
|
||||
|
||||
wxListBox* m_player_lbox;
|
||||
wxTextCtrl* m_chat_text;
|
||||
wxTextCtrl* m_chat_msg_text;
|
||||
wxCheckBox* m_memcard_write;
|
||||
wxCheckBox* m_record_chkbox;
|
||||
wxListBox* m_player_lbox;
|
||||
wxTextCtrl* m_chat_text;
|
||||
wxTextCtrl* m_chat_msg_text;
|
||||
wxCheckBox* m_memcard_write;
|
||||
wxCheckBox* m_record_chkbox;
|
||||
|
||||
std::string m_selected_game;
|
||||
wxButton* m_player_config_btn;
|
||||
wxButton* m_game_btn;
|
||||
wxButton* m_start_btn;
|
||||
wxButton* m_kick_btn;
|
||||
wxStaticText* m_host_label;
|
||||
wxChoice* m_host_type_choice;
|
||||
wxButton* m_host_copy_btn;
|
||||
bool m_host_copy_btn_is_retry;
|
||||
bool m_is_hosting;
|
||||
std::string m_selected_game;
|
||||
wxButton* m_player_config_btn;
|
||||
wxButton* m_game_btn;
|
||||
wxButton* m_start_btn;
|
||||
wxButton* m_kick_btn;
|
||||
wxStaticText* m_host_label;
|
||||
wxChoice* m_host_type_choice;
|
||||
wxButton* m_host_copy_btn;
|
||||
bool m_host_copy_btn_is_retry;
|
||||
bool m_is_hosting;
|
||||
|
||||
std::vector<int> m_playerids;
|
||||
std::vector<int> m_playerids;
|
||||
|
||||
const CGameListCtrl* const m_game_list;
|
||||
const CGameListCtrl* const m_game_list;
|
||||
|
||||
static NetPlayDialog* npd;
|
||||
static NetPlayServer* netplay_server;
|
||||
static NetPlayClient* netplay_client;
|
||||
static NetPlayDialog* npd;
|
||||
static NetPlayServer* netplay_server;
|
||||
static NetPlayClient* netplay_client;
|
||||
};
|
||||
|
Reference in New Issue
Block a user