diff --git a/bin/config/settings_zone.xml b/bin/config/settings_zone.xml
index b1ab6081..18d33bf6 100644
--- a/bin/config/settings_zone.xml
+++ b/bin/config/settings_zone.xml
@@ -7,6 +7,8 @@
127.0.0.1
C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack\\ffxiv
+
+ ../scripts/chai
127.0.0.1
diff --git a/src/servers/Server_Zone/Script/ScriptManager.cpp b/src/servers/Server_Zone/Script/ScriptManager.cpp
index bc42558c..ad4ef9c1 100644
--- a/src/servers/Server_Zone/Script/ScriptManager.cpp
+++ b/src/servers/Server_Zone/Script/ScriptManager.cpp
@@ -38,6 +38,8 @@ Core::Scripting::ScriptManager::~ScriptManager()
void Core::Scripting::ScriptManager::loadDir( std::string dirname, std::set& chaiFiles )
{
+ g_log.info( "ScriptEngine: loading scripts from " + dirname );
+
boost::filesystem::path targetDir( dirname );
boost::filesystem::recursive_directory_iterator iter( targetDir ), eod;
diff --git a/src/servers/Server_Zone/Script/ScriptManagerInit.cpp b/src/servers/Server_Zone/Script/ScriptManagerInit.cpp
index 06d290cb..71b891cc 100644
--- a/src/servers/Server_Zone/Script/ScriptManagerInit.cpp
+++ b/src/servers/Server_Zone/Script/ScriptManagerInit.cpp
@@ -1,8 +1,11 @@
#include
+#include
#include
#include
+#include "src/servers/Server_Zone/ServerZone.h"
+
#include "src/servers/Server_Zone/Script/ScriptManager.h"
#include "src/servers/Server_Zone/Zone/Zone.h"
@@ -17,6 +20,7 @@
#include
extern Core::Logger g_log;
+extern Core::ServerZone g_serverZone;
int Core::Scripting::ScriptManager::init()
{
@@ -169,8 +173,7 @@ int Core::Scripting::ScriptManager::init()
std::set< std::string > chaiFiles;
- g_log.info( "ScriptEngine: Loading Scripts..." );
- loadDir( "../scripts/chai", chaiFiles );
+ loadDir( g_serverZone.getConfig()->getValue< std::string >( "Settings.General.ScriptPath", "../scripts/chai" ), chaiFiles );
uint16_t scriptCount = 0;
uint16_t errorCount = 0;
diff --git a/src/servers/Server_Zone/ServerZone.cpp b/src/servers/Server_Zone/ServerZone.cpp
index d87b711b..64d53132 100644
--- a/src/servers/Server_Zone/ServerZone.cpp
+++ b/src/servers/Server_Zone/ServerZone.cpp
@@ -129,6 +129,10 @@ bool Core::ServerZone::loadSettings( int32_t argc, char* argv[] )
{
m_pConfig->setValue< std::string >( "Settings.General.DataPath", val );
}
+ else if( arg == "s" || arg == "scriptpath" )
+ {
+ m_pConfig->setValue< std::string >( "Settings.General.ScriptPath", val );
+ }
else if( arg == "h" || arg == "dbhost" )
{
m_pConfig->setValue< std::string >( "Settings.General.Mysql.Host", val );