From 1d1d6480a95382992751b84387a0260430e07d4a Mon Sep 17 00:00:00 2001 From: lotodore Date: Sun, 19 Aug 2007 20:58:57 +0000 Subject: [PATCH] Make it compile. Network mode not working currently. --- pokerth_game.pro | 3 ++- pokerth_lib.pro | 9 +++++---- pokerth_server.pro | 3 ++- src/net/common/clientstate.cpp | 4 ++-- src/net/common/serveracceptthread.cpp | 4 ++-- src/net/common/serverlobbythread.cpp | 2 +- src/session.cpp | 6 +++--- src/session.h | 4 ++-- 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/pokerth_game.pro b/pokerth_game.pro index b3e4da88..3e6c5566 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -89,7 +89,8 @@ HEADERS += \ src/net/netpacket.h \ src/net/resolverthread.h \ src/net/senderthread.h \ - src/net/serverthread.h \ + src/net/serveracceptthread.h \ + src/net/serverlobbythread.h \ src/net/socket_helper.h \ src/net/socket_msg.h \ src/net/socket_startup.h \ diff --git a/pokerth_lib.pro b/pokerth_lib.pro index 7bee5ceb..a19e5bcd 100644 --- a/pokerth_lib.pro +++ b/pokerth_lib.pro @@ -56,7 +56,8 @@ HEADERS += \ src/net/netpacket.h \ src/net/resolverthread.h \ src/net/senderthread.h \ - src/net/serverthread.h \ + src/net/serveracceptthread.h \ + src/net/serverlobbythread.h \ src/net/socket_helper.h \ src/net/socket_msg.h \ src/net/socket_startup.h \ @@ -126,13 +127,13 @@ SOURCES += \ src/net/common/resolverthread.cpp \ src/net/common/senderthread.cpp \ src/net/common/sendercallback.cpp \ - src/net/common/serverthread.cpp \ src/net/common/servercontext.cpp \ src/net/common/serverexception.cpp \ - src/net/common/serverrecvthread.cpp \ - src/net/common/serverrecvstate.cpp \ + src/net/common/serveracceptthread.cpp \ + src/net/common/serverlobbythread.cpp \ src/net/common/servercallback.cpp \ src/net/common/sessiondata.cpp \ + src/net/common/sessionmanager.cpp \ src/net/common/socket_startup_cmn.cpp \ src/net/common/socket_helper_cmn.cpp \ src/net/common/clientexception.cpp \ diff --git a/pokerth_server.pro b/pokerth_server.pro index 091397e4..67584ff6 100644 --- a/pokerth_server.pro +++ b/pokerth_server.pro @@ -60,7 +60,8 @@ HEADERS += \ src/net/netpacket.h \ src/net/resolverthread.h \ src/net/senderthread.h \ - src/net/serverthread.h \ + src/net/serveracceptthread.h \ + src/net/serverlobbythread.h \ src/net/socket_helper.h \ src/net/socket_msg.h \ src/net/socket_startup.h \ diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp index d1d5834b..69a0af01 100644 --- a/src/net/common/clientstate.cpp +++ b/src/net/common/clientstate.cpp @@ -440,11 +440,11 @@ ClientStateWaitSession::InternalProcess(ClientThread &client, boost::shared_ptr< // Everything is fine - we are in the lobby. NetPacketInitAck::Data initAckData; packet->ToNetPacketInitAck()->GetData(initAckData); - client.SetGuiPlayerId(initAckData.yourPlayerUniqueId); + client.SetGuiPlayerId(initAckData.playerId); // Player number is 0 on init. Will be set when the game starts. boost::shared_ptr playerData( - new PlayerData(initAckData.yourPlayerUniqueId, 0, PLAYER_TYPE_HUMAN, PLAYER_RIGHTS_NORMAL)); + new PlayerData(initAckData.playerId, 0, PLAYER_TYPE_HUMAN, PLAYER_RIGHTS_NORMAL)); playerData->SetName(context.GetPlayerName()); client.AddPlayerData(playerData); diff --git a/src/net/common/serveracceptthread.cpp b/src/net/common/serveracceptthread.cpp index 4eef1316..aa3e8f39 100644 --- a/src/net/common/serveracceptthread.cpp +++ b/src/net/common/serveracceptthread.cpp @@ -17,10 +17,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include +#include #include #include -#include +#include #include #include #include diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp index ca410ecd..a91dedcc 100644 --- a/src/net/common/serverlobbythread.cpp +++ b/src/net/common/serverlobbythread.cpp @@ -17,7 +17,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include +#include #include #include #include diff --git a/src/session.cpp b/src/session.cpp index 10422b70..edc098b3 100755 --- a/src/session.cpp +++ b/src/session.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include @@ -35,7 +35,7 @@ using namespace std; Session::Session(GuiInterface *g, ConfigFile *c) : currentGameID(0), myNetClient(0), myNetServer(0), myGui(g), myConfig(c) -{ +{ } @@ -164,7 +164,7 @@ void Session::startNetworkServer(const GameData &gameData) assert(false); return; } - myNetServer = new ServerThread(*myGui, myConfig); + myNetServer = new ServerAcceptThread(*myGui, myConfig); myNetServer->Init( myConfig->readConfigInt("ServerPort"), myConfig->readConfigInt("ServerUseIpv6") == 1, diff --git a/src/session.h b/src/session.h index 2636f97c..028127fd 100755 --- a/src/session.h +++ b/src/session.h @@ -29,7 +29,7 @@ class GuiInterface; class Game; class ConfigFile; class ClientThread; -class ServerThread; +class ServerAcceptThread; class Session{ public: @@ -70,7 +70,7 @@ private: int currentGameID; ClientThread *myNetClient; - ServerThread *myNetServer; + ServerAcceptThread *myNetServer; boost::shared_ptr currentGame; GuiInterface *myGui;