@@ -3859,7 +3859,7 @@ void gameTableImpl::triggerVoteOnKick(int id)
|
||||
int playerCount = static_cast<int>(seatList->size());
|
||||
if (id < playerCount) {
|
||||
PlayerListIterator pos = seatList->begin();
|
||||
advance(pos, id);
|
||||
std::advance(pos, id);
|
||||
myStartWindow->getSession()->startVoteKickPlayer((*pos)->getMyUniqueID());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -993,8 +993,11 @@ ClientThread::CreateContextSession()
|
||||
newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v6()));
|
||||
else
|
||||
newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v4()));
|
||||
boost::asio::socket_base::non_blocking_io command(true);
|
||||
newSock->io_control(command);
|
||||
|
||||
// Deprecated non_blocking_io command
|
||||
/*boost::asio::socket_base::non_blocking_io command(true);
|
||||
newSock->io_control(command);*/
|
||||
newSock->non_blocking(true);
|
||||
newSock->set_option(tcp::no_delay(true));
|
||||
newSock->set_option(boost::asio::socket_base::keep_alive(true));
|
||||
|
||||
|
||||
@@ -249,7 +249,7 @@ NetPacket::GameErrorToNetError(int gameErrorReason)
|
||||
retVal = ErrorMessage::sessionTimeout;
|
||||
break;
|
||||
default :
|
||||
retVal = ErrorMessage::reserved;
|
||||
retVal = ErrorMessage::custReserved;
|
||||
break;
|
||||
}
|
||||
return retVal;
|
||||
|
||||
@@ -122,8 +122,10 @@ protected:
|
||||
const boost::system::error_code &error)
|
||||
{
|
||||
if (!error) {
|
||||
boost::asio::socket_base::non_blocking_io command(true);
|
||||
acceptedSocket->io_control(command);
|
||||
// Deprecated non_blocking_io command
|
||||
/*boost::asio::socket_base::non_blocking_io command(true);
|
||||
newSock->io_control(command);*/
|
||||
newSock->non_blocking(true);
|
||||
acceptedSocket->set_option(typename P::no_delay(true));
|
||||
acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true));
|
||||
boost::shared_ptr<SessionData> sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService));
|
||||
|
||||
@@ -100,6 +100,7 @@ int main( int argc, char **argv )
|
||||
|
||||
/////// can be removed for non-qt-guis ////////////
|
||||
#ifdef ANDROID
|
||||
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||
QApplication a(argc, argv);
|
||||
a.setApplicationName("PokerTH");
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user