Core: Fix more warnings

--HG--
branch : trunk

3 files changed, 14 insertions, 14 deletions

diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 2378db7dff3..0a7eb686d02 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -1130,19 +1130,19 @@ void AddOutdoorPvPScripts()
     AddSC_outdoorpvp_si();
     AddSC_outdoorpvp_tf();
     AddSC_outdoorpvp_zm();
-#endif SCRIPTS
+#endif
 }
 
 void AddBattlegroundScripts()
 {
 #ifdef SCRIPTS
-#endif SCRIPTS
+#endif
 }
 
 #ifdef SCRIPTS
 /* This is where custom scripts' loading functions should be declared. */
 
-#endif SCRIPTS
+#endif
 
 void AddCustomScripts()
 {
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index bdff47bc74c..860ec673b4f 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -182,7 +182,7 @@ void ScriptMgr::Initialize()
     sLog.outString("Loading C++ scripts");
     barGoLink bar(1);
     bar.step();
-    sLog.outString("");
+    sLog.outString();
 
     FillSpellSummary();
     AddScripts();
@@ -855,7 +855,7 @@ bool ScriptMgr::OnAreaTrigger(Player* player, AreaTriggerEntry const* trigger)
     return tmpscript->OnTrigger(player, trigger);
 }
 
-Battleground* ScriptMgr::CreateBattleground(BattlegroundTypeId typeId)
+Battleground* ScriptMgr::CreateBattleground(BattlegroundTypeId /*typeId*/)
 {
     // TODO: Implement script-side battlegrounds.
     ASSERT(false);
diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp
index 54a14228bc1..d642faa3f3f 100644
--- a/src/server/game/Scripting/ScriptSystem.cpp
+++ b/src/server/game/Scripting/ScriptSystem.cpp
@@ -44,12 +44,12 @@ void SystemMgr::LoadVersion()
         Field* pFields = Result->Fetch();
 
         sLog.outString("TSCR: Database version is: %s", pFields[0].GetString());
-        sLog.outString("");
+        sLog.outString();
     }
     else
     {
         sLog.outError("TSCR: Missing `version`.`script_version` information.");
-        sLog.outString("");
+        sLog.outString();
     }
 }
 
@@ -107,14 +107,14 @@ void SystemMgr::LoadScriptTexts()
             ++uiCount;
         } while (Result->NextRow());
 
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded %u additional Script Texts data.", uiCount);
     }
     else
     {
         barGoLink bar(1);
         bar.step();
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 additional Script Texts data. DB table `script_texts` is empty.");
     }
 }
@@ -173,14 +173,14 @@ void SystemMgr::LoadScriptTextsCustom()
             ++uiCount;
         } while (Result->NextRow());
 
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded %u additional Custom Texts data.", uiCount);
     }
     else
     {
         barGoLink bar(1);
         bar.step();
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 additional Custom Texts data. DB table `custom_texts` is empty.");
     }
 }
@@ -197,7 +197,7 @@ void SystemMgr::LoadScriptWaypoints()
     if (Result)
         uiCreatureCount = Result->GetRowCount();
 
-    sLog.outString("TSCR: Loading Script Waypoints for %u creature(s)...", uiCreatureCount);
+    sLog.outString("TSCR: Loading Script Waypoints for " UI64FMTD " creature(s)...", uiCreatureCount);
 
     Result = WorldDatabase.Query("SELECT entry, pointid, location_x, location_y, location_z, waittime FROM script_waypoint ORDER BY pointid");
 
@@ -235,14 +235,14 @@ void SystemMgr::LoadScriptWaypoints()
             ++uiNodeCount;
         } while (Result->NextRow());
 
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded %u Script Waypoint nodes.", uiNodeCount);
     }
     else
     {
         barGoLink bar(1);
         bar.step();
-        sLog.outString("");
+        sLog.outString();
         sLog.outString(">> Loaded 0 Script Waypoints. DB table `script_waypoint` is empty.");
     }
 }