Changes in preparation for the integration of the network server. GUI does not directly know Game and Hand any more, only Session. WARNING: This version crashes due to initialization order problems.

src/net/common/serverrecvthread.cpp

@@ -80,10 +80,10 @@ ServerRecvThread::AddConnection(boost::shared_ptr<ConnectData> data)
 }
 
 void
-ServerRecvThread::AddNotification(unsigned notification)
+ServerRecvThread::AddNotification(unsigned message, unsigned param1, unsigned param2)
 {
 	boost::mutex::scoped_lock lock(m_notificationQueueMutex);
-	m_notificationQueue.push_back(notification);
+	m_notificationQueue.push_back(Notification(message, param1, param2));
 }
 
 void
@@ -135,14 +135,16 @@ ServerRecvThread::NotificationLoop()
 	// Process all notifications.
 	while (!m_notificationQueue.empty())
 	{
-		unsigned notification = m_notificationQueue.front();
+		Notification notification = m_notificationQueue.front();
 		m_notificationQueue.pop_front();
 
-		switch(notification)
+		switch(notification.message)
 		{
 			case NOTIFY_GAME_START:
 				SetState(SERVER_START_GAME_STATE::Instance());
 				break;
+			case NOTIFY_WAIT_FOR_CLIENT_ACTION:
+				break;
 		}
 	}
 }

src/net/common/serverthread.cpp

@@ -62,7 +62,17 @@ ServerThread::StartGame()
 		return; // TODO: throw exception
 
 	// Thread-safe notification.
-	GetRecvThread().AddNotification(NOTIFY_GAME_START);
+	GetRecvThread().AddNotification(NOTIFY_GAME_START, 0, 0);
+}
+
+void
+ServerThread::WaitForClientAction(GameState state, unsigned uniquePlayerId)
+{
+	if (!IsRunning())
+		return; // TODO: throw exception
+
+	// Thread-safe notification.
+	GetRecvThread().AddNotification(NOTIFY_WAIT_FOR_CLIENT_ACTION, state, uniquePlayerId);
 }
 
 ServerCallback &