Changeset 41 for trunk/src/bindings/scripts/ScriptMgr.cpp

Timestamp:

11/19/08 13:27:02 (17 years ago)

Author:

yumileroy

Message:

[svn] * Random changes/fixes...
* Some fixes to MangChat?, more coming.
* Cleaning up scripting part and preparing to merge it into the core.

Original author: XTZGZoReX
Date: 2008-10-12 17:35:16-05:00

Files:

• trunk/src/bindings/scripts/ScriptMgr.cpp (modified) (3 diffs)

trunk/src/bindings/scripts/ScriptMgr.cpp

@@ -13 +13 @@
 #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 ***
@@ -597 +593 @@
     char const* dbstring = NULL;
 
-    if( !TScriptConfig.GetString("TScriptDatabaseInfo", &dbstring) )
-    {
-        error_log("TSCR: Missing Trinity Script database info from configuration file. Load database aborted.");
+    if( !TScriptConfig.GetString("WorldDatabaseInfo", &dbstring) )
+    {
+        error_log("TSCR: Missing world database info from configuration file. Load database aborted.");
         return;
     }
@@ -1214 +1210 @@
     }
     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