a bo

pokerth.pro

@@ -6,7 +6,7 @@ official_server {
     SUBDIRS += pokerth_dbofficial.pro
 }
 client: {
-    # SUBDIRS += pokerth_game.pro
+    SUBDIRS += pokerth_game.pro
 }
 !mac:!gui_800x480:!client:!qml-client {
     SUBDIRS += pokerth_server.pro chatcleaner.pro

src/gui/qt/createinternetgamedialog.ui

@@ -316,19 +316,19 @@
        <string/>
       </property>
       <property name="prefix">
-       <string>$</string>
+       <string>€</string>
       </property>
       <property name="minimum">
-       <number>1000</number>
+       <number>10</number>
       </property>
       <property name="maximum">
        <number>1000000</number>
       </property>
       <property name="singleStep">
-       <number>50</number>
+       <number>5</number>
       </property>
       <property name="value">
-       <number>2000</number>
+       <number>20</number>
       </property>
      </widget>
     </item>

src/net/common/serveracceptwebhelper.cpp

@@ -29,6 +29,7 @@
  * as that of the covered work.                                              *
  *****************************************************************************/
 
+#include <boost/bind/bind.hpp>
 #include <net/serveracceptwebhelper.h>
 #include <net/sessiondata.h>
 #include <net/webreceivebuffer.h>
@@ -58,10 +59,10 @@ ServerAcceptWebHelper::Listen(unsigned serverPort, bool /*ipv6*/, const std::str
 
 	m_webSocketServer->init_asio(m_ioService.get());
 
-	m_webSocketServer->set_validate_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::validate), this, _1));
-	m_webSocketServer->set_open_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_open), this, _1));
-	m_webSocketServer->set_close_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_close), this, _1));
-	m_webSocketServer->set_message_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_message), this, _1, _2));
+	m_webSocketServer->set_validate_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::validate), this, boost::placeholders::_1));
+	m_webSocketServer->set_open_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_open), this, boost::placeholders::_1));
+	m_webSocketServer->set_close_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_close), this, boost::placeholders::_1));
+	m_webSocketServer->set_message_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_message), this, boost::placeholders::_1,boost::placeholders:: _2));
 
 	m_webSocketServer->listen(serverPort);
 	m_webSocketServer->start_accept();

src/net/common/servergame.cpp

@@ -66,7 +66,7 @@ static bool LessThanPlayerHandStartMoney(const boost::shared_ptr<PlayerInterface
 
 
 ServerGame::ServerGame(boost::shared_ptr<ServerLobbyThread> lobbyThread, u_int32_t id, const string &name, const string &pwd, const GameData &gameData,
-					   unsigned adminPlayerId, unsigned creatorPlayerDBId, GuiInterface &gui, ConfigFile &playerConfig)
+					    unsigned adminPlayerId, unsigned creatorPlayerDBId, GuiInterface &gui, ConfigFile &playerConfig)
 	: m_adminPlayerId(adminPlayerId), m_lobbyThread(lobbyThread), m_gui(gui),
 	  m_gameData(gameData), m_curState(NULL), m_id(id), m_name(name),
 	  m_password(pwd), m_creatorPlayerDBId(creatorPlayerDBId), m_playerConfig(playerConfig),

src/net/common/servergamestate.cpp

@@ -92,7 +92,7 @@ using namespace boost::chrono;
 
 #define GAME_MAX_NUM_JOINS_PER_PLAYER				6
 
-//#define TESTS_LATE_REG // (albmed) To develop set this define, to compile comment until reentry is implemented
+#define TESTS_LATE_REG // (albmed) To develop set this define, to compile comment until reentry is implemented
 
 // Helper functions
 
@@ -157,7 +157,7 @@ static void SendNewRoundCards(ServerGame &server, Game &curGame, int state)
 	}
 	break;
 	default: {
-		//
+	break;
 	}
 	}
 }
@@ -250,7 +250,7 @@ GetRandomFreeSeat(PlayerList playerList) {
 	for (int i = 0; i < v.size(); i++) {
 		if (v[i] == 0) {
 			seat = i;
-			beak;
+			break;
 		}
 	}