Skip to content

Commit

Permalink
Update for new Eluna structure and libraries
Browse files Browse the repository at this point in the history
-Update Eluna submodule
  • Loading branch information
Niam5 committed Jul 31, 2023
1 parent ef0f81d commit 4f7fa30
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 2 deletions.
1 change: 0 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
[submodule "src/game/LuaEngine"]
path = src/game/LuaEngine
url = https://github.com/Niam5/Eluna.git
branch = cmangos-cata
23 changes: 23 additions & 0 deletions src/game/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,28 @@ if(NOT BUILD_ELUNA)
endif ()
endforeach()
else()
# Exclude other cores
set (EXCLUDE_DIR "LuaEngine/Mangos/")
foreach (TMP_PATH ${LIBRARY_SRCS})
string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
list(REMOVE_ITEM LIBRARY_SRCS ${TMP_PATH})
endif ()
endforeach()
set (EXCLUDE_DIR "LuaEngine/TrinityCore/")
foreach (TMP_PATH ${LIBRARY_SRCS})
string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
list(REMOVE_ITEM LIBRARY_SRCS ${TMP_PATH})
endif ()
endforeach()
set (EXCLUDE_DIR "LuaEngine/AzerothCore/")
foreach (TMP_PATH ${LIBRARY_SRCS})
string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
list(REMOVE_ITEM LIBRARY_SRCS ${TMP_PATH})
endif ()
endforeach()
add_definitions(-DBUILD_ELUNA -DCMANGOS -DCATA)
endif()

Expand Down Expand Up @@ -100,6 +122,7 @@ set(ADDITIONAL_INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}/BattleGround
${CMAKE_CURRENT_SOURCE_DIR}/OutdoorPvP
${CMAKE_CURRENT_SOURCE_DIR}/PlayerBot
${CMAKE_CURRENT_SOURCE_DIR}/LuaEngine/CMangos
${CMAKE_SOURCE_DIR}/dep/lualib
${CMAKE_BINARY_DIR}
)
Expand Down
2 changes: 1 addition & 1 deletion src/game/LuaEngine
Submodule LuaEngine updated 72 files
+53 −11 .github/workflows/build.yml
+0 −80 CMakeLists.txt
+206 −0 CMangos/AuraMethods.h
+255 −0 CMangos/BattleGroundMethods.h
+91 −0 CMangos/CorpseMethods.h
+1,223 −0 CMangos/CreatureMethods.h
+343 −0 CMangos/ElunaQueryMethods.h
+340 −0 CMangos/GameObjectMethods.h
+3,062 −0 CMangos/GlobalMethods.h
+421 −0 CMangos/GroupMethods.h
+273 −0 CMangos/GuildMethods.h
+803 −0 CMangos/ItemMethods.h
+341 −0 CMangos/MapMethods.h
+498 −0 CMangos/ObjectMethods.h
+3,982 −0 CMangos/PlayerMethods.h
+199 −0 CMangos/QuestMethods.h
+194 −0 CMangos/SpellMethods.h
+2,689 −0 CMangos/UnitMethods.h
+115 −0 CMangos/VehicleMethods.h
+1,163 −0 CMangos/WorldObjectMethods.h
+350 −0 CMangos/WorldPacketMethods.h
+64 −0 ElunaCompat.cpp
+30 −0 ElunaCompat.h
+3 −3 ElunaCreatureAI.h
+4 −6 ElunaIncludes.h
+2 −0 ElunaTemplate.h
+4 −1 ElunaUtility.cpp
+57 −0 GuildHooks.cpp
+13 −0 LuaEngine.h
+34 −1,305 LuaFunctions.cpp
+24 −1 Mangos/AuraMethods.h
+28 −3 Mangos/BattleGroundMethods.h
+14 −0 Mangos/CorpseMethods.h
+102 −6 Mangos/CreatureMethods.h
+26 −0 Mangos/ElunaQueryMethods.h
+35 −1 Mangos/GameObjectMethods.h
+129 −17 Mangos/GlobalMethods.h
+41 −0 Mangos/GroupMethods.h
+29 −0 Mangos/GuildMethods.h
+80 −2 Mangos/ItemMethods.h
+32 −0 Mangos/MapMethods.h
+42 −0 Mangos/ObjectMethods.h
+352 −53 Mangos/PlayerMethods.h
+25 −0 Mangos/QuestMethods.h
+25 −0 Mangos/SpellMethods.h
+212 −29 Mangos/UnitMethods.h
+17 −0 Mangos/VehicleMethods.h
+60 −8 Mangos/WorldObjectMethods.h
+36 −0 Mangos/WorldPacketMethods.h
+27 −0 PlayerHooks.cpp
+4 −1 README.md
+195 −0 TrinityCore/AuraMethods.h
+253 −0 TrinityCore/BattleGroundMethods.h
+91 −0 TrinityCore/CorpseMethods.h
+1,361 −0 TrinityCore/CreatureMethods.h
+342 −0 TrinityCore/ElunaQueryMethods.h
+347 −0 TrinityCore/GameObjectMethods.h
+3,003 −0 TrinityCore/GlobalMethods.h
+415 −0 TrinityCore/GroupMethods.h
+276 −0 TrinityCore/GuildMethods.h
+885 −0 TrinityCore/ItemMethods.h
+370 −0 TrinityCore/MapMethods.h
+498 −0 TrinityCore/ObjectMethods.h
+4,041 −0 TrinityCore/PlayerMethods.h
+203 −0 TrinityCore/QuestMethods.h
+198 −0 TrinityCore/SpellMethods.h
+2,707 −0 TrinityCore/UnitMethods.h
+114 −0 TrinityCore/VehicleMethods.h
+1,183 −0 TrinityCore/WorldObjectMethods.h
+347 −0 TrinityCore/WorldPacketMethods.h
+2 −1 docs/ElunaDoc/__main__.py
+1 −0 lmarshal.cpp

0 comments on commit 4f7fa30

Please sign in to comment.