fix for last PR ACE remove (#4)

This commit is contained in:
Vitaliy
2021-03-03 22:26:16 +03:00
committed by GitHub
parent 2f3bc119d2
commit a578a3b576
3 changed files with 2 additions and 39 deletions

View File

@@ -4,4 +4,4 @@ AC_ADD_SCRIPT("${CMAKE_CURRENT_LIST_DIR}/src/mod_account_mount.cpp")
AC_ADD_SCRIPT_LOADER("AccountMounts" "${CMAKE_CURRENT_LIST_DIR}/src/loader_account_mount.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_account_mount.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_ACCOUNT_MOUNTS_DIR}/conf/mod_account_mount.conf.dist" ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/
)
elseif ( MINGW )
add_custom_command(TARGET worldserver
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_MOD_ACCOUNT_MOUNTS_DIR}/conf/mod_account_mount.conf.dist" ${CMAKE_BINARY_DIR}/bin/
)
endif()
endif()
install(FILES "${CMAKE_MOD_ACCOUNT_MOUNTS_DIR}/conf/mod_account_mount.conf.dist" DESTINATION ${CONF_DIR})

View File

@@ -59,29 +59,7 @@ public:
}
};
class AccountMountsWorld : public WorldScript
{
public:
AccountMountsWorld() : WorldScript("AccountMountsWorld") { }
void OnBeforeConfigLoad(bool reload) override
{
if (!reload) {
std::string conf_path = _CONF_DIR;
std::string cfg_file = conf_path + "Settings/modules/mod_account_mount.conf";
#ifdef WIN32
cfg_file = "Settings/modules/mod_account_mount.conf";
#endif
std::string cfg_def_file = cfg_file + ".dist";
sConfigMgr->LoadMore(cfg_def_file.c_str());
sConfigMgr->LoadMore(cfg_file.c_str());
}
}
};
void AddAccountMountsScripts()
{
new AccountMountsWorld;
new AccountMounts;
}
}