sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Running astyle.

Browse Source
This commit is contained in:
lotodore
2013-12-19 14:27:24 +01:00
parent 2bc3567485
commit 6042d68454
4 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientstate.cpp
+1 -2
View File
@@ -1771,8 +1771,7 @@ ClientStateRunHand::InternalHandlePacket(boost::shared_ptr<ClientThread> client,
client->GetClientLog()->transformPlayerActionLog(PlayerAction(netActionDone.playeraction())),
netActionDone.totalplayerbet() - tmpPlayer->getMySet()
);
if (tmpPlayer->getMyID() == 0)
{
if (tmpPlayer->getMyID() == 0) {
client->EndPing();
}
}
src/net/common/serveracceptwebhelper.cpp
+2 -2
View File
@@ -79,8 +79,8 @@ ServerAcceptWebHelper::validate(websocketpp::connection_hdl hdl)
server::connection_ptr con = m_webSocketServer->get_con_from_hdl(hdl);
if ((m_webSocketResource.empty() || con->get_resource() == m_webSocketResource)
&& (m_webSocketOrigin.empty() ||
(con->get_origin() != "null" &&
(con->get_origin() == "http://" + m_webSocketOrigin || con->get_origin() == "http://www." + m_webSocketOrigin)))) {
(con->get_origin() != "null" &&
(con->get_origin() == "http://" + m_webSocketOrigin || con->get_origin() == "http://www." + m_webSocketOrigin)))) {
retVal = true;
}
return retVal;