araxiaonline/mod-individual-xp
3
0
Fork 0
mirror of https://github.com/araxiaonline/mod-individual-xp.git synced 2026-06-13 02:32:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: Configuration loading + clean up (#8)

Browse Source
This commit is contained in:
dunjeon
2019-08-04 15:28:35 -05:00
committed by Barbz
parent 6321d14117
commit ef1a0fe298
3 changed files with 7 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -1,9 +1,6 @@
CU_SET_PATH("CMAKE_Individual_XP_DIR" "${CMAKE_CURRENT_LIST_DIR}")
AC_ADD_SCRIPT("${CMAKE_CURRENT_LIST_DIR}/src/Individual_XP.cpp")
AC_ADD_SCRIPT_LOADER("Individual_XP" "${CMAKE_CURRENT_LIST_DIR}/src/loader.h")
AC_ADD_SCRIPT_LOADER("Individual_XP" "${CMAKE_CURRENT_LIST_DIR}/src/loader.h")
AC_ADD_CONFIG_FILE("${CMAKE_CURRENT_LIST_DIR}/conf/Individual-XP.conf.dist")
CU_ADD_HOOK(AFTER_WORLDSERVER_CMAKE "${CMAKE_CURRENT_LIST_DIR}/src/cmake/after_ws_install.cmake")
message("-- Individual-XP CONFIGURED --")

23
src/Individual_XP.cpp
View File

@@ -21,30 +21,17 @@ class Individual_XP_conf : public WorldScript
public:
Individual_XP_conf() : WorldScript("Individual_XP_conf_conf") { }
void OnBeforeConfigLoad(bool reload) override
void OnBeforeConfigLoad(bool /*reload*/) override
{
if (!reload) {
std::string conf_path = _CONF_DIR;
std::string cfg_file = conf_path + "/Individual-XP.conf";
#ifdef WIN32
cfg_file = "Individual-XP.conf";
#endif
std::string cfg_def_file = cfg_file + ".dist";
sConfigMgr->LoadMore(cfg_def_file.c_str());
sConfigMgr->LoadMore(cfg_file.c_str());
IndividualXpAnnounceModule = sConfigMgr->GetBoolDefault("IndividualXp.Announce", 1);
IndividualXpEnabled = sConfigMgr->GetBoolDefault("IndividualXp.Enabled", 1);
MaxRate = sConfigMgr->GetIntDefault("MaxXPRate", 10);
DefaultRate = sConfigMgr->GetIntDefault("DefaultXPRate", 1);
}
IndividualXpAnnounceModule = sConfigMgr->GetBoolDefault("IndividualXp.Announce", 1);
IndividualXpEnabled = sConfigMgr->GetBoolDefault("IndividualXp.Enabled", 1);
MaxRate = sConfigMgr->GetIntDefault("MaxXPRate", 10);
DefaultRate = sConfigMgr->GetIntDefault("DefaultXPRate", 1);
}
};
class Individual_Xp_Announce : public PlayerScript
{
public:
Individual_Xp_Announce() : PlayerScript("Individual_Xp_Announce") {}

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_Individual_XP_DIR}/conf/Individual-XP.conf.dist ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/
)
elseif ( MINGW )
add_custom_command(TARGET worldserver
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_Individual_XP_DIR}/conf/Individual-XP.conf.dist ${CMAKE_BINARY_DIR}/bin/
)
endif()
install(FILES "${CMAKE_Individual_XP_DIR}/conf/Individual-XP.conf.dist" DESTINATION ${CONF_DIR})