diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 6c631988e7..13d123bf4b 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -35,8 +35,8 @@ CU_GET_GLOBAL("AC_ADD_SCRIPTS_INCLUDE") set("AC_SCRIPTS_INCLUDES" "") set("AC_MODULE_LIST" "") set("AC_SCRIPTS_LIST" "") -set(MOD_ELUNA_FOUND 0) -set(MOD_ELUNA_PATH "") +set(MOD_ALE_FOUND 0) +set(MOD_ALE_PATH "") foreach(include ${AC_ADD_SCRIPTS_INCLUDE}) set("AC_SCRIPTS_INCLUDES" "#include \"${include}\"\n${AC_SCRIPTS_INCLUDES}") @@ -50,12 +50,12 @@ foreach(scriptName ${AC_ADD_SCRIPTS_LIST}) set("AC_SCRIPTS_LIST" " ${scriptName};\n${AC_SCRIPTS_LIST}") endforeach() -function(ConfigureElunaModule moduleName) - set(MOD_ELUNA_FOUND 1 PARENT_SCOPE) +function(ConfigureALEModule moduleName) + set(MOD_ALE_FOUND 1 PARENT_SCOPE) GetPathToModuleSource(${SOURCE_MODULE} MODULE_SOURCE_PATH) - set(MOD_ELUNA_PATH ${MODULE_SOURCE_PATH} PARENT_SCOPE) + set(MOD_ALE_PATH ${MODULE_SOURCE_PATH} PARENT_SCOPE) - # Define eluna compile options + # Define ALE compile options target_compile_options(game-interface INTERFACE -DAZEROTHCORE @@ -76,9 +76,9 @@ foreach(SOURCE_MODULE ${MODULES_MODULE_LIST}) set(${MODULE_MODULE_VARIABLE} "static") endif() - # Use only static for mod-eluna - if (SOURCE_MODULE MATCHES "mod-eluna") - ConfigureElunaModule(${SOURCE_MODULE}) + # Use only static for mod-ALE + if (SOURCE_MODULE MATCHES "mod-ale") + ConfigureALEModule(${SOURCE_MODULE}) endif() # Build the Graph values @@ -267,9 +267,9 @@ ConfigureScriptLoader("static" SCRIPT_MODULE_PRIVATE_SCRIPTLOADER OFF ${STATIC_S list(REMOVE_DUPLICATES SCRIPT_MODULE_PRIVATE_SCRIPTLOADER) -if (MOD_ELUNA_FOUND) - list(REMOVE_ITEM PRIVATE_SOURCES_MODULES ${MOD_ELUNA_PATH}/lualib/lua.c) - list(REMOVE_ITEM PRIVATE_SOURCES_MODULES ${MOD_ELUNA_PATH}/lualib/luac.c) +if (MOD_ALE_FOUND) + list(REMOVE_ITEM PRIVATE_SOURCES_MODULES ${MOD_ALE_PATH}/lualib/lua.c) + list(REMOVE_ITEM PRIVATE_SOURCES_MODULES ${MOD_ALE_PATH}/lualib/luac.c) endif() add_library(modules STATIC @@ -277,7 +277,7 @@ add_library(modules STATIC ${SCRIPT_MODULE_PRIVATE_SCRIPTLOADER} ${PRIVATE_SOURCES_MODULES}) -if (MOD_ELUNA_FOUND) +if (MOD_ALE_FOUND) target_link_libraries(modules PUBLIC lualib) endif() @@ -358,7 +358,7 @@ target_compile_options(modules INTERFACE -DCONFIG_FILE_LIST=$<1:"${CONFIG_LIST}">) -if (MOD_ELUNA_FOUND) +if (MOD_ALE_FOUND) if (APPLE) target_compile_definitions(modules PUBLIC @@ -377,10 +377,10 @@ if (MOD_ELUNA_FOUND) add_custom_command(TARGET modules POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bin/${MSVC_CONFIGURATION_NAME}lua_scripts/extensions/" - COMMAND ${CMAKE_COMMAND} -E copy_directory "${MOD_ELUNA_PATH}/LuaEngine/extensions" "${CMAKE_BINARY_DIR}/bin/${MSVC_CONFIGURATION_NAME}lua_scripts/extensions/") + COMMAND ${CMAKE_COMMAND} -E copy_directory "${MOD_ALE_PATH}/LuaEngine/extensions" "${CMAKE_BINARY_DIR}/bin/${MSVC_CONFIGURATION_NAME}lua_scripts/extensions/") endif() - install(DIRECTORY "${MOD_ELUNA_PATH}/LuaEngine/extensions" DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/lua_scripts/") + install(DIRECTORY "${MOD_ALE_PATH}/LuaEngine/extensions" DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/lua_scripts/") endif() message("") diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 141a7cf73f..0fd248d8a7 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -41,7 +41,7 @@ #include "UpdateFields.h" -class ElunaEventProcessor; +class ALEEventProcessor; enum TempSummonType { @@ -727,7 +727,7 @@ public: ObjectVisibilityContainer const& GetObjectVisibilityContainer() const { return _objectVisibilityContainer; } // Event handler - ElunaEventProcessor* elunaEvents; + ALEEventProcessor* ALEEvents; EventProcessor m_Events; protected: diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 1aa7a3ee86..efcfd2f4fd 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2118,7 +2118,7 @@ void InstanceMap::CreateInstanceScript(bool load, std::string data, uint32 compl if (instance_data) isOtherAI = true; - // if Eluna AI was fetched succesfully we should not call CreateInstanceData nor set the unused scriptID + // if ALE AI was fetched succesfully we should not call CreateInstanceData nor set the unused scriptID if (!isOtherAI) { InstanceTemplate const* mInstance = sObjectMgr->GetInstanceTemplate(GetId()); @@ -2132,7 +2132,7 @@ void InstanceMap::CreateInstanceScript(bool load, std::string data, uint32 compl if (!instance_data) return; - // use mangos behavior if we are dealing with Eluna AI + // use mangos behavior if we are dealing with ALE AI // initialize should then be called only if load is false if (!isOtherAI || !load) { diff --git a/src/server/game/Scripting/ScriptDefines/ElunaScript.cpp b/src/server/game/Scripting/ScriptDefines/ALEScript.cpp similarity index 80% rename from src/server/game/Scripting/ScriptDefines/ElunaScript.cpp rename to src/server/game/Scripting/ScriptDefines/ALEScript.cpp index fbaa7af765..5597a2be06 100644 --- a/src/server/game/Scripting/ScriptDefines/ElunaScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/ALEScript.cpp @@ -15,12 +15,12 @@ * with this program. If not, see . */ -#include "ElunaScript.h" +#include "ALEScript.h" #include "ScriptMgr.h" -ElunaScript::ElunaScript(const char* name) : ScriptObject(name) +ALEScript::ALEScript(const char* name) : ScriptObject(name) { - ScriptRegistry::AddScript(this); + ScriptRegistry::AddScript(this); } -template class AC_GAME_API ScriptRegistry; +template class AC_GAME_API ScriptRegistry; diff --git a/src/server/game/Scripting/ScriptDefines/ElunaScript.h b/src/server/game/Scripting/ScriptDefines/ALEScript.h similarity index 90% rename from src/server/game/Scripting/ScriptDefines/ElunaScript.h rename to src/server/game/Scripting/ScriptDefines/ALEScript.h index da028a7baf..ce1f4a0f40 100644 --- a/src/server/game/Scripting/ScriptDefines/ElunaScript.h +++ b/src/server/game/Scripting/ScriptDefines/ALEScript.h @@ -15,15 +15,15 @@ * with this program. If not, see . */ -#ifndef SCRIPT_OBJECT_ELUNA_SCRIPT_H_ -#define SCRIPT_OBJECT_ELUNA_SCRIPT_H_ +#ifndef SCRIPT_OBJECT_ALE_SCRIPT_H_ +#define SCRIPT_OBJECT_ALE_SCRIPT_H_ #include "ScriptObject.h" -class ElunaScript : public ScriptObject +class ALEScript : public ScriptObject { protected: - ElunaScript(const char* name); + ALEScript(const char* name); public: /** diff --git a/src/server/game/Scripting/ScriptDefines/AllScriptsObjects.h b/src/server/game/Scripting/ScriptDefines/AllScriptsObjects.h index 9196c32845..085bde5732 100644 --- a/src/server/game/Scripting/ScriptDefines/AllScriptsObjects.h +++ b/src/server/game/Scripting/ScriptDefines/AllScriptsObjects.h @@ -39,7 +39,7 @@ #include "CreatureScript.h" #include "DatabaseScript.h" #include "DynamicObjectScript.h" -#include "ElunaScript.h" +#include "ALEScript.h" #include "FormulaScript.h" #include "GameEventScript.h" #include "GameObjectScript.h" diff --git a/src/server/game/Scripting/ScriptDefines/AreaTriggerScript.cpp b/src/server/game/Scripting/ScriptDefines/AreaTriggerScript.cpp index 6d3429606f..cb49812abc 100644 --- a/src/server/game/Scripting/ScriptDefines/AreaTriggerScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/AreaTriggerScript.cpp @@ -16,7 +16,7 @@ */ #include "AreaTriggerScript.h" -#include "ElunaScript.h" +#include "ALEScript.h" #include "Player.h" #include "ScriptMgr.h" #include "ScriptMgrMacros.h" @@ -26,7 +26,7 @@ bool ScriptMgr::OnAreaTrigger(Player* player, AreaTrigger const* trigger) ASSERT(player); ASSERT(trigger); - auto ret = IsValidBoolScript([&](ElunaScript* script) + auto ret = IsValidBoolScript([&](ALEScript* script) { return script->CanAreaTrigger(player, trigger); }); diff --git a/src/server/game/Scripting/ScriptDefines/WeatherScript.cpp b/src/server/game/Scripting/ScriptDefines/WeatherScript.cpp index 5232ae0ca4..e1929daabe 100644 --- a/src/server/game/Scripting/ScriptDefines/WeatherScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/WeatherScript.cpp @@ -16,7 +16,7 @@ */ #include "WeatherScript.h" -#include "ElunaScript.h" +#include "ALEScript.h" #include "ScriptMgr.h" #include "ScriptMgrMacros.h" @@ -24,7 +24,7 @@ void ScriptMgr::OnWeatherChange(Weather* weather, WeatherState state, float grad { ASSERT(weather); - ExecuteScript([&](ElunaScript* script) + ExecuteScript([&](ALEScript* script) { script->OnWeatherChange(weather, state, grade); }); diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 3a78145cab..2fc4b86b50 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -127,7 +127,7 @@ void ScriptMgr::Unload() SCR_CLEAR(); SCR_CLEAR(); SCR_CLEAR(); - SCR_CLEAR(); + SCR_CLEAR(); SCR_CLEAR(); SCR_CLEAR(); SCR_CLEAR();