diff options
Diffstat (limited to 'src/trinitycore/Master.cpp')
| -rw-r--r-- | src/trinitycore/Master.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp index 9dcdc721f44..47a12484151 100644 --- a/src/trinitycore/Master.cpp +++ b/src/trinitycore/Master.cpp @@ -10,12 +10,12 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /** \file @@ -83,15 +83,15 @@ public: uint32 curtime = getMSTime(); //DEBUG_LOG("anti-freeze: time=%u, counters=[%u; %u]",curtime,Master::m_masterLoopCounter,World::m_worldLoopCounter); - // There is no Master anymore - // TODO: clear the rest of the code + // There is no Master anymore + // TODO: clear the rest of the code // // normal work // if(m_loops != Master::m_masterLoopCounter) // { // m_lastchange = curtime; // m_loops = Master::m_masterLoopCounter; // } -// // possible freeze +// // possible freeze // else if(getMSTimeDiff(m_lastchange,curtime) > _delaytime) // { // sLog.outError("Main/Sockets Thread hangs, kicking out server!"); @@ -104,7 +104,7 @@ public: w_lastchange = curtime; w_loops = World::m_worldLoopCounter; } - // possible freeze + // possible freeze else if(getMSTimeDiff(w_lastchange,curtime) > _delaytime) { sLog.outError("World Thread hangs, kicking out server!"); @@ -250,7 +250,7 @@ int Master::Run() ///- Launch CliRunnable thread ZThread::Thread td1(new CliRunnable); } - + ZThread::Thread td2(new RARunnable); ///- Handle affinity for multiple processors and process priority on Windows @@ -328,7 +328,7 @@ int Master::Run() } sWorldSocketMgr->Wait (); - + // set server offline loginDatabase.PExecute("UPDATE realmlist SET color = 2 WHERE id = '%d'",realmID); @@ -339,7 +339,7 @@ int Master::Run() // since worldrunnable uses them, it will crash if unloaded after master t.wait(); td2.wait (); - + ///- Clean database before leaving clearOnlineAccounts(); @@ -459,7 +459,7 @@ bool Master::_StartDB() sWorld.LoadDBVersion(); - sLog.outString("Using %s", sWorld.GetDBVersion()); + sLog.outString("Using %s", sWorld.GetDBVersion()); return true; } @@ -471,7 +471,7 @@ void Master::clearOnlineAccounts() loginDatabase.PExecute( "UPDATE account SET online = 0 WHERE online > 0 " "AND id IN (SELECT acctid FROM realmcharacters WHERE realmid = '%d')",realmID); - + CharacterDatabase.Execute("UPDATE characters SET online = 0"); } |