Merge pull request #8 from Mitradis/patch-1

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

View File

@@ -4,4 +4,4 @@ AC_ADD_SCRIPT("${CMAKE_CURRENT_LIST_DIR}/src/mod_achievements.cpp")
AC_ADD_SCRIPT_LOADER("AccountAchievements" "${CMAKE_CURRENT_LIST_DIR}/src/loader_achievements.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_achievements.conf.dist")

View File

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

View File

@@ -85,29 +85,7 @@ public:
}
};
class AccountAchievementsWorld : public WorldScript
{
public:
AccountAchievementsWorld() : WorldScript("AccountAchievementsWorld") { }
void OnBeforeConfigLoad(bool reload) override
{
if (!reload) {
std::string conf_path = _CONF_DIR;
std::string cfg_file = conf_path + "/mod_achievements.conf";
#ifdef WIN32
cfg_file = "mod_achievements.conf";
#endif
std::string cfg_def_file = cfg_file + ".dist";
sConfigMgr->LoadMore(cfg_def_file.c_str());
sConfigMgr->LoadMore(cfg_file.c_str());
}
}
};
void AddAccountAchievementsScripts()
{
new AccountAchievementsWorld;
new AccountAchievements;
}