nchebrov/mod-money-for-kills
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-money-for-kills.git synced 2026-01-13 01:08:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from Mitradis/patch-1

Browse Source 
fix for last PR ACE remove
This commit is contained in:
Stefano Borzì
2021-03-03 18:45:28 +01:00
committed by GitHub
parent 2d0d9923bf 44decbd057
commit 17db6230e1
3 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -4,4 +4,4 @@ AC_ADD_SCRIPT("${CMAKE_CURRENT_LIST_DIR}/src/mod_moneyforkills.cpp")
AC_ADD_SCRIPT_LOADER("MoneyForKills" "${CMAKE_CURRENT_LIST_DIR}/src/loader_moneyforkills.h")
CU_ADD_HOOK(AFTER_WORLDSERVER_CMAKE "${CMAKE_CURRENT_LIST_DIR}/src/cmake/after_ws_install.cmake")
AC_ADD_CONFIG_FILE("${CMAKE_CURRENT_LIST_DIR}/conf/mod_moneyforkills.conf.dist")

15
src/cmake/after_ws_install.cmake
View File

@@ -1,15 +0,0 @@
if( WIN32 )
if ( MSVC )
add_custom_command(TARGET worldserver
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_MOD_MONEYFORKILLS_DIR}/conf/mod_moneyforkills.conf.dist" ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/
)
elseif ( MINGW )
add_custom_command(TARGET worldserver
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_MOD_MONEYFORKILLS_DIR}/conf/mod_moneyforkills.conf.dist" ${CMAKE_BINARY_DIR}/bin/
)
endif()
endif()
install(FILES "${CMAKE_MOD_MONEYFORKILLS_DIR}/conf/mod_moneyforkills.conf.dist" DESTINATION ${CONF_DIR})

21
src/mod_moneyforkills.cpp
View File

@@ -380,26 +380,7 @@ public:
}
};
class MoneyForKillsWorld : public WorldScript
{
public:
MoneyForKillsWorld() : WorldScript("MoneyForKillsWorld") { }
void OnBeforeConfigLoad(bool reload) override
{
if (!reload) {
std::string conf_path = _CONF_DIR;
std::string cfg_file = conf_path + "/mod_moneyforkills.conf";
std::string cfg_def_file = cfg_file + ".dist";
sConfigMgr->LoadMore(cfg_def_file.c_str());
sConfigMgr->LoadMore(cfg_file.c_str());
}
}
};
void AddMoneyForKillsScripts()
{
new MoneyForKills();
new MoneyForKillsWorld();
}
}