Yet more cleanup, mostly in the script system. This should conclude the script integration into core.

--HG--
branch : trunk

1 files changed, 1 insertions, 9 deletions

diff --git a/src/game/ScriptMgr.h b/src/game/ScriptMgr.h
index 9ae6ad13103..056dd712fdb 100644
--- a/src/game/ScriptMgr.h
+++ b/src/game/ScriptMgr.h
@@ -13,10 +13,6 @@
 #include "DBCStructure.h"
 #include "Config/ConfigEnv.h"
 
-#ifndef _TRINITY_SCRIPT_CONFIG
-# define _TRINITY_SCRIPT_CONFIG  sConfig.GetFilename().c_str()
-#endif _TRINITY_SCRIPT_CONFIG
-
 class Player;
 class Creature;
 class CreatureAI;
@@ -101,14 +97,10 @@ class ScriptMgr
         ScriptMgr();
         ~ScriptMgr();
         
-        void ScriptsInit(char const* cfg_file = _TRINITY_SCRIPT_CONFIG);
+        void ScriptsInit();
         void LoadDatabase();
         char const* ScriptsVersion();    
 
-        std::string GetConfigValueStr(char const* option);
-        int32 GetConfigValueInt32(char const* option);
-        float GetConfigValueFloat(char const* option);
-
     //event handlers
         void OnLogin(Player *pPlayer);
         void OnLogout(Player *pPlayer);