Merge git://github.com/TrinityCore/TrinityCore into mmaps

Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Movement/MovementGenerator.h
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
	src/server/game/Movement/Spline/MoveSpline.h

1 files changed, 0 insertions, 122 deletions

diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp
index 41b41b91808..ea1cf6b1994 100755..100644
--- a/src/server/game/Scripting/ScriptSystem.cpp
+++ b/src/server/game/Scripting/ScriptSystem.cpp
@@ -23,128 +23,6 @@
 
 ScriptPointVector const SystemMgr::_empty;
 
-void SystemMgr::LoadScriptTexts()
-{
-    sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Loading Script Texts...");
-    LoadTrinityStrings("script_texts", TEXT_SOURCE_RANGE, 1+(TEXT_SOURCE_RANGE*2));
-
-    sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Loading Script Texts additional data...");
-    uint32 oldMSTime = getMSTime();
-
-    //                                                 0      1      2      3
-    QueryResult result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM script_texts");
-
-    if (!result)
-    {
-        sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 additional Script Texts data. DB table `script_texts` is empty.");
-        return;
-    }
-
-    uint32 uiCount = 0;
-
-    do
-    {
-        Field* pFields = result->Fetch();
-        StringTextData temp;
-
-        int32 iId           = pFields[0].GetInt32();
-        temp.uiSoundId     = pFields[1].GetUInt32();
-        temp.uiType        = pFields[2].GetUInt8();
-        temp.uiLanguage    = pFields[3].GetUInt8();
-        temp.uiEmote       = pFields[4].GetUInt16();
-
-        if (iId >= 0)
-        {
-            sLog->outError(LOG_FILTER_SQL, "TSCR: Entry %i in table `script_texts` is not a negative value.", iId);
-            continue;
-        }
-
-        if (iId > TEXT_SOURCE_RANGE || iId <= TEXT_SOURCE_RANGE*2)
-        {
-            sLog->outError(LOG_FILTER_SQL, "TSCR: Entry %i in table `script_texts` is out of accepted entry range for table.", iId);
-            continue;
-        }
-
-        if (temp.uiSoundId)
-        {
-            if (!sSoundEntriesStore.LookupEntry(temp.uiSoundId))
-                sLog->outError(LOG_FILTER_SQL, "TSCR: Entry %i in table `script_texts` has soundId %u but sound does not exist.", iId, temp.uiSoundId);
-        }
-
-        if (!GetLanguageDescByID(temp.uiLanguage))
-            sLog->outError(LOG_FILTER_SQL, "TSCR: Entry %i in table `script_texts` using Language %u but Language does not exist.", iId, temp.uiLanguage);
-
-        if (temp.uiType > CHAT_TYPE_ZONE_YELL)
-            sLog->outError(LOG_FILTER_SQL, "TSCR: Entry %i in table `script_texts` has Type %u but this Chat Type does not exist.", iId, temp.uiType);
-
-        m_mTextDataMap[iId] = temp;
-        ++uiCount;
-    }
-    while (result->NextRow());
-
-    sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u additional Script Texts data in %u ms", uiCount, GetMSTimeDiffToNow(oldMSTime));
-}
-
-void SystemMgr::LoadScriptTextsCustom()
-{
-    sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Loading Custom Texts...");
-    LoadTrinityStrings("custom_texts", TEXT_SOURCE_RANGE*2, 1+(TEXT_SOURCE_RANGE*3));
-
-    sLog->outInfo(LOG_FILTER_SERVER_LOADING, "Loading Custom Texts additional data...");
-
-    QueryResult result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM custom_texts");
-
-    if (!result)
-    {
-        sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 additional Custom Texts data. DB table `custom_texts` is empty.");
-        return;
-    }
-
-    uint32 uiCount = 0;
-
-    do
-    {
-        Field* pFields = result->Fetch();
-        StringTextData temp;
-
-        int32 iId             = pFields[0].GetInt32();
-        temp.uiSoundId        = pFields[1].GetUInt32();
-        temp.uiType           = pFields[2].GetUInt8();
-        temp.uiLanguage       = pFields[3].GetUInt8();
-        temp.uiEmote          = pFields[4].GetUInt16();
-
-        if (iId >= 0)
-        {
-            sLog->outError(LOG_FILTER_SQL, "TSCR: Entry %i in table `custom_texts` is not a negative value.", iId);
-            continue;
-        }
-
-        if (iId > TEXT_SOURCE_RANGE*2 || iId <= TEXT_SOURCE_RANGE*3)
-        {
-            sLog->outError(LOG_FILTER_SQL, "TSCR: Entry %i in table `custom_texts` is out of accepted entry range for table.", iId);
-            continue;
-        }
-
-        if (temp.uiSoundId)
-        {
-            if (!sSoundEntriesStore.LookupEntry(temp.uiSoundId))
-                sLog->outError(LOG_FILTER_SQL, "TSCR: Entry %i in table `custom_texts` has soundId %u but sound does not exist.", iId, temp.uiSoundId);
-        }
-
-        if (!GetLanguageDescByID(temp.uiLanguage))
-            sLog->outError(LOG_FILTER_SQL, "TSCR: Entry %i in table `custom_texts` using Language %u but Language does not exist.", iId, temp.uiLanguage);
-
-        if (temp.uiType > CHAT_TYPE_ZONE_YELL)
-            sLog->outError(LOG_FILTER_SQL, "TSCR: Entry %i in table `custom_texts` has Type %u but this Chat Type does not exist.", iId, temp.uiType);
-
-        m_mTextDataMap[iId] = temp;
-        ++uiCount;
-    }
-    while (result->NextRow());
-
-    sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u additional Custom Texts data.", uiCount);
-}
-
 void SystemMgr::LoadScriptWaypoints()
 {
     uint32 oldMSTime = getMSTime();