Core: Warning fixes

3 files changed, 12 insertions, 10 deletions

diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 4064c8b08f6..28d21ae0645 100755
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -238,7 +238,7 @@ class ServerScript : public ScriptObject
         virtual void OnUnknownPacketReceive(WorldSocket* /*socket*/, WorldPacket& /*packet*/) { }
 };
 
-class WorldScript : public ScriptObject, public UpdatableScript<void>
+class WorldScript : public ScriptObject
 {
     protected:
 
diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp
index 40e5e64af1a..ef5a3b8184f 100755
--- a/src/server/game/Scripting/ScriptSystem.cpp
+++ b/src/server/game/Scripting/ScriptSystem.cpp
@@ -21,16 +21,18 @@
 #include "ObjectMgr.h"
 #include "DatabaseEnv.h"
 
+ScriptPointVector const SystemMgr::_empty;
+
 void SystemMgr::LoadVersion()
 {
-    //Get Version information
-    QueryResult Result = WorldDatabase.Query("SELECT script_version FROM version LIMIT 1");
+    // Get Version information
+    QueryResult result = WorldDatabase.Query("SELECT script_version FROM version LIMIT 1");
 
-    if (Result)
+    if (result)
     {
-        Field* pFields = Result->Fetch();
+        Field* fields = result->Fetch();
 
-        sLog->outString("TSCR: Database version is: %s", pFields[0].GetCString());
+        sLog->outString("TSCR: Database version is: %s", fields[0].GetCString());
         sLog->outString();
     }
     else
diff --git a/src/server/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h
index 1fb84977e5d..a17033dc920 100644
--- a/src/server/game/Scripting/ScriptSystem.h
+++ b/src/server/game/Scripting/ScriptSystem.h
@@ -82,20 +82,20 @@ class SystemMgr
 
         ScriptPointVector const& GetPointMoveList(uint32 creatureEntry) const
         {
-            static ScriptPointVector empty;
-
             PointMoveMap::const_iterator itr = m_mPointMoveMap.find(creatureEntry);
 
             if (itr == m_mPointMoveMap.end())
-                return empty;
+                return _empty;
 
             return itr->second;
         }
 
     protected:
-
         TextDataMap     m_mTextDataMap;                     //additional data for text strings
         PointMoveMap    m_mPointMoveMap;                    //coordinates for waypoints
+
+    private:
+        static ScriptPointVector const _empty;
 };
 
 #define sScriptSystemMgr ACE_Singleton<SystemMgr, ACE_Null_Mutex>::instance()