dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-10-08 00:03:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NetPlayClient: In-class initialize variables where possible

Browse Source
This commit is contained in:
Lioncash 2016-01-24 22:06:57 -05:00
parent 1d8ff504a5
commit c2deb337aa
2 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/Core/NetPlayClient.cpp
View File

@ -60,23 +60,10 @@ NetPlayClient::~NetPlayClient()
// called from ---GUI--- thread
NetPlayClient::NetPlayClient(const std::string& address, const u16 port, NetPlayUI* dialog, const std::string& name, bool traversal, const std::string& centralServer, u16 centralPort)
: m_dialog(dialog)
, m_client(nullptr)
, m_server(nullptr)
, m_is_running(false)
, m_do_loop(true)
, m_target_buffer_size()
, m_local_player(nullptr)
, m_current_game(0)
, m_is_recording(false)
, m_pid(0)
, m_connecting(false)
, m_traversal_client(nullptr)
, m_player_name(name)
{
m_target_buffer_size = 20;
ClearBuffers();
m_player_name = name;
if (!traversal)
{
//Direct Connection

26
Source/Core/Core/NetPlayClient.h
View File

@ -96,26 +96,26 @@ protected:
Common::FifoQueue<GCPadStatus> m_pad_buffer[4];
Common::FifoQueue<NetWiimote> m_wiimote_buffer[4];
NetPlayUI* m_dialog;
NetPlayUI* m_dialog = nullptr;
ENetHost* m_client;
ENetPeer* m_server;
ENetHost* m_client = nullptr;
ENetPeer* m_server = nullptr;
std::thread m_thread;
std::string m_selected_game;
std::atomic<bool> m_is_running;
std::atomic<bool> m_do_loop;
std::atomic<bool> m_is_running{false};
std::atomic<bool> m_do_loop{true};
unsigned int m_target_buffer_size;
unsigned int m_target_buffer_size = 20;
Player* m_local_player;
Player* m_local_player = nullptr;
u32 m_current_game;
u32 m_current_game = 0;
PadMappingArray m_pad_map;
PadMappingArray m_wiimote_map;
bool m_is_recording;
bool m_is_recording = false;
private:
enum class ConnectionState
@ -139,14 +139,14 @@ private:
bool m_is_connected = false;
ConnectionState m_connection_state = ConnectionState::Failure;
PlayerId m_pid;
PlayerId m_pid = 0;
std::map<PlayerId, Player> m_players;
std::string m_host_spec;
std::string m_player_name;
bool m_connecting;
TraversalClient* m_traversal_client;
bool m_connecting = false;
TraversalClient* m_traversal_client = nullptr;
u32 m_timebase_frame;
u32 m_timebase_frame = 0;
};
void NetPlay_Enable(NetPlayClient* const np);