Fixed relationship of network session and player data to be consistent with the game engine. Now sending card's values via network. Fixed net packet checks.

src/gui/generic/genericservergui.cpp

@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include "genericservergui.h"
-
+#include <session.h>
 
 using namespace std;
 
@@ -39,6 +39,7 @@ void GenericServerGui::initGui(int speed)
 
 Session &GenericServerGui::getSession()
 {
+	assert(mySession.get());
 	return *mySession;
 }
 
@@ -49,5 +50,6 @@ void GenericServerGui::setSession(boost::shared_ptr<Session> session)
 
 void GenericServerGui::waitForNetworkAction(GameState state, unsigned uniquePlayerId)
 {
+	getSession().waitForNetworkServerAction(state, uniquePlayerId);
 }
 

src/gui/generic/serverguiwrapper.cpp

@@ -57,6 +57,7 @@ void
 ServerGuiWrapper::waitForNetworkAction(GameState state, unsigned uniquePlayerId)
 {
 	/* TODO hack */
+	myGui->waitForNetworkAction(state, uniquePlayerId);
 }
 
 void ServerGuiWrapper::refreshSet() const {}