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/worldserver/CommandLine | |
| 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/worldserver/CommandLine')
| -rw-r--r-- | src/server/worldserver/CommandLine/CliRunnable.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp index ef114e87467..cd93964b709 100644 --- a/src/server/worldserver/CommandLine/CliRunnable.cpp +++ b/src/server/worldserver/CommandLine/CliRunnable.cpp @@ -471,7 +471,7 @@ bool ChatHandler::HandleCharacterDeletedDeleteCommand(const char* args) */ bool ChatHandler::HandleCharacterDeletedOldCommand(const char* args) { - int32 keepDays = sWorld.getConfig(CONFIG_CHARDELETE_KEEP_DAYS); + int32 keepDays = sWorld.getIntConfig(CONFIG_CHARDELETE_KEEP_DAYS); char* px = strtok((char*)args, " "); if (px) @@ -700,19 +700,19 @@ void CliRunnable::run() { ///- Init MySQL threads or connections bool needInit = true; - if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_WORLDDB) & MYSQL_BUNDLE_RA)) + if (!(sWorld.getIntConfig(CONFIG_MYSQL_BUNDLE_WORLDDB) & MYSQL_BUNDLE_RA)) { WorldDatabase.Init_MySQL_Connection(); needInit = false; } - if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_LOGINDB) & MYSQL_BUNDLE_RA)) + if (!(sWorld.getIntConfig(CONFIG_MYSQL_BUNDLE_LOGINDB) & MYSQL_BUNDLE_RA)) { LoginDatabase.Init_MySQL_Connection(); needInit = false; } - if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_CHARDB) & MYSQL_BUNDLE_RA)) + if (!(sWorld.getIntConfig(CONFIG_MYSQL_BUNDLE_CHARDB) & MYSQL_BUNDLE_RA)) { CharacterDatabase.Init_MySQL_Connection(); needInit = false; @@ -788,12 +788,12 @@ void CliRunnable::run() } ///- Free MySQL thread resources and deallocate lingering connections - if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_WORLDDB) & MYSQL_BUNDLE_RA)) + if (!(sWorld.getIntConfig(CONFIG_MYSQL_BUNDLE_WORLDDB) & MYSQL_BUNDLE_RA)) WorldDatabase.End_MySQL_Connection(); - if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_LOGINDB) & MYSQL_BUNDLE_RA)) + if (!(sWorld.getIntConfig(CONFIG_MYSQL_BUNDLE_LOGINDB) & MYSQL_BUNDLE_RA)) LoginDatabase.End_MySQL_Connection(); - if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_CHARDB) & MYSQL_BUNDLE_RA)) + if (!(sWorld.getIntConfig(CONFIG_MYSQL_BUNDLE_CHARDB) & MYSQL_BUNDLE_RA)) CharacterDatabase.End_MySQL_Connection(); if (needInit) MySQL::Thread_End(); |
