Merge branch 'master' of github.com:mangosone/server

mangosone · Oct 20, 2023 · 0c0cefd · 0c0cefd
2 parents 6f9bf25 + 29763c3
commit 0c0cefd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git 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
-        $<$<BOOL:${SCRIPT_LIB_ELUNA}>:${CMAKE_SOURCE_DIR}/src/modules/Eluna>
+        $<$<BOOL:${SCRIPT_LIB_ELUNA}>:
+            ${CMAKE_SOURCE_DIR}/src/modules/Eluna
+            ${CMAKE_SOURCE_DIR}/src/modules/Eluna/Mangos
+            >
         $<$<BOOL:${PLAYERBOTS}>:
             ${CMAKE_SOURCE_DIR}/src/modules/Bots
             ${CMAKE_SOURCE_DIR}/src/modules/Bots/playerbot

diff --git a/src/modules/Eluna b/src/modules/Eluna
diff --git 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"