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

NetPlay: Allow building a server without a game 

This isn't hooked up in the UI yet, but it will allow us to
basically start the server and chat system without choosing
a game.
This commit is contained in:
Jasper St. Pierre 2013-07-22 04:03:43 -04:00
parent 2631ec3cff
commit 6d463d1b67
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/NetPlay.h
View File

@ -183,7 +183,7 @@ class NetPlayServer : public NetPlay
public: public:
void ThreadFunc(); void ThreadFunc();
NetPlayServer(const u16 port, const std::string& name, NetPlayUI* dialog, const std::string& game = ""); NetPlayServer(const u16 port, const std::string& name, NetPlayUI* dialog);
~NetPlayServer(); ~NetPlayServer();
void GetPlayerList(std::string& list, std::vector<int>& pid_list); void GetPlayerList(std::string& list, std::vector<int>& pid_list);

16
Source/Core/Core/Src/NetPlayServer.cpp
View File

@ -22,10 +22,8 @@ NetPlayServer::~NetPlayServer()
} }
// called from ---GUI--- thread // called from ---GUI--- thread
NetPlayServer::NetPlayServer(const u16 port, const std::string& name, NetPlayUI* dialog, const std::string& game) : NetPlay(dialog) NetPlayServer::NetPlayServer(const u16 port, const std::string& name, NetPlayUI* dialog) : NetPlay(dialog)
{ {
m_selected_game = game;
m_update_pings = true; m_update_pings = true;
if (m_socket.Listen(port)) if (m_socket.Listen(port))
@ -229,10 +227,13 @@ unsigned int NetPlayServer::OnConnect(sf::SocketTCP& socket)
socket.Send(spac); socket.Send(spac);
// send new client the selected game // send new client the selected game
spac.Clear(); if (m_selected_game != "")
spac << (MessageId)NP_MSG_CHANGE_GAME; {
spac << m_selected_game; spac.Clear();
socket.Send(spac); spac << (MessageId)NP_MSG_CHANGE_GAME;
spac << m_selected_game;
socket.Send(spac);
}
// sync values with new client // sync values with new client
for (i = m_players.begin(); i!=e; ++i) for (i = m_players.begin(); i!=e; ++i)
@ -801,4 +802,3 @@ bool NetPlayServer::UPnPUnmapPort(const u16 port)
return true; return true;
} }
#endif #endif

4
Source/Core/DolphinWX/Src/NetWindow.cpp
View File

@ -220,8 +220,8 @@ void NetPlaySetupDiag::OnHost(wxCommandEvent&)
npd = new NetPlayDiag(m_parent, m_game_list, game, true); npd = new NetPlayDiag(m_parent, m_game_list, game, true);
unsigned long port = 0; unsigned long port = 0;
m_host_port_text->GetValue().ToULong(&port); m_host_port_text->GetValue().ToULong(&port);
netplay_ptr = new NetPlayServer(u16(port) netplay_ptr = new NetPlayServer(u16(port), WxStrToStr(m_nickname_text->GetValue()), npd);
, WxStrToStr(m_nickname_text->GetValue()), npd, game); netplay_ptr->ChangeGame(game);
if (netplay_ptr->is_connected) if (netplay_ptr->is_connected)
{ {
#ifdef USE_UPNP #ifdef USE_UPNP