diff options
Diffstat (limited to 'src/game-server/main-game.cpp')
| -rw-r--r-- | src/game-server/main-game.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/game-server/main-game.cpp b/src/game-server/main-game.cpp index 62da4f9c..daf15611 100644 --- a/src/game-server/main-game.cpp +++ b/src/game-server/main-game.cpp @@ -71,9 +71,7 @@ using utils::Logger; #define DEFAULT_MONSTERSDB_FILE "monsters.xml" #define DEFAULT_STATUSDB_FILE "status-effects.xml" #define DEFAULT_PERMISSION_FILE "permissions.xml" -#define DEFAULT_GLOBAL_EVENT_SCRIPT_FILE "scripts/global_events.lua" -#define DEFAULT_SPECIAL_ACTIONS_SCRIPT_FILE "scripts/special_actions.lua" -#define DEFAULT_CRAFT_SCRIPT_FILE "scripts/crafting.lua" +#define DEFAULT_GLOBAL_EVENT_SCRIPT_FILE "scripts/main.lua" static int const WORLD_TICK_SKIP = 2; /** tolerance for lagging behind in world calculation) **/ @@ -141,9 +139,10 @@ static void initializeServer() StatusManager::initialize(DEFAULT_STATUSDB_FILE); PermissionManager::initialize(DEFAULT_PERMISSION_FILE); - LuaScript::loadGlobalEventScript(DEFAULT_GLOBAL_EVENT_SCRIPT_FILE); - LuaScript::loadSpecialActionsScript(DEFAULT_SPECIAL_ACTIONS_SCRIPT_FILE); - LuaScript::loadCraftScript(DEFAULT_CRAFT_SCRIPT_FILE); + const std::string mainScriptFile = + Configuration::getValue("script_mainFile", + DEFAULT_GLOBAL_EVENT_SCRIPT_FILE); + Script::loadGlobalEventScript(mainScriptFile); // --- Initialize the global handlers // FIXME: Make the global handlers global vars or part of a bigger |