diff options
author | silinoron <none@none> | 2010-08-23 19:56:47 -0700 |
---|---|---|
committer | silinoron <none@none> | 2010-08-23 19:56:47 -0700 |
commit | 8649bee17fdd477623465a0ef22abe4d80b74fc3 (patch) | |
tree | f652ac8f180d88345cfd5ecdc779b4296d154189 /src/server/game/Maps/MapManager.cpp | |
parent | b30800e9bcc38faf4bcbe443240a6d0797ad88e5 (diff) |
Replace World::getConfig with World::getFloatConfig, World::getIntConfig, and World::getBoolConfig.
Also fix a warning from a previous commit.
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Maps/MapManager.cpp')
-rw-r--r-- | src/server/game/Maps/MapManager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index a4fb3980242..62963d39712 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -40,8 +40,8 @@ extern GridState* si_GridStates[]; // debugging code, s MapManager::MapManager() { - i_gridCleanUpDelay = sWorld.getConfig(CONFIG_INTERVAL_GRIDCLEAN); - i_timer.SetInterval(sWorld.getConfig(CONFIG_INTERVAL_MAPUPDATE)); + i_gridCleanUpDelay = sWorld.getIntConfig(CONFIG_INTERVAL_GRIDCLEAN); + i_timer.SetInterval(sWorld.getIntConfig(CONFIG_INTERVAL_MAPUPDATE)); } MapManager::~MapManager() @@ -72,7 +72,7 @@ void MapManager::Initialize() i_GridStateErrorCount = 0; } - int num_threads(sWorld.getConfig(CONFIG_NUMTHREADS)); + int num_threads(sWorld.getIntConfig(CONFIG_NUMTHREADS)); // Start mtmaps if needed. if (num_threads > 0 && m_updater.activate(num_threads) == -1) abort(); @@ -196,7 +196,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck) if (entry->IsRaid()) { // can only enter in a raid group - if ((!pGroup || !pGroup->isRaidGroup()) && !sWorld.getConfig(CONFIG_INSTANCE_IGNORE_RAID)) + if ((!pGroup || !pGroup->isRaidGroup()) && !sWorld.getBoolConfig(CONFIG_INSTANCE_IGNORE_RAID)) { // probably there must be special opcode, because client has this string constant in GlobalStrings.lua // TODO: this is not a good place to send the message |