ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NetPlayServer: in-class initialization

This commit is contained in:
mathieui 2016-01-26 20:49:54 +01:00
parent 9199539798
commit 8e1be37feb
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Core/NetPlayServer.cpp
View File

@ -58,17 +58,6 @@ NetPlayServer::~NetPlayServer()
// called from ---GUI--- thread // called from ---GUI--- thread
NetPlayServer::NetPlayServer(const u16 port, bool traversal, const std::string& centralServer, u16 centralPort) NetPlayServer::NetPlayServer(const u16 port, bool traversal, const std::string& centralServer, u16 centralPort)
: is_connected(false)
, m_is_running(false)
, m_do_loop(false)
, m_ping_key(0)
, m_update_pings(false)
, m_current_game(0)
, m_target_buffer_size(0)
, m_selected_game("")
, m_server(nullptr)
, m_traversal_client(nullptr)
, m_dialog(nullptr)
{ {
//--use server time //--use server time
if (enet_initialize() != 0) if (enet_initialize() != 0)

20
Source/Core/Core/NetPlayServer.h
View File

@ -50,7 +50,7 @@ public:
std::unordered_set<std::string> GetInterfaceSet(); std::unordered_set<std::string> GetInterfaceSet();
std::string GetInterfaceHost(const std::string& inter); std::string GetInterfaceHost(const std::string& inter);
bool is_connected; bool is_connected = false;
#ifdef USE_UPNP #ifdef USE_UPNP
void TryPortmapping(u16 port); void TryPortmapping(u16 port);
@ -90,13 +90,13 @@ private:
NetSettings m_settings; NetSettings m_settings;
bool m_is_running; bool m_is_running = false;
bool m_do_loop; bool m_do_loop = false;
Common::Timer m_ping_timer; Common::Timer m_ping_timer;
u32 m_ping_key; u32 m_ping_key = 0;
bool m_update_pings; bool m_update_pings = false;
u32 m_current_game; u32 m_current_game = 0;
unsigned int m_target_buffer_size; unsigned int m_target_buffer_size = 0;
PadMappingArray m_pad_map; PadMappingArray m_pad_map;
PadMappingArray m_wiimote_map; PadMappingArray m_wiimote_map;
@ -117,9 +117,9 @@ private:
std::thread m_thread; std::thread m_thread;
Common::FifoQueue<std::unique_ptr<sf::Packet>, false> m_async_queue; Common::FifoQueue<std::unique_ptr<sf::Packet>, false> m_async_queue;
ENetHost* m_server; ENetHost* m_server = nullptr;
TraversalClient* m_traversal_client; TraversalClient* m_traversal_client = nullptr;
NetPlayUI* m_dialog; NetPlayUI* m_dialog = nullptr;
#ifdef USE_UPNP #ifdef USE_UPNP
static void mapPortThread(const u16 port); static void mapPortThread(const u16 port);