Changeset 41 for trunk/src/bindings/scripts

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

Location:

trunk/src/bindings/scripts

Files:

• How to install.txt (deleted)
• LICENSE.txt (deleted)
• Makefile.am (modified) (2 diffs)
• README (moved) (moved from trunk/src/bindings/scripts/README.TXT) (1 diff, 1 prop)
• ScriptMgr.cpp (modified) (3 diffs)
• VCProjToLinuxMake.exe (deleted)
• docs/How to install.txt (deleted)
• docs/LICENSE.txt (deleted)
• docs/ToDo.txt (deleted)
• patches/MaNGOS-r4106-ScriptDev2.patch (deleted)
• patches/MaNGOS-r4203-ScriptDev2.patch (deleted)
• patches/MaNGOS-r4241-ScriptDev2.patch (deleted)
• patches/MaNGOS-r4798-ScriptDev2.patch (deleted)
• patches/MaNGOS-r5049-Scriptdev2.patch (deleted)
• patches/MaNGOS-r6491-Scriptdev2.patch (deleted)
• patches/MaNGOS-r6657-Scriptdev2.patch (deleted)
• trinityscript.conf.dist (deleted)

trunk/src/bindings/scripts/Makefile.am

@@ -33 +33 @@
 -I$(top_srcdir)/src/game \
 -I$(srcdir)/include \
-$(TRINI_INCLUDES) \
--D_TRINITY_SCRIPT_CONFIG='"$(sysconfdir)/trinityscript.conf"'
+$(TRINI_INCLUDES)
 
 libtrinityscript_la_SOURCES = \
@@ -399 +398 @@
 
 ## Additional files to install
-sysconf_DATA = \
-        trinityscript.conf.dist
-
-EXTRA_DIST =  \
-        trinityscript.conf.dist
+## sysconf_DATA = 
+
+## EXTRA_DIST = 
 
 ## Prevend overwrite of the config file, if its already installed

trunk/src/bindings/scripts/README

@@ +1 @@
+= Trinity Core -- Implementing scripts =
+
 To compile this properly, you need to get the scripts from:
 
 http://svn.assembla.com/svn/trinityscripts
 
-and get them in a "scripts" folder inside this folder
-
+Simply put them in a folder called "scripts" in this folder.

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