yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Eluna fix folder path and add config option possibility for script folder path (default 'lua_scripts')

Browse Source
This commit is contained in:
Rochet2
2014-04-25 11:25:15 +03:00
committed by Foereaper
parent cdaf38b737
commit 0fd4fbd945
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
LuaEngine.cpp
View File

@@ -7,6 +7,7 @@
#include <ace/Dirent.h> #include <ace/Dirent.h>
#include <ace/OS_NS_sys_stat.h> #include <ace/OS_NS_sys_stat.h>
#include "LuaEngine.h" #include "LuaEngine.h"
#include "Config.h"
#ifdef MANGOS #ifdef MANGOS
INSTANTIATE_SINGLETON_1(Eluna); INSTANTIATE_SINGLETON_1(Eluna);
@@ -75,8 +76,15 @@ bool StartEluna()
RegisterFunctions(sEluna->L); RegisterFunctions(sEluna->L);
ScriptPaths scripts; ScriptPaths scripts;
sEluna->GetScripts("lua_scripts", scripts); std::string folderpath = sConfigMgr->GetStringDefault("Eluna.ScriptPath", "lua_scripts");
sEluna->GetScripts("lua_scripts/extensions", scripts); #if PLATFORM == PLATFORM_UNIX || PLATFORM == PLATFORM_APPLE
if (folderpath[0] == '~')
if (const char* home = getenv("HOME");)
folderpath.replace(0, 1, home);
#endif
ELUNA_LOG_INFO("[Eluna]: Searching scripts from `%s`", folderpath.c_str());
sEluna->GetScripts(folderpath, scripts);
sEluna->GetScripts(folderpath+"/extensions", scripts);
sEluna->RunScripts(scripts); sEluna->RunScripts(scripts);
/* /*
@@ -113,7 +121,7 @@ bool StartEluna()
// Finds lua script files from given path (including subdirectories) and pushes them to scripts // Finds lua script files from given path (including subdirectories) and pushes them to scripts
void Eluna::GetScripts(std::string path, ScriptPaths& scripts) void Eluna::GetScripts(std::string path, ScriptPaths& scripts)
{ {
ELUNA_LOG_DEBUG("Eluna::GetScripts from path `%s`", path.c_str()); ELUNA_LOG_DEBUG("[Eluna]: GetScripts from path `%s`", path.c_str());
ACE_Dirent dir; ACE_Dirent dir;
if (dir.open(path.c_str()) == -1) if (dir.open(path.c_str()) == -1)
@@ -130,7 +138,7 @@ void Eluna::GetScripts(std::string path, ScriptPaths& scripts)
if (ACE::isdotdir(directory->d_name)) if (ACE::isdotdir(directory->d_name))
continue; continue;
std::string fullpath = path + "\\" + directory->d_name; std::string fullpath = path + "/" + directory->d_name;
ACE_stat stat_buf; ACE_stat stat_buf;
if (ACE_OS::lstat(fullpath.c_str(), &stat_buf) == -1) if (ACE_OS::lstat(fullpath.c_str(), &stat_buf) == -1)

2
LuaEngine.h
View File

@@ -68,12 +68,14 @@ typedef std::set<std::string> ScriptPaths;
#ifdef MANGOS #ifdef MANGOS
#undef sWorld #undef sWorld
#undef sMapMgr #undef sMapMgr
#undef sConfigMgr
#undef sGuildMgr #undef sGuildMgr
#undef sObjectMgr #undef sObjectMgr
#undef sAccountMgr #undef sAccountMgr
#undef sObjectAccessor #undef sObjectAccessor
#define sWorld (&MaNGOS::Singleton<World>::Instance()) #define sWorld (&MaNGOS::Singleton<World>::Instance())
#define sMapMgr (&MapManager::Instance()) #define sMapMgr (&MapManager::Instance())
#define SConfigMgr (&MaNGOS::Singleton<Config>::Instance())
#define sGuildMgr (&MaNGOS::Singleton<GuildMgr>::Instance()) #define sGuildMgr (&MaNGOS::Singleton<GuildMgr>::Instance())
#define sObjectMgr (&MaNGOS::Singleton<ObjectMgr>::Instance()) #define sObjectMgr (&MaNGOS::Singleton<ObjectMgr>::Instance())
#define sAccountMgr (&MaNGOS::Singleton<AccountMgr>::Instance()) #define sAccountMgr (&MaNGOS::Singleton<AccountMgr>::Instance())