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

Reformatting code using Kernighan & Ritchie style, tabs, tab width=4.

Browse Source 
Command line: astyle --style=kr --indent=force-tab=4 --lineend=linux -n -r <file names>
This commit is contained in:
lotodore
2011-02-11 20:02:08 +00:00
parent 29dca1846e
commit 02518c67b2
232 changed files with 22743 additions and 21044 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/serverlobbybot.cpp
+5 -9
View File
@@ -34,7 +34,7 @@
using namespace std;
ServerLobbyBot::ServerLobbyBot()
: m_ircRestartTimer(boost::posix_time::time_duration(0, 0, 0), boost::timers::portable::second_timer::auto_start)
: m_ircRestartTimer(boost::posix_time::time_duration(0, 0, 0), boost::timers::portable::second_timer::auto_start)
{
}
@@ -82,8 +82,7 @@ ServerLobbyBot::SignalIrcServerError(int errorCode)
void
ServerLobbyBot::SignalLobbyMessage(unsigned playerId, const std::string &playerName, const std::string &msg)
{
if (m_ircLobbyThread && !msg.empty())
{
if (m_ircLobbyThread && !msg.empty()) {
ostringstream ircMsg;
if (playerId)
ircMsg << playerName << " (" << playerId << "): " << msg;
@@ -103,13 +102,10 @@ ServerLobbyBot::Run()
void
ServerLobbyBot::Process()
{
if (m_ircRestartTimer.elapsed().total_seconds() > SERVER_RESTART_IRC_BOT_INTERVAL_SEC)
{
if (m_ircLobbyThread)
{
if (m_ircRestartTimer.elapsed().total_seconds() > SERVER_RESTART_IRC_BOT_INTERVAL_SEC) {
if (m_ircLobbyThread) {
m_ircLobbyThread->SignalTermination();
if (m_ircLobbyThread->Join(NET_ADMIN_IRC_TERMINATE_TIMEOUT_MSEC))
{
if (m_ircLobbyThread->Join(NET_ADMIN_IRC_TERMINATE_TIMEOUT_MSEC)) {
boost::shared_ptr<IrcThread> tmpIrcThread(new IrcThread(*m_ircLobbyThread));
tmpIrcThread->Run();
m_ircLobbyThread = tmpIrcThread;