Merge pull request #29 from Mitradis/patch-1

fix for last PR ACE remove
This commit is contained in:
Stefano Borzì
2021-03-03 18:42:48 +01:00
committed by GitHub
3 changed files with 1 additions and 32 deletions

View File

@@ -8,4 +8,4 @@ AC_ADD_SCRIPT("${CMAKE_CURRENT_LIST_DIR}/src/cs_anticheat.cpp")
AC_ADD_SCRIPT_LOADER("PassiveAnticheat" "${CMAKE_CURRENT_LIST_DIR}/src/loader.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/Anticheat.conf.dist")

View File

@@ -53,22 +53,6 @@ public:
sAnticheatMgr->SavePlayerData(plr);
}
}
void OnBeforeConfigLoad(bool reload) override
{
/* from skeleton module */
if (!reload) {
std::string conf_path = _CONF_DIR;
std::string cfg_file = conf_path + "/Anticheat.conf";
#ifdef WIN32
cfg_file = "Anticheat.conf";
#endif // WIN32
std::string cfg_def_file = cfg_file + ".dist";
sConfigMgr->LoadMore(cfg_def_file.c_str());
sConfigMgr->LoadMore(cfg_file.c_str());
}
/* end from skeleton module */
}
void OnAfterConfigLoad(bool /* reload */) override // unusued parameter
{
sLog->outString("AnticheatModule Loaded.");

View File

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