Make it compile. Network mode not working currently.

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> 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);
 

src/net/common/serveracceptthread.cpp

@@ -17,10 +17,10 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <net/serverthread.h>
+#include <net/serveracceptthread.h>
 #include <net/servercontext.h>
 #include <net/connectdata.h>
-#include <net/serverrecvthread.h>
+#include <net/serverlobbythread.h>
 #include <net/socket_helper.h>
 #include <net/serverexception.h>
 #include <net/socket_msg.h>

src/net/common/serverlobbythread.cpp

@@ -17,7 +17,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <net/serverrecvthread.h>
+#include <net/serverlobbythread.h>
 #include <net/serverexception.h>
 #include <net/senderthread.h>
 #include <net/sendercallback.h>

src/session.cpp

@@ -24,7 +24,7 @@
 #include <localenginefactory.h>
 #include <clientenginefactory.h>
 #include <net/clientthread.h>
-#include <net/serverthread.h>
+#include <net/serveracceptthread.h>
 
 #include <sstream>
 
@@ -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,

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<Game> currentGame;
 	GuiInterface *myGui;