Merge branch 'master' of github.com:TrinityCore/TrinityCore

4 files changed, 15 insertions, 15 deletions

diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp
index 957191c693a..f0210f9cdfa 100755
--- a/src/server/worldserver/CommandLine/CliRunnable.cpp
+++ b/src/server/worldserver/CommandLine/CliRunnable.cpp
@@ -41,7 +41,7 @@
 
 char * command_finder(const char* text, int state)
 {
-    static int idx,len;
+    static int idx, len;
     const char* ret;
     ChatCommand *cmd = ChatHandler::getCommandTable();
 
@@ -76,9 +76,9 @@ char ** cli_completion(const char * text, int start, int /*end*/)
     matches = (char**)NULL;
 
     if (start == 0)
-        matches = rl_completion_matches((char*)text,&command_finder);
+        matches = rl_completion_matches((char*)text, &command_finder);
     else
-        rl_bind_key('\t',rl_abort);
+        rl_bind_key('\t', rl_abort);
     return (matches);
 }
 
@@ -96,11 +96,11 @@ void utf8print(void* /*arg*/, const char* str)
 #if PLATFORM == PLATFORM_WINDOWS
     wchar_t wtemp_buf[6000];
     size_t wtemp_len = 6000-1;
-    if (!Utf8toWStr(str,strlen(str),wtemp_buf,wtemp_len))
+    if (!Utf8toWStr(str, strlen(str), wtemp_buf, wtemp_len))
         return;
 
     char temp_buf[6000];
-    CharToOemBuffW(&wtemp_buf[0],&temp_buf[0],wtemp_len+1);
+    CharToOemBuffW(&wtemp_buf[0], &temp_buf[0], wtemp_len+1);
     printf(temp_buf);
 #else
 {
@@ -191,7 +191,7 @@ std::string ChatHandler::GenerateDeletedCharacterGUIDsWhereStr(DeletedInfoList::
 
         DeletedInfoList::const_iterator itr2 = itr;
         if (++itr2 != itr_end)
-            wherestr << "','";
+            wherestr << "', '";
     }
     wherestr << "')";
     return wherestr.str();
@@ -436,7 +436,7 @@ bool ChatHandler::HandleCharacterEraseCommand(const char* args){
     if (!*args)
         return false;
 
-    char *character_name_str = strtok((char*)args," ");
+    char *character_name_str = strtok((char*)args, " ");
     if (!character_name_str)
         return false;
 
@@ -459,7 +459,7 @@ bool ChatHandler::HandleCharacterEraseCommand(const char* args){
         character_guid = sObjectMgr->GetPlayerGUIDByName(character_name);
         if (!character_guid)
         {
-            PSendSysMessage(LANG_NO_PLAYER,character_name.c_str());
+            PSendSysMessage(LANG_NO_PLAYER, character_name.c_str());
             SetSentErrorMessage(true);
             return false;
         }
@@ -468,10 +468,10 @@ bool ChatHandler::HandleCharacterEraseCommand(const char* args){
     }
 
     std::string account_name;
-    sAccountMgr->GetName (account_id,account_name);
+    sAccountMgr->GetName (account_id, account_name);
 
     Player::DeleteFromDB(character_guid, account_id, true, true);
-    PSendSysMessage(LANG_CHARACTER_DELETED,character_name.c_str(),GUID_LOPART(character_guid),account_name.c_str(), account_id);
+    PSendSysMessage(LANG_CHARACTER_DELETED, character_name.c_str(), GUID_LOPART(character_guid), account_name.c_str(), account_id);
     return true;
 }
 
@@ -580,14 +580,14 @@ void CliRunnable::run()
     {
         fflush(stdout);
 
-        char *command_str ;             // = fgets(commandbuf,sizeof(commandbuf),stdin);
+        char *command_str ;             // = fgets(commandbuf, sizeof(commandbuf), stdin);
 
         #if PLATFORM == PLATFORM_WINDOWS
         char commandbuf[256];
         command_str = fgets(commandbuf, sizeof(commandbuf), stdin);
         #else
         command_str = readline("TC>");
-        rl_bind_key('\t',rl_complete);
+        rl_bind_key('\t', rl_complete);
         #endif
         if (command_str != NULL)
         {
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 08fce8a504c..ede65d07910 100755
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -66,7 +66,7 @@ void usage(const char *prog)
         "    -s install               install service\n\r"
         "    -s uninstall             uninstall service\n\r"
         #endif
-        ,prog);
+        , prog);
 }
 
 /// Launch the Trinity server
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index 3876a7a1f8f..cfb8a5a1aaa 100755
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -99,7 +99,7 @@ public:
                 w_loops = World::m_worldLoopCounter;
             }
             // possible freeze
-            else if (getMSTimeDiff(w_lastchange,curtime) > _delaytime)
+            else if (getMSTimeDiff(w_lastchange, curtime) > _delaytime)
             {
                 sLog->outError("World Thread hangs, kicking out server!");
                 ASSERT(false);
diff --git a/src/server/worldserver/WorldThread/WorldRunnable.cpp b/src/server/worldserver/WorldThread/WorldRunnable.cpp
index 664e767d11f..c7e4891747d 100755
--- a/src/server/worldserver/WorldThread/WorldRunnable.cpp
+++ b/src/server/worldserver/WorldThread/WorldRunnable.cpp
@@ -54,7 +54,7 @@ void WorldRunnable::run()
         ++World::m_worldLoopCounter;
         realCurrTime = getMSTime();
 
-        uint32 diff = getMSTimeDiff(realPrevTime,realCurrTime);
+        uint32 diff = getMSTimeDiff(realPrevTime, realCurrTime);
 
         sWorld->Update( diff );
         realPrevTime = realCurrTime;