nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-01 01:53:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/Misc): replace all prefix preprocessor defines from CompilerDefs with AC_ (#2419)

Browse Source
This commit is contained in:
Kargatum
2019-11-15 23:27:31 +07:00
committed by GitHub
parent f9a8de9be7
commit a3206c56dc
12 changed files with 48 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/World/World.cpp
View File

@@ -417,7 +417,7 @@ void World::LoadModuleConfigSettings()
std::string conf_path = _CONF_DIR;
std::string cfg_file = conf_path + "/" + configFile;
#if PLATFORM == PLATFORM_WINDOWS
#if AC_PLATFORM == AC_PLATFORM_WINDOWS
cfg_file = configFile;
#endif
std::string cfg_def_file = cfg_file + ".dist";
@@ -1197,7 +1197,7 @@ void World::LoadConfigSettings(bool reload)
if (dataPath.empty() || (dataPath.at(dataPath.length()-1) != '/' && dataPath.at(dataPath.length()-1) != '\\'))
dataPath.push_back('/');
#if PLATFORM == PLATFORM_UNIX || PLATFORM == PLATFORM_APPLE
#if AC_PLATFORM == AC_PLATFORM_UNIX || AC_PLATFORM == AC_PLATFORM_APPLE
if (dataPath[0] == '~')
{
const char* home = getenv("HOME");