[svn] * Random changes/fixes...

* Some fixes to MangChat, more coming.
* Cleaning up scripting part and preparing to merge it into the core.

--HG--
branch : trunk
rename : src/bindings/scripts/README.TXT => src/bindings/scripts/README

1 files changed, 4 insertions, 12 deletions

diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp
index d29999cb003..d66bd891b5e 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -12,13 +12,9 @@
 
 #define _FULLVERSION "TrinityScript"
 
-#ifndef _TSCRIPTCONFVERSION
-# define _TSCRIPTCONFVERSION 2008100201
-#endif //_TSCRIPTCONFVERSION
-
 #ifndef _TRINITY_SCRIPT_CONFIG
-# define _TRINITY_SCRIPT_CONFIG  "trinityscript.conf"
-#endif //_TRINITY_SCRIPT_CONFIG
+# define _TRINITY_SCRIPT_CONFIG  "trinitycore.conf"
+#endif _TRINITY_SCRIPT_CONFIG
 
 //*** Global data ***
 int nrscripts;
@@ -596,9 +592,9 @@ void LoadDatabase()
     //Get db string from file
     char const* dbstring = NULL;
 
-    if( !TScriptConfig.GetString("TScriptDatabaseInfo", &dbstring) )
+    if( !TScriptConfig.GetString("WorldDatabaseInfo", &dbstring) )
     {
-        error_log("TSCR: Missing Trinity Script database info from configuration file. Load database aborted.");
+        error_log("TSCR: Missing world database info from configuration file. Load database aborted.");
         return;
     }
 
@@ -1214,10 +1210,6 @@ void ScriptsInit()
     }
     else outstring_log("TSCR: Using configuration file %s",_TRINITY_SCRIPT_CONFIG);
 
-    //Check config file version
-    if (TScriptConfig.GetIntDefault("ConfVersion", 0) != _TSCRIPTCONFVERSION)
-        error_log("TSCR: Configuration file version doesn't match expected version. Some config variables may be wrong or missing.");
-
     //Locale
     Locale = TScriptConfig.GetIntDefault("Locale", 0);