*Merged db_version and script_db_version table in one table - by Zor

--HG--
branch : trunk

4 files changed, 7 insertions, 4 deletions

diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp
index d415e8adfbe..c39102a1d7a 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -630,7 +630,7 @@ void LoadDatabase()
     QueryResult *result;
 
     //Get Version information
-    result = TScriptDB.PQuery("SELECT version FROM script_db_version");
+    result = TScriptDB.PQuery("SELECT script_version FROM version LIMIT 1");
 
     if (result)
     {
@@ -641,7 +641,7 @@ void LoadDatabase()
 
     }else
     {
-        error_log("TSCR: Missing `script_db_version` information.");
+        error_log("TSCR: Missing `version.script_version` information.");
         outstring_log("");
     }
 
diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
index c653ff23ca0..933b4c0361f 100644
--- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
+++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
@@ -65,7 +65,7 @@ EndScriptData */
 #define SPELL_WATER_BOLT_VOLLEY			38335
 #define SPELL_TIDAL_SURGE				38358
 #define SPELL_TIDAL_SURGE_FREEZE		38357
-#define SPELL_HEAL						41386
+#define SPELL_HEAL						38330
 #define SPELL_SUMMON_CYCLONE			38337
 #define SPELL_CYCLONE_CYCLONE			29538
 
diff --git a/src/game/World.cpp b/src/game/World.cpp
index 219c656dcaf..6865421a326 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -3001,7 +3001,7 @@ void World::UpdateMaxSessionCounters()
 
 void World::LoadDBVersion()
 {
-    QueryResult* result = WorldDatabase.Query("SELECT version FROM db_version LIMIT 1");
+    QueryResult* result = WorldDatabase.Query("SELECT db_version FROM version LIMIT 1");
     if(result)
     {
         Field* fields = result->Fetch();
diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp
index ed526f497c3..63c88807738 100644
--- a/src/trinitycore/Master.cpp
+++ b/src/trinitycore/Master.cpp
@@ -458,6 +458,9 @@ bool Master::_StartDB()
     ///- Clean the database before starting
     clearOnlineAccounts();
 
+	///- Insert version info into DB
+    WorldDatabase.PExecute("UPDATE `version` SET `core_version` = '%s'", _FULLVERSION);
+
     sWorld.LoadDBVersion();
 
     sLog.outString("Using %s", sWorld.GetDBVersion());