From fda82727c7ae73a69dda341e40c828c8ad84404f Mon Sep 17 00:00:00 2001 From: Winfidonarleyan Date: Fri, 19 Feb 2021 21:01:51 +0700 Subject: [PATCH] very little rework --- CMakeFiles/generate.stamp | 1 - CMakeFiles/generate.stamp.depend | 2 - CMakeLists.txt | 11 +- INSTALL.vcxproj | 222 ------------------------------- INSTALL.vcxproj.filters | 13 -- src/cmake/after_ws_install.cmake | 13 -- src/loader.h | 3 +- src/premium.cpp | 44 +----- 8 files changed, 8 insertions(+), 301 deletions(-) delete mode 100644 CMakeFiles/generate.stamp delete mode 100644 CMakeFiles/generate.stamp.depend delete mode 100644 INSTALL.vcxproj delete mode 100644 INSTALL.vcxproj.filters delete mode 100644 src/cmake/after_ws_install.cmake diff --git a/CMakeFiles/generate.stamp b/CMakeFiles/generate.stamp deleted file mode 100644 index 9b5f49f..0000000 --- a/CMakeFiles/generate.stamp +++ /dev/null @@ -1 +0,0 @@ -# CMake generation timestamp file for this directory. diff --git a/CMakeFiles/generate.stamp.depend b/CMakeFiles/generate.stamp.depend deleted file mode 100644 index f98dfc0..0000000 --- a/CMakeFiles/generate.stamp.depend +++ /dev/null @@ -1,2 +0,0 @@ -# CMake generation dependency list for this directory. -D:/3.3.5/azerothcore-wotlk/modules/mod-premium/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c156c8..0c2600d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,8 @@ -CU_SET_PATH("CMAKE_PREMIUM_DIR" "${CMAKE_CURRENT_LIST_DIR}") - +# Add cpp files AC_ADD_SCRIPT("${CMAKE_CURRENT_LIST_DIR}/src/premium.cpp") -AC_ADD_SCRIPT_LOADER("Premium" "${CMAKE_CURRENT_LIST_DIR}/src/loader.h") +# Add scripts to script loader +AC_ADD_SCRIPT_LOADER("Premium" "${CMAKE_CURRENT_LIST_DIR}/src/loader.h") -CU_ADD_HOOK(AFTER_WORLDSERVER_CMAKE "${CMAKE_CURRENT_LIST_DIR}/src/cmake/after_ws_install.cmake") - -message("-- PREMIUM ACCOUNT CONFIGURED --") +# Add config file +AC_ADD_CONFIG_FILE("${CMAKE_CURRENT_LIST_DIR}/conf/transmog.conf.dist") \ No newline at end of file diff --git a/INSTALL.vcxproj b/INSTALL.vcxproj deleted file mode 100644 index 85bc736..0000000 --- a/INSTALL.vcxproj +++ /dev/null @@ -1,222 +0,0 @@ - - - - - Debug - x64 - - - Release - x64 - - - MinSizeRel - x64 - - - RelWithDebInfo - x64 - - - - {25F132F2-9D7B-3573-826A-B1663605302E} - 10.0.14393.0 - Win32Proj - x64 - INSTALL - - - - Utility - false - MultiByte - v140 - - - Utility - false - MultiByte - v140 - - - Utility - false - MultiByte - v140 - - - Utility - false - MultiByte - v140 - - - - - - - - - - <_ProjectFileVersion>10.0.20506.1 - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\$(ProjectName)\ - $(Platform)\$(Configuration)\$(ProjectName)\ - - - - %(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - - setlocal -"C:\Program Files\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake -if %errorlevel% neq 0 goto :cmEnd -:cmEnd -endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone -:cmErrorLevel -exit /b %1 -:cmDone -if %errorlevel% neq 0 goto :VCEnd - - - - - %(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - - setlocal -"C:\Program Files\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake -if %errorlevel% neq 0 goto :cmEnd -:cmEnd -endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone -:cmErrorLevel -exit /b %1 -:cmDone -if %errorlevel% neq 0 goto :VCEnd - - - - - %(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - - setlocal -"C:\Program Files\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake -if %errorlevel% neq 0 goto :cmEnd -:cmEnd -endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone -:cmErrorLevel -exit /b %1 -:cmDone -if %errorlevel% neq 0 goto :VCEnd - - - - - %(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - - setlocal -"C:\Program Files\CMake\bin\cmake.exe" -DBUILD_TYPE=$(Configuration) -P cmake_install.cmake -if %errorlevel% neq 0 goto :cmEnd -:cmEnd -endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone -:cmErrorLevel -exit /b %1 -:cmDone -if %errorlevel% neq 0 goto :VCEnd - - - - - - setlocal -cd . -if %errorlevel% neq 0 goto :cmEnd -:cmEnd -endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone -:cmErrorLevel -exit /b %1 -:cmDone -if %errorlevel% neq 0 goto :VCEnd - D:/3.3.5/build/CMakeFiles/933f1318a5cbe7aba812299bf6f7ead3/INSTALL_force.rule;%(AdditionalInputs) - D:\3.3.5\build\modules\mod-premium\CMakeFiles\INSTALL_force - false - - setlocal -cd . -if %errorlevel% neq 0 goto :cmEnd -:cmEnd -endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone -:cmErrorLevel -exit /b %1 -:cmDone -if %errorlevel% neq 0 goto :VCEnd - D:/3.3.5/build/CMakeFiles/933f1318a5cbe7aba812299bf6f7ead3/INSTALL_force.rule;%(AdditionalInputs) - D:\3.3.5\build\modules\mod-premium\CMakeFiles\INSTALL_force - false - - setlocal -cd . -if %errorlevel% neq 0 goto :cmEnd -:cmEnd -endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone -:cmErrorLevel -exit /b %1 -:cmDone -if %errorlevel% neq 0 goto :VCEnd - D:/3.3.5/build/CMakeFiles/933f1318a5cbe7aba812299bf6f7ead3/INSTALL_force.rule;%(AdditionalInputs) - D:\3.3.5\build\modules\mod-premium\CMakeFiles\INSTALL_force - false - - setlocal -cd . -if %errorlevel% neq 0 goto :cmEnd -:cmEnd -endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone -:cmErrorLevel -exit /b %1 -:cmDone -if %errorlevel% neq 0 goto :VCEnd - D:/3.3.5/build/CMakeFiles/933f1318a5cbe7aba812299bf6f7ead3/INSTALL_force.rule;%(AdditionalInputs) - D:\3.3.5\build\modules\mod-premium\CMakeFiles\INSTALL_force - false - - - - - 38AE2268-BD49-3C05-A368-616721326E8C - - - E996CB99-2454-3ECE-A98E-4C7CD907F741 - - - - - - \ No newline at end of file diff --git a/INSTALL.vcxproj.filters b/INSTALL.vcxproj.filters deleted file mode 100644 index 03ffa42..0000000 --- a/INSTALL.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - CMake Rules - - - - - {925DC728-CE6E-34C3-8BF6-284A3BD89EFB} - - - diff --git a/src/cmake/after_ws_install.cmake b/src/cmake/after_ws_install.cmake deleted file mode 100644 index 3caecbb..0000000 --- a/src/cmake/after_ws_install.cmake +++ /dev/null @@ -1,13 +0,0 @@ -if ( MSVC ) - add_custom_command(TARGET worldserver - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_PREMIUM_DIR}/conf/premium.conf.dist ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/ - ) -elseif ( MINGW ) - add_custom_command(TARGET worldserver - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_PREMIUM_DIR}/conf/premium.conf.dist ${CMAKE_BINARY_DIR}/bin/ - ) -endif() - -install(FILES "${CMAKE_PREMIUM_DIR}/conf/premium.conf.dist" DESTINATION ${CONF_DIR}) diff --git a/src/loader.h b/src/loader.h index 457455f..32be3c4 100644 --- a/src/loader.h +++ b/src/loader.h @@ -1,5 +1,6 @@ void AddSC_premium_account(); -void AddPremiumScripts() { +void AddPremiumScripts() +{ AddSC_premium_account(); } \ No newline at end of file diff --git a/src/premium.cpp b/src/premium.cpp index 62d09f9..ad2ba81 100644 --- a/src/premium.cpp +++ b/src/premium.cpp @@ -5,7 +5,7 @@ #include "ScriptedGossip.h" #include "ScriptMgr.h" #include "Spell.h" -#include "Configuration/Config.h" +#include "Config.h" enum Vendors { @@ -323,49 +323,7 @@ public: } }; - -class premium_world : public WorldScript -{ -public: - premium_world() : WorldScript("premiumworld") { } - - void OnBeforeConfigLoad(bool reload) override - { - if (!reload) - { - std::string conf_path = _CONF_DIR; - std::string cfg_file = conf_path + "/premium.conf"; - -#if PLATFORM == PLATFORM_WINDOWS - cfg_file = "premium.conf"; -#endif - std::string cfg_def_file = cfg_file + ".dist"; - - // Load .conf.dist config - if (!sConfigMgr->LoadMore(cfg_def_file.c_str())) - { - sLog->outString(); - sLog->outError("Module config: Invalid or missing configuration dist file : %s", cfg_def_file.c_str()); - sLog->outError("Module config: Verify that the file exists and has \'[worldserver]' written in the top of the file!"); - sLog->outError("Module config: Use default settings!"); - sLog->outString(); - } - - // Load .conf config - if (!sConfigMgr->LoadMore(cfg_file.c_str())) - { - sLog->outString(); - sLog->outError("Module config: Invalid or missing configuration file : %s", cfg_file.c_str()); - sLog->outError("Module config: Verify that the file exists and has \'[worldserver]' written in the top of the file!"); - sLog->outError("Module config: Use default settings!"); - sLog->outString(); - } - } - } -}; - void AddSC_premium_account() { new premium_account(); - new premium_world(); }