From 1c032060327ae98aeaf80fefc5a31dd78ed1655d Mon Sep 17 00:00:00 2001 From: Foereaper Date: Tue, 1 Aug 2023 23:18:56 +0200 Subject: [PATCH 1/2] Update Eluna submodule --- src/game/CMakeLists.txt | 12 ++++++++++-- src/modules/Eluna | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt index bad1d0459..e69093c30 100644 --- a/src/game/CMakeLists.txt +++ b/src/game/CMakeLists.txt @@ -83,7 +83,12 @@ source_group("World\\Handlers" FILES ${SRC_GRP_WORLD_HANDLERS}) # Build the Eluna library if enabled if(SCRIPT_LIB_ELUNA) - file(GLOB SRC_GRP_ELUNA ${CMAKE_SOURCE_DIR}/src/modules/Eluna/*.cpp ${CMAKE_SOURCE_DIR}/src/modules/Eluna/*.h) + file(GLOB SRC_GRP_ELUNA + ${CMAKE_SOURCE_DIR}/src/modules/Eluna/*.cpp + ${CMAKE_SOURCE_DIR}/src/modules/Eluna/*.h + ${CMAKE_SOURCE_DIR}/src/modules/Eluna/Mangos/*.cpp + ${CMAKE_SOURCE_DIR}/src/modules/Eluna/Mangos/*.h + ) source_group("Eluna" FILES ${SRC_GRP_ELUNA}) endif() @@ -255,7 +260,10 @@ target_include_directories(game Warden Warden/Modules WorldHandlers - $<$:${CMAKE_SOURCE_DIR}/src/modules/Eluna> + $<$: + ${CMAKE_SOURCE_DIR}/src/modules/Eluna + ${CMAKE_SOURCE_DIR}/src/modules/Eluna/Mangos + > $<$: ${CMAKE_SOURCE_DIR}/src/modules/Bots ${CMAKE_SOURCE_DIR}/src/modules/Bots/playerbot diff --git a/src/modules/Eluna b/src/modules/Eluna index aae1917e2..d2ace63c8 160000 --- a/src/modules/Eluna +++ b/src/modules/Eluna @@ -1 +1 @@ -Subproject commit aae1917e294d03134c0b4bdac0721ce079cdae40 +Subproject commit d2ace63c8deadd976b20a3691f673847e4ffbd35 From 29763c3766d462f28ae2aa884c23bb857383d966 Mon Sep 17 00:00:00 2001 From: Antz Date: Wed, 18 Oct 2023 09:01:12 +0100 Subject: [PATCH 2/2] Fix AutoUpdate Entries --- src/shared/revision_data.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/revision_data.h.in b/src/shared/revision_data.h.in index 130d3a24e..03e431784 100644 --- a/src/shared/revision_data.h.in +++ b/src/shared/revision_data.h.in @@ -45,8 +45,8 @@ #define WORLD_DB_VERSION_NR "22" #define WORLD_DB_STRUCTURE_NR "3" - #define WORLD_DB_CONTENT_NR "1" - #define WORLD_DB_UPDATE_DESCRIPT "Alter_conditions_char_length" + #define WORLD_DB_CONTENT_NR "33" + #define WORLD_DB_UPDATE_DESCRIPT "Fix_AutoUpdate_Entries" #define VER_COMPANY_NAME_STR "MaNGOS Developers" #define VER_LEGALCOPYRIGHT_STR "(c)2005-@rev_year@ MaNGOS"