nchebrov/mod-reward-played-time-improved
1
0
Fork 0
mirror of https://github.com/freekode/mod-reward-played-time-improved.git synced 2026-01-13 00:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for last PR ACE remove (#15)

Browse Source
This commit is contained in:
Vitaliy
2021-03-02 21:40:57 +03:00
committed by GitHub
parent f5d7fdf84d
commit 1ff5a55eb8
2 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/cmake/after_ws_install.cmake
View File

@@ -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})

10
src/reward_system.cpp
View File

@@ -147,16 +147,6 @@ public:
void OnBeforeConfigLoad(bool reload) override void OnBeforeConfigLoad(bool reload) override
{ {
if (!reload) { 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); Max_roll = sConfigMgr->GetIntDefault("MaxRoll", 1000);
} }
} }