From 1ff5a55eb830aec321dfc7a4e20b037e58a61365 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 2 Mar 2021 21:40:57 +0300 Subject: [PATCH] fix for last PR ACE remove (#15) --- src/cmake/after_ws_install.cmake | 13 ------------- src/reward_system.cpp | 10 ---------- 2 files changed, 23 deletions(-) delete mode 100644 src/cmake/after_ws_install.cmake diff --git a/src/cmake/after_ws_install.cmake b/src/cmake/after_ws_install.cmake deleted file mode 100644 index 386b127..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_REWARD_SYSTEM_DIR}/conf/reward_system.conf.dist ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/ - ) -elseif ( MINGW ) - add_custom_command(TARGET worldserver - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_REWARD_SYSTEM_DIR}/conf/reward_system.conf.dist ${CMAKE_BINARY_DIR}/bin/ - ) -endif() - -install(FILES "${CMAKE_REWARD_SYSTEM_DIR}/conf/reward_system.conf.dist" DESTINATION ${CONF_DIR}) diff --git a/src/reward_system.cpp b/src/reward_system.cpp index 1c3efaa..9ca35b3 100644 --- a/src/reward_system.cpp +++ b/src/reward_system.cpp @@ -147,16 +147,6 @@ public: void OnBeforeConfigLoad(bool reload) override { if (!reload) { - std::string conf_path = _CONF_DIR; - std::string cfg_file = conf_path + "/reward_system.conf"; - -#ifdef WIN32 - cfg_file = "reward_system.conf"; -#endif // WIN32 - - std::string cfg_def_file = cfg_file + ".dist"; - sConfigMgr->LoadMore(cfg_def_file.c_str()); - sConfigMgr->LoadMore(cfg_file.c_str()); Max_roll = sConfigMgr->GetIntDefault("MaxRoll", 1000); } }